(eval '(run-hooks 'gnus-offline-load-hook))
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl) (require 'static))
(require 'custom)
(require 'easymenu)
(provide 'gnus-offline)
miee-popup-menu
gnus-group-toolbar)))
-(put 'gnus-offline-set-unplugged-state 'menu-enable 'gnus-offline-connected)
-(if (eq system-type 'windows-nt)
+(static-if (eq system-type 'windows-nt)
(define-process-argument-editing "/hang\\.exe\\'"
(lambda (x)
(general-process-argument-editing-function
x nil t t nil t t))))
-(defcustom gnus-offline-auto-hangup t
- "*Whether dialup-network automatically hang up when all online jobs has done."
+(defcustom gnus-offline-auto-ppp '(connect disconnect)
+ "*This variable decides whether to connect and/or disconnect automatically."
:group 'gnus-offline
- :type 'boolean)
+ :type '(choice
+ (const :tag "Connection and Disconnection" (connect disconnect))
+ (const :tag "Connection Only" (connect))
+ (const :tag "Do Everything Manually" nil)))
(defcustom gnus-offline-load-hook nil
"*Hook to be run after the gnus-offline package has been loaded."
(hangup-line-1 . "Hang up line ... ")
(hangup-line-2 . "Hang up line ... done.")
(after-jobs-done-1 . "All online jobs has done.")
- (toggle-auto-hangup-1 . "Auto hang up logic")
- (toggle-auto-hangup-2 . "disabled.")
- (toggle-auto-hangup-3 . "enabled.")
+ (set-auto-ppp-1 . "Connect and disconnect automatically.")
+ (set-auto-ppp-2 . "Connect automatically.")
+ (set-auto-ppp-3 . "Connect and disconnect manually.")
+ (set-auto-ppp-menu-1 . "Automatically Connect/Disconnect")
+ (set-auto-ppp-menu-2 . "Automatically Connect")
+ (set-auto-ppp-menu-3 . "Manually Connect/Disconnect")
(toggle-on/off-send-mail-1 . "Sending mail immidiately.")
(toggle-on/off-send-mail-2 . "Sending mail temporary to spool directory.")
(toggle-articles-to-fetch-1 . "Articles fetch from server.")
(menu-miee-4 . "Message Online")
(menu-1 . "Toggle articles to fetch")
(menu-2 . "Toggle online/offline send mail")
- (menu-3 . "Toggle auto hangup")
+ (menu-3 . "Set auto PPP")
(menu-4 . "Expire articles")
(menu-5 . "Set interval time")
(menu-6 . "Hang up Line.")
.emacs \e$B$^$?$O\e(B .gnus.el \e$B$N\e(B gnus-agent \e$B$N@_Dj$r@5$7$/$7$F$/$@$5$$!#\e(B")
(error-check-2 ."\e$B7Y9p\e(B!!: nnspool.el \e$B$,%m!<%I$5$l$F$$$^$;$s!#\e(B
.emacs \e$B$^$?$O\e(B .gnus.el \e$B$N\e(B nnspool \e$B$N@_Dj$r@5$7$/$7$F$/$@$5$$!#\e(B")
- (connect-server-1 . "\e$B%@%$%d%k$7$F$$$^$9\e(B...")
- (connect-server-2 . "\e$B%@%$%d%k$7$F$$$^$9\e(B...\e$B40N;!#\e(B")
+ (connect-server-1 . "\e$B@\B3$7$F$$$^$9\e(B...")
+ (connect-server-2 . "\e$B@\B3$7$F$$$^$9\e(B...\e$B40N;!#\e(B")
(get-new-news-function-1 . "\e$B%*%s%i%$%s>uBV$G$9!#\e(B")
+ (set-auto-ppp-1 . "\e$B<+F0E*$K\e(B PPP \e$B@\B3!&@ZCG$7$^$9!#\e(B")
+ (set-auto-ppp-2 . "\e$B<+F0E*$K\e(B PPP \e$B@\B3$7$^$9!#\e(B")
+ (set-auto-ppp-3 . "\e$B<jF0$G\e(B PPP \e$B@\B3!&@ZCG$7$^$9!#\e(B")
(hangup-line-1 . "\e$B@ZCG$7$F$$$^$9\e(B...")
(hangup-line-2 . "\e$B@ZCG$7$F$$$^$9\e(B...\e$B40N;!#\e(B")
(after-jobs-done-1 . "\e$BA4$F$N%*%s%i%$%s=hM}$r40N;$7$^$7$?!#\e(B")
- (toggle-auto-hangup-1 . "\e$B<+F0@ZCG5!G=$r\e(B ")
- (toggle-auto-hangup-2 . "\e$B%*%U\e(B \e$B$K$7$^$7$?!#\e(B")
- (toggle-auto-hangup-3 . "\e$B%*%s\e(B \e$B$K$7$^$7$?!#\e(B")
(toggle-on/off-send-mail-1 . "\e$B%a!<%k$rD>@\Aw?.$7$^$9!#\e(B")
(toggle-on/off-send-mail-2 . "\e$B%a!<%k$O%-%e!<$KAw$i$l$^$9!#\e(B")
(toggle-articles-to-fetch-1 . "\e$B<u?.$9$k%a%C%;!<%8$O\e(B... ")
(menu-miee-4 . "Online \e$B>uBV$X\e(B")
(menu-1 . "\e$B<hF@5-;v<oN`$NJQ99\e(B")
(menu-2 . "Mail \e$BAw?.J}K!\e(B(On/Off)\e$B$N@ZBX$(\e(B")
- (menu-3 . "\e$B<+F0@ZCG$N@ZBX$(\e(B")
+ (menu-3 . "\e$B<+F0\e(B PPP \e$B@)8f$N@_Dj\e(B")
(menu-4 . "\e$B<hF@:Q5-;v$r>C$9\e(B")
(menu-5 . "\e$B5-;v<hF@4V3V;~4V$N@_Dj\e(B")
(menu-6 . "\e$B2s@~$N@ZCG\e(B")
- (menu-7 . "\e$B%W%m%Q%F%#\e(B..."))))
+ (menu-7 . "\e$B%W%m%Q%F%#\e(B...")
+ (set-auto-ppp-menu-1 . "\e$B<+F0E*$K\e(B PPP \e$B@\B3!&@ZCG\e(B")
+ (set-auto-ppp-menu-2 . "\e$B<+F0E*$K\e(B PPP \e$B@\B3\e(B")
+ (set-auto-ppp-menu-3 . "\e$B<jF0$G\e(B PPP \e$B@\B3!&@ZCG\e(B"))))
;;; Functions
;; Menu and keymap
(gnus-offline-define-menu-and-key)
-
+
;; To transfer Mail/News function.
(cond ((eq gnus-offline-mail-treat-environ 'offline)
;; send mail under offline environ.
(erase-buffer)
(insert (gnus-offline-get-message 'error-check-1))
(pop-to-buffer buffer)))
-
+
((eq gnus-offline-news-fetch-method 'nnspool)
(unless (featurep 'nnspool)
(set-buffer (gnus-get-buffer-create buffer))
"*Override function \"gnus-group-get-new-news\"."
(interactive "P")
(run-hooks 'gnus-offline-before-online-hook)
- (if (functionp gnus-offline-dialup-function)
+ (if (and (memq 'connect gnus-offline-auto-ppp)
+ (functionp gnus-offline-dialup-function))
(funcall gnus-offline-dialup-function))
(gnus-offline-get-new-news-function)
(gnus-group-get-new-news arg))
"*Set nnm* group level."
(switch-to-buffer gnus-group-buffer)
(goto-char (point-min))
-
+
;; Save current level
(if (not gnus-offline-stored-group-level)
(while (re-search-forward " nnm" nil t)
(if (eq gnus-offline-articles-to-fetch 'mail)
(progn
;; Send only mail and hang up...
- (if (and gnus-offline-connected
- gnus-offline-auto-hangup)
+ (if gnus-offline-connected
(gnus-offline-set-unplugged-state))
;; Disable fetch mail.
(gnus-offline-disable-fetch-mail)
(gnus-offline-after-jobs-done)))))
-
+
;; News/Both
(if (memq gnus-offline-articles-to-fetch '(both news))
(progn
(cond ((eq gnus-offline-news-fetch-method 'nnagent)
;; Get New News (gnus-agent)
(gnus-agent-toggle-plugged t)
-
+
;; fetch articles
(gnus-agent-fetch-session)
-
+
;; Hang Up line. then set to offline status.
- (if (and gnus-offline-connected
- gnus-offline-auto-hangup)
- (gnus-offline-set-unplugged-state))
-
+ (gnus-offline-set-unplugged-state)
+
;; All online jobs has done.
(gnus-offline-after-jobs-done))
(t
"*Set to unplugged state."
(interactive)
;; Hang Up Line.
- (if (functionp gnus-offline-hangup-function)
+ (if (and (memq 'disconnect gnus-offline-auto-ppp)
+ (functionp gnus-offline-hangup-function))
(funcall gnus-offline-hangup-function))
(setq gnus-offline-connected nil)
(if (eq gnus-offline-news-fetch-method 'nnagent)
;; Hang Up line routine whe using nnspool
;;
(defun gnus-offline-nnspool-hangup-line ()
- (if (and gnus-offline-connected
- gnus-offline-auto-hangup)
+ (if gnus-offline-connected
(gnus-offline-set-unplugged-state))
(gnus-offline-after-jobs-done))
;;
\f
;;
-;; Toggle auto hang up
+;; Set auto PPP
;;
-(defun gnus-offline-toggle-auto-hangup ()
- "*Toggle auto hangup flag."
+(defun gnus-offline-set-auto-ppp ()
+ "*Decide whether to connect and/or disconnect automatically."
(interactive)
- (let ((string (gnus-offline-get-message 'toggle-auto-hangup-1)) str)
- (if gnus-offline-auto-hangup
- (progn
- (setq gnus-offline-auto-hangup nil
- str (gnus-offline-get-message 'toggle-auto-hangup-2)))
- (setq gnus-offline-auto-hangup t
- str (gnus-offline-get-message 'toggle-auto-hangup-3)))
- (message (format "%s %s" string str))))
+ (let ((keys (key-description (this-command-keys)))
+ menu title str)
+ (cond ((or (string= "misc-user" keys)
+ (string-match "^menu-bar" keys)
+ (string-match "^mouse" keys))
+ (setq title (gnus-offline-get-message 'menu-3))
+ (setq menu
+ (cons
+ title
+ (gnus-offline-get-menu-items
+ '((set-auto-ppp-menu-1
+ (progn
+ (setq gnus-offline-auto-ppp '(connect disconnect))
+ (message (gnus-offline-get-message 'set-auto-ppp-1)))
+ t)
+ (set-auto-ppp-menu-2
+ (progn
+ (setq gnus-offline-auto-ppp '(connect))
+ (message (gnus-offline-get-message 'set-auto-ppp-2)))
+ t)
+ (set-auto-ppp-menu-3
+ (progn
+ (setq gnus-offline-auto-ppp nil)
+ (message (gnus-offline-get-message 'set-auto-ppp-3)))
+ t)))))
+ (gnus-offline-popup menu title))
+ (t
+ (cond ((eq gnus-offline-auto-ppp nil)
+ (setq gnus-offline-auto-ppp '(connect disconnect))
+ (setq str (gnus-offline-get-message 'set-auto-ppp-1)))
+ ((memq 'connect gnus-offline-auto-ppp)
+ (cond ((memq 'disconnect gnus-offline-auto-ppp)
+ (setq gnus-offline-auto-ppp '(connect))
+ (setq str
+ (gnus-offline-get-message 'set-auto-ppp-2)))
+ (t
+ (setq gnus-offline-auto-ppp nil)
+ (setq str
+ (gnus-offline-get-message 'set-auto-ppp-3))))))
+ (message str)))))
;;
;; Toggle offline/online to send mail.
;;
(defun gnus-offline-define-menu-and-key ()
"*Set key and menu."
(if (eq gnus-offline-drafts-queue-type 'miee)
- (if (featurep 'xemacs)
+ (static-if (featurep 'xemacs)
(add-hook 'gnus-group-mode-hook 'gnus-offline-define-menu-on-miee)
(gnus-offline-define-menu-on-miee))
(add-hook 'gnus-group-mode-hook 'gnus-offline-define-menu-on-agent))
(local-set-key "\C-coh" 'gnus-offline-set-unplugged-state)
(local-set-key "\C-cof" 'gnus-offline-toggle-articles-to-fetch)
(local-set-key "\C-coo" 'gnus-offline-toggle-on/off-send-mail)
- (local-set-key "\C-cox" 'gnus-offline-toggle-auto-hangup)
+ (local-set-key "\C-cox" 'gnus-offline-set-auto-ppp)
(local-set-key "\C-cos" 'gnus-offline-set-interval-time)
(substitute-key-definition
'gnus-group-get-new-news 'gnus-offline-gnus-get-new-news
(substitute-key-definition
'gnus-agent-toggle-plugged 'gnus-offline-toggle-plugged
gnus-agent-group-mode-map)
- (local-set-key "\C-coe" 'gnus-offline-agent-expire)))
- (or (featurep 'xemacs)
- (define-key gnus-group-mode-map
- (if (eq system-type 'windows-nt) [S-mouse-2] [mouse-3])
- 'gnus-offline-popup-menu))))
+ (local-set-key "\C-coe" 'gnus-offline-agent-expire)))))
(if (eq gnus-offline-news-fetch-method 'nnagent)
(add-hook 'gnus-summary-mode-hook
'(lambda ()
(substitute-key-definition
'gnus-agent-toggle-plugged 'gnus-offline-toggle-plugged
gnus-agent-summary-mode-map))))
- (if (featurep 'xemacs)
- ;; Overwrite the toolbar spec for gnus-group-mode.
- (add-hook 'gnus-startup-hook
- #'(lambda ()
- (catch 'tag
- (mapc (lambda (but)
- (when (eq 'gnus-group-get-new-news (aref but 1))
- (aset but 1 'gnus-offline-gnus-get-new-news)
- (throw 'tag nil)))
- gnus-group-toolbar))))))
-;;
-;;
+ (static-cond
+ ((featurep 'xemacs)
+ ;; Overwrite the toolbar spec for gnus-group-mode.
+ (add-hook 'gnus-startup-hook
+ #'(lambda ()
+ (catch 'tag
+ (mapc (lambda (but)
+ (when (eq 'gnus-group-get-new-news (aref but 1))
+ (aset but 1 'gnus-offline-gnus-get-new-news)
+ (throw 'tag nil)))
+ gnus-group-toolbar)))))
+ (t
+ (define-key gnus-group-mode-map
+ (static-if (eq system-type 'windows-nt) [S-mouse-2] [mouse-3])
+ 'gnus-offline-popup-menu))))
+;;
+;;
+(defun gnus-offline-popup (menu &optional title)
+ (static-cond
+ ((featurep 'xemacs)
+ (popup-menu menu))
+ (t
+ (let (keymap keymap pop func)
+ (static-cond ((< emacs-major-version 20)
+ ;; For Emacsen from 19.34 down to 19.28.
+ ;; Seems the first item in MENU will be ignored.
+ (or (keymapp menu)
+ (setq menu
+ (append (list "" ;; This will be ignored.
+ (or title "Popup Menu")
+ "-----"
+ "-----")
+ (cdr menu))))
+ (setq keymap
+ (if (keymapp menu)
+ (append (list 'keymap
+ (if title
+ `(nil ,title)
+ '(nil "Popup Menu"))
+ '(nil "")
+ '(nil ""))
+ (cdr menu))
+ (easy-menu-create-keymaps (car menu)
+ (cdr menu)))))
+ (t
+ (if (keymapp menu)
+ (setq keymap menu)
+ (easy-menu-define keymap nil "" menu))))
+ ;; Display the popup menu.
+ (if (and (setq pop (x-popup-menu t keymap))
+ (setq func (lookup-key keymap
+ (apply 'vector pop))))
+ (prog1 keymap
+ (funcall func)))))))
+
(defun gnus-offline-get-menu-items (list)
(mapcar
#'(lambda (el)
(gnus-offline-get-menu-items
'((menu-1 gnus-offline-toggle-articles-to-fetch t)
(menu-2 gnus-offline-toggle-on/off-send-mail t)
- (menu-3 gnus-offline-toggle-auto-hangup t)
+ (menu-3 gnus-offline-set-auto-ppp t)
"----"
(menu-4 gnus-offline-agent-expire
(eq gnus-offline-news-fetch-method 'nnagent))
nil "Miee"
(append miee-menu
(list (cons "Gnus Offline" gnus-offline-menu)))))
- (and (featurep 'xemacs)
- (easy-menu-add menu))))
+ (static-if (featurep 'xemacs)
+ (easy-menu-add menu))))
;;
;; define menu without miee.
;;
(easy-menu-define
gnus-offline-menu-on-agent gnus-group-mode-map "Gnus offline Menu"
(cons "Offline" gnus-offline-menu))
- (and (featurep 'xemacs)
- (easy-menu-add gnus-offline-menu-on-agent)))
+ (static-if (featurep 'xemacs)
+ (easy-menu-add gnus-offline-menu-on-agent)))
;;
;; Popup menu within the group buffer (under Emacs).
;;
-(defvar gnus-offline-popup-menu nil)
-(defun gnus-offline-popup-menu (event)
- "Popup menu for Gnus Offline."
- (interactive "e")
- (unless gnus-offline-popup-menu
- (setq gnus-offline-popup-menu
- (let ((menu
- (if (boundp 'miee-popup-menu)
- (or (assq 'keymap
- (assq 'Miee (assq 'menu-bar global-map)))
+(static-unless (featurep 'xemacs)
+ (defun gnus-offline-popup-menu (event)
+ "Popup menu for Gnus Offline."
+ (interactive "e")
+ (apply 'gnus-offline-popup
+ (if (boundp 'miee-popup-menu)
+ (list (or (assq 'keymap
+ (assq 'Miee (assq 'menu-bar global-map)))
miee-popup-menu)
- (symbol-value 'gnus-offline-menu-on-agent))))
- (if (string< emacs-version "20")
- (append (list 'keymap
- (if (boundp 'miee-popup-menu)
- '(nil "Miee")
- '(nil "Offline"))
- '(nil "")
- '(nil ""))
- (cdr menu))
- menu))))
- (let* ((pop (x-popup-menu t gnus-offline-popup-menu))
- (func (and pop (lookup-key gnus-offline-popup-menu
- (apply 'vector pop)))))
- (and pop func (funcall func))))
+ "Miee")
+ (list (symbol-value 'gnus-offline-menu-on-agent)
+ "Offline")))))
\f
;;
;; Timer Function
projects / elisp / gnus.git- / commitdiff