Changeset 4200 for trunk/lisp/erc/erc-autoaway.el

Timestamp:

04/07/07 15:49:28 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/erc/erc-autoaway.el (modified) (7 diffs)

trunk/lisp/erc/erc-autoaway.el

@@ -41 +41 @@
-This is only used when `erc-autoaway-idle-method' is set to 'emacs.")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-(eval-when-compile (defvar erc-autoaway-idle-seconds))
@@ -149 +63 @@
-                             erc-autoaway-idle-seconds)))
-
+(defun erc-autoaway-some-server-buffer ()
+  "Return some ERC server buffer if its connection is alive.
+If none is found, return nil."
+  (car (erc-buffer-list #'erc-open-server-buffer-p)))
+
+(defun erc-autoaway-insinuate-maybe (&optional server &rest ignored)
+  "Add autoaway reset function to `post-command-hook' if at least one
+ERC process is alive.
+
+This is used when `erc-autoaway-idle-method' is 'user."
+  (when (or server (erc-autoaway-some-server-buffer))
+    (add-hook 'post-command-hook 'erc-autoaway-reset-idle-user)))
+
+(defun erc-autoaway-remove-maybe (&rest ignored)
+  "Remove the autoaway reset function from `post-command-hook' if
+no ERC process is alive.
+
+This is used when `erc-autoaway-idle-method' is 'user."
+  (unless (erc-autoaway-some-server-buffer)
+    (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user)))
+
+;;;###autoload (autoload 'erc-autoaway-mode "erc-autoaway")
+(define-erc-module autoaway nil
+  "In ERC autoaway mode, you can be set away automatically.
+If `erc-auto-set-away' is set, then you will be set away after
+the number of seconds specified in `erc-autoaway-idle-seconds'.
+
+There are several kinds of being idle:
+
+User idle time measures how long you have not been sending any
+commands to Emacs.  This is the default.
+
+Emacs idle time measures how long Emacs has been idle.  This is
+currently not useful, since Emacs is non-idle when it handles
+ping-pong with IRC servers.  See `erc-autoaway-idle-method'
+for more information.
+
+IRC idle time measures how long since you last sent something (see
+`erc-autoaway-last-sent-time').
+
+If `erc-auto-discard-away' is set, then typing anything, will
+set you no longer away.
+
+Related variables: `erc-public-away-p' and `erc-away-nickname'."
+  ;; Enable:
+  ((when (boundp 'erc-autoaway-idle-method)
+     (add-hook 'erc-connect-pre-hook 'erc-autoaway-reset-indicators)
+     (setq erc-autoaway-last-sent-time (erc-current-time))
+     (cond
+      ((eq erc-autoaway-idle-method 'irc)
+       (add-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
+       (add-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
+      ((eq erc-autoaway-idle-method 'user)
+       (add-hook 'erc-after-connect 'erc-autoaway-insinuate-maybe)
+       (add-hook 'erc-disconnected-hook 'erc-autoaway-remove-maybe)
+       (erc-autoaway-insinuate-maybe))
+      ((eq erc-autoaway-idle-method 'emacs)
+       (erc-autoaway-reestablish-idletimer)))
+     (add-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
+     (add-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators)))
+  ;; Disable:
+  ((when (boundp 'erc-autoaway-idle-method)
+     (remove-hook 'erc-connect-pre-hook 'erc-autoaway-reset-indicators)
+     (cond
+      ((eq erc-autoaway-idle-method 'irc)
+       (remove-hook 'erc-send-completed-hook 'erc-autoaway-reset-idle-irc)
+       (remove-hook 'erc-server-001-functions 'erc-autoaway-reset-idle-irc))
+      ((eq erc-autoaway-idle-method 'user)
+       (remove-hook 'post-command-hook 'erc-autoaway-reset-idle-user)
+       (remove-hook 'erc-after-connect 'erc-autoaway-insinuate-maybe)
+       (remove-hook 'erc-disconnected-hook 'erc-autoaway-remove-maybe))
+      ((eq erc-autoaway-idle-method 'emacs)
+       (erc-cancel-timer erc-autoaway-idletimer)
+       (setq erc-autoaway-idletimer nil)))
+     (remove-hook 'erc-timer-hook 'erc-autoaway-possibly-set-away)
+     (remove-hook 'erc-server-305-functions 'erc-autoaway-reset-indicators))))
+
+(defcustom erc-autoaway-idle-method 'user
+  "*The method used to determine how long you have been idle.
+If 'user, the time of the last command sent to Emacs is used.
+If 'emacs, the idle time in Emacs is used.
+If 'irc, the time of the last IRC command is used.
+
+The time itself is specified by `erc-autoaway-idle-seconds'.
+
+See `erc-autoaway-mode' for more information on the various
+definitions of being idle."
+  :group 'erc-autoaway
+  :type '(choice (const :tag "User idle time" user)
+                 (const :tag "Emacs idle time" emacs)
+                 (const :tag "Last IRC action" irc))
+  :set (lambda (sym val)
+         (if erc-autoaway-mode
+             (progn
+               (erc-autoaway-disable)
+               (set sym val)
+               (erc-autoaway-enable))
+           (set sym val))))
+
+(defcustom erc-auto-set-away t
+  "*If non-nil, set away after `erc-autoaway-idle-seconds' seconds of idling.
+ERC autoaway mode can set you away when you idle, and set you no
+longer away when you type something.  This variable controls whether
+you will be set away when you idle.  See `erc-auto-discard-away' for
+the other half."
+  :group 'erc-autoaway
+  :type 'boolean)
+
+(defcustom erc-auto-discard-away t
+  "*If non-nil, sending anything when away automatically discards away state.
+ERC autoaway mode can set you away when you idle, and set you no
+longer away when you type something.  This variable controls whether
+you will be set no longer away when you type something.  See
+`erc-auto-set-away' for the other half.
+See also `erc-autoaway-no-auto-discard-regexp'."
+  :group 'erc-autoaway
+  :type 'boolean)
+
+(defcustom erc-autoaway-no-auto-discard-regexp "^/g?away.*$"
+  "*Input that matches this will not automatically discard away status.
+See `erc-auto-discard-away'."
+  :group 'erc-autoaway
+  :type 'regexp)
+
-(defcustom erc-autoaway-idle-seconds 1800
-  "*Number of seconds after which ERC will set you automatically away.
@@ -168 +206 @@
-  :type 'string)
-
-(defvar erc-autoaway-last-sent-time (erc-current-time)
-  "The last time the user sent something.")
-
-(defvar erc-autoaway-caused-away nil
-  "Indicates whether this module was responsible for setting the
-user's away status.")
-
-(defun erc-autoaway-reset-idle-user (&rest stuff)
-  "Reset the stored user idle time.
@@ -180 +211 @@
-talk on another net too."
-  (when erc-auto-discard-away
-
+ #'erc-autoaway-remove-maybe
-  (setq erc-autoaway-last-sent-time (erc-current-time)))
-
@@ -193 +224 @@
-  (setq erc-autoaway-last-sent-time (erc-current-time)))
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun erc-autoaway-possibly-set-away (current-time)
@@ -208 +251 @@
-  (when (and erc-auto-set-away
-             (not erc-autoaway-caused-away)
-not (erc-away-p)
+erc-autoaway-some-open-server-buffer
-    (let ((idle-time (erc-time-diff erc-autoaway-last-sent-time
-                                    current-time)))
@@ -216 +259 @@
-         (format "Setting automatically away after %i seconds of idle-time"
-                 idle-time))
-
-
-
-
+
+
+
+
+
+
+
-  ;; Note that the idle timer runs, even when Emacs is inactive.  In
-  ;; order to prevent flooding when we connect, we test for an
-  ;; existing process.
-
-
+
-    (setq erc-autoaway-caused-away t)
-    (erc-cmd-GAWAY (format erc-autoaway-message idle-time))))