X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-toolbar.el;h=48c39090bee3d530f50b1aa5dfb31d677ea3bf97;hp=dcc104dcccdd81d40e4cbe6ffb4bf3933d30ea43;hb=2ca8922fb84a9a42bf2fe4c65faf1db3c7ff7426;hpb=536e383fc9aa7ea3249c734cda5359184262672c

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index dcc104d..48c3909 100644
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.el
@@ -19,8 +19,8 @@
 
 ;; 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:
 
@@ -54,50 +54,64 @@
 	(setq pointer (cdr pointer))))
     item))
 
-(if (featurep 'xemacs)
-    (if (featurep 'toolbar)
-	(progn
-	  (defun riece-make-toolbar-from-menu (items menu-items map)
-	    (let ((pointer items)
-		  toolbar
-		  file
-		  menu-item)
-	      (while pointer
-		(setq file (locate-file (symbol-name (car pointer))
-					(cons riece-data-directory load-path)
-					'(".xpm" ".pbm" ".xbm"))
-		      menu-item (riece-toolbar-find-menu-item (car pointer)))
-		(if (and file (file-exists-p file))
-		    (setq toolbar
-			  (toolbar-add-item
-			   toolbar
-			   (toolbar-new-button
-			    file
-			    (car pointer)
-			    (if menu-item
-				(aref menu-item 0)
-			      (symbol-name (car pointer)))))))
-		(setq pointer (cdr pointer)))
-	      toolbar))
-	  (defun riece-set-toolbar (toolbar)
-	    (set-specifier default-toolbar toolbar (current-buffer))))
-      (defalias 'riece-make-toolbar-from-menu 'ignore)
-      (defalias 'riece-set-toolbar 'ignore))
-  (defun riece-make-toolbar-from-menu (items menu-items map)
-    (let ((pointer items)
-	  (tool-bar-map (make-sparse-keymap)))
-      (while pointer
-	(tool-bar-add-item-from-menu (car pointer)
-				     (symbol-name (car pointer))
-				     map)
-	(setq pointer (cdr pointer)))
-      tool-bar-map))
-  (defun riece-set-toolbar (toolbar)
-    (make-local-variable 'tool-bar-map)
-    (setq tool-bar-map toolbar)))
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (if (featurep 'toolbar)
+	  (progn
+	    (defun riece-make-toolbar-from-menu (items menu-items map)
+	      (let ((pointer items)
+		    toolbar
+		    file
+		    menu-item)
+		(while pointer
+		  (setq file (locate-file (symbol-name (car pointer))
+					  (cons riece-data-directory load-path)
+					  '(".xpm" ".pbm" ".xbm"))
+			menu-item (riece-toolbar-find-menu-item (car pointer)))
+		  (if (and file (file-exists-p file))
+		      (setq toolbar
+			    (toolbar-add-item
+			     toolbar
+			     (toolbar-new-button
+			      file
+			      (car pointer)
+			      (if menu-item
+				  (aref menu-item 0)
+				(symbol-name (car pointer)))))))
+		  (setq pointer (cdr pointer)))
+		toolbar))
+	    (defvar riece-toolbar-original-toolbar nil)
+	    (defun riece-set-toolbar (toolbar)
+	      (make-local-variable 'riece-toolbar-original-toolbar)
+	      (setq riece-toolbar-original-toolbar
+		    (specifier-specs default-toolbar (current-buffer)))
+	      (set-specifier default-toolbar toolbar (current-buffer)))
+	    (defun riece-unset-toolbar ()
+	      (if riece-toolbar-original-toolbar
+		  (set-specifier default-toolbar riece-toolbar-original-toolbar
+				 (current-buffer))
+		(remove-specifier default-toolbar (current-buffer)))
+	      (kill-local-variable 'riece-toolbar-original-toolbar)))
+	(defalias 'riece-make-toolbar-from-menu 'ignore)
+	(defalias 'riece-set-toolbar 'ignore)
+	(defalias 'riece-unset-toolbar 'ignore))
+    (defun riece-make-toolbar-from-menu (items menu-items map)
+      (let ((pointer items)
+	    (tool-bar-map (make-sparse-keymap)))
+	(while pointer
+	  (tool-bar-add-item-from-menu (car pointer)
+				       (symbol-name (car pointer))
+				       map)
+	  (setq pointer (cdr pointer)))
+	tool-bar-map))
+    (defun riece-set-toolbar (toolbar)
+      (make-local-variable 'tool-bar-map)
+      (setq tool-bar-map toolbar))
+    (defun riece-unset-toolbar ()
+      (kill-local-variable 'tool-bar-map))))
 
 (defvar riece-command-mode-map)
-(defun riece-toolbar-insinuate-in-command-buffer ()
+(defun riece-toolbar-command-mode-hook ()
   (riece-set-toolbar
    (riece-make-toolbar-from-menu
     riece-toolbar-items
@@ -108,16 +122,19 @@
   '(riece-menu))
 
 (defun riece-toolbar-insinuate ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(riece-toolbar-command-mode-hook)))
   (add-hook 'riece-command-mode-hook
-	    'riece-toolbar-insinuate-in-command-buffer
-	    t))
+	    'riece-toolbar-command-mode-hook t))
 
 (defun riece-toolbar-uninstall ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(riece-unset-toolbar)))
   (remove-hook 'riece-command-mode-hook
-	       'riece-toolbar-insinuate-in-command-buffer)
-  ;;FIXME: couldn't uninstall completely.
-  )
+	       'riece-toolbar-command-mode-hook))
 
 (provide 'riece-toolbar)
 
-;;; riece-toolbar.el ends here
\ No newline at end of file
+;;; riece-toolbar.el ends here