X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-button.el;h=b7f51261eeedfb4d5686b098086eae7b9f88f62d;hb=85d94995064e02c1d85b2704d47f6028e4076802;hp=f92eeb76fd4b84ec7146790c37f436c96e382436;hpb=dd2c976135cefa739cf397bcc9f7aff7dce3bbaa;p=elisp%2Friece.git

diff --git a/lisp/riece-button.el b/lisp/riece-button.el
index f92eeb7..b7f5126 100644
--- a/lisp/riece-button.el
+++ b/lisp/riece-button.el
@@ -1,4 +1,4 @@
-;;; riece-button.el --- adding buttons in channel buffers
+;;; riece-button.el --- display useful buttons in IRC buffers
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -19,13 +19,12 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-button)
+;; NOTE: This is an add-on module for Riece.
 
 ;;; Code:
 
@@ -45,14 +44,12 @@
   '("User"
     ["Finger (WHOIS)" riece-user-button-finger]
     ["Start Private Conversation" riece-user-button-join-partner]
-    ["Give Channel Operator Privileges" riece-user-button-set-operators]
-    ["Allow To Speak" riece-user-button-set-speakers])
+    ["Set +o" riece-user-button-set-operators]
+    ["Set +v" riece-user-button-set-speakers])
   "Menu for user buttons.")
 
-(defvar riece-button-enabled nil)
-
 (defconst riece-button-description
-  "Display useful buttons in IRC buffers")
+  "Display useful buttons in IRC buffers.")
 
 (defvar help-echo-owns-message)
 (define-widget 'riece-identity-button 'push-button
@@ -83,9 +80,31 @@ This function is used as a callback for a channel button."
       (message "%s" (substitute-command-keys
 		     "Type \\[riece-command-join] to join the channel")))))
 
+(defun riece-identity-button-click (event)
+  "Call widget-button-click and select the last selected window."
+  (interactive "e")			;widget-button-click has
+					;interactive spec "@e"
+  (let ((buffer (current-buffer))
+	(point (point))
+	window)
+    (unwind-protect
+	(save-excursion
+	  (set-buffer (riece-event-buffer event))
+	  (goto-char (riece-event-point event))
+	  (widget-button-click event))
+      ;; riece-button-switch-to-identity changes window-configuration
+      ;; so we must select the last selected window by _buffer_.
+      (if (setq window (get-buffer-window buffer))
+	  (progn
+	    (select-window window)
+	    (set-window-point window point))
+	(if riece-debug
+	    (riece-debug (format "buffer %s not visible"
+				 (buffer-name buffer))))))))
+
 (defun riece-identity-button-popup-menu (event)
   "Popup the menu for identity buttons."
-  (interactive "@e")
+  (interactive "e")
   (save-excursion
     (set-buffer (riece-event-buffer event))
     (goto-char (riece-event-point event))
@@ -179,12 +198,13 @@ This function is used as a callback for a channel button."
 (defun riece-make-identity-button-map ()
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map (current-local-map))
+    (define-key map [down-mouse-2] 'riece-identity-button-click)
     (define-key map [down-mouse-3] 'riece-identity-button-popup-menu)
     map))
 
 (defvar riece-identity-button-map)
 (defun riece-button-add-identity-button (start end)
-  (if riece-button-enabled
+  (if (get 'riece-button 'riece-addon-enabled)
       (riece-scan-property-region
        'riece-identity
        start end
@@ -204,30 +224,70 @@ This function is used as a callback for a channel button."
 (defvar riece-channel-list-mode-map)
 (defvar riece-user-list-mode-map)
 (defvar riece-dialogue-mode-map)
+
+(defun riece-button-channel-list-mode-hook ()
+  (set-keymap-parent riece-channel-list-mode-map widget-keymap)
+  (set (make-local-variable 'riece-identity-button-map)
+       (riece-make-identity-button-map))
+  (add-hook 'riece-update-buffer-functions
+	    'riece-button-update-buffer t t))
+
+(defun riece-button-user-list-mode-hook ()
+  (set-keymap-parent riece-user-list-mode-map widget-keymap)
+  (set (make-local-variable 'riece-identity-button-map)
+       (riece-make-identity-button-map))
+  (add-hook 'riece-update-buffer-functions
+	    'riece-button-update-buffer t t))
+
+(defun riece-button-dialogue-mode-hook ()
+  (set-keymap-parent riece-dialogue-mode-map widget-keymap)
+  (set (make-local-variable 'riece-identity-button-map)
+       (riece-make-identity-button-map)))
+
 (defun riece-button-insinuate ()
+  (save-excursion
+    (when riece-channel-list-buffer
+      (set-buffer riece-channel-list-buffer)
+      (riece-button-channel-list-mode-hook))
+    (when riece-user-list-buffer
+      (set-buffer riece-user-list-buffer)
+      (riece-button-user-list-mode-hook))
+    (let ((buffers riece-buffer-list))
+      (while buffers
+	(set-buffer (car buffers))
+	(if (eq (derived-mode-class major-mode)
+		'riece-dialogue-mode)
+	    (riece-button-dialogue-mode-hook))
+	(setq buffers (cdr buffers)))))
   (add-hook 'riece-channel-list-mode-hook
-	    (lambda ()
-	      (set-keymap-parent riece-channel-list-mode-map widget-keymap)
-	      (set (make-local-variable 'riece-identity-button-map)
-		   (riece-make-identity-button-map))
-	      (add-hook 'riece-update-buffer-functions
-			'riece-button-update-buffer t t)))
+	    'riece-button-channel-list-mode-hook)
   (add-hook 'riece-user-list-mode-hook
-	    (lambda ()
-	      (set-keymap-parent riece-user-list-mode-map widget-keymap)
-	      (set (make-local-variable 'riece-identity-button-map)
-		   (riece-make-identity-button-map))
-	      (add-hook 'riece-update-buffer-functions
-			'riece-button-update-buffer t t)))
+	    'riece-button-user-list-mode-hook)
   (add-hook 'riece-dialogue-mode-hook
-	    (lambda ()
-	      (set-keymap-parent riece-dialogue-mode-map widget-keymap)
-	      (set (make-local-variable 'riece-identity-button-map)
-		   (riece-make-identity-button-map))))
+	    'riece-button-dialogue-mode-hook)
   (add-hook 'riece-after-insert-functions 'riece-button-add-identity-button))
 
+(defun riece-button-uninstall ()
+  (let ((buffers riece-buffer-list))
+    (save-excursion
+      (while buffers
+	(set-buffer (car buffers))
+	(remove-hook 'riece-update-buffer-functions
+		     'riece-button-update-buffer t)
+	(if (local-variable-p 'riece-identity-button-map
+			      (car buffers))
+	    (kill-local-variable 'riece-identity-button-map))
+	(setq buffers (cdr buffers)))))
+  (remove-hook 'riece-channel-list-mode-hook
+	       'riece-button-channel-list-mode-hook)
+  (remove-hook 'riece-user-list-mode-hook
+	       'riece-button-user-list-mode-hook)
+  (remove-hook 'riece-dialogue-mode-hook
+	       'riece-button-dialogue-mode-hook)
+  (remove-hook 'riece-after-insert-functions
+	       'riece-button-add-identity-button))
+
 (defun riece-button-enable ()
-  (setq riece-button-enabled t)
   (let ((pointer riece-buffer-list))
     (while pointer
       (with-current-buffer (car pointer)
@@ -240,14 +300,15 @@ This function is used as a callback for a channel button."
     (riece-emit-signal 'channel-list-changed)))
 
 (defun riece-button-disable ()
-  (setq riece-button-enabled nil)
-  (let ((pointer riece-buffer-list))
-    (while pointer
-      (widget-map-buttons
-       (lambda (widget maparg)
-	 (widget-leave-text widget))
-       (car pointer))
-      (setq pointer (cdr pointer)))))
+  (save-excursion
+    (let ((pointer riece-buffer-list))
+      (while pointer
+	;; On XEmacs, BUFFER arg of widget-map-buttons is ignored.
+	(set-buffer (car pointer))
+	(widget-map-buttons
+	 (lambda (widget maparg)
+	   (widget-leave-text widget)))
+	(setq pointer (cdr pointer))))))
 
 (provide 'riece-button)