annotate lisp/tool-bar.el @ 109895:d25d73314584

Fix the MSDOS build broken by the ImageMagick support. sed1v2.inp (IMAGEMAGICK_LIBS, IMAGEMAGICK_CFLAGS): Edit to empty.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 20 Aug 2010 23:28:39 +0300
parents 783986775ee8
children 280c8ae2476d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
1 ;;; tool-bar.el --- setting up the tool bar
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
2 ;;
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
3 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105870
diff changeset
4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
5 ;;
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
6 ;; Author: Dave Love <fx@gnu.org>
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
7 ;; Keywords: mouse frames
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
8
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
10
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; (at your option) any later version.
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
15
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
19 ;; GNU General Public License for more details.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
20
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
23
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
24 ;;; Commentary:
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
25
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
26 ;; Provides `tool-bar-mode' to control display of the tool-bar and
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
27 ;; bindings for the global tool bar with convenience functions
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
28 ;; `tool-bar-add-item' and `tool-bar-add-item-from-menu'.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
29
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
30 ;; The normal global binding for [tool-bar] (below) uses the value of
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
31 ;; `tool-bar-map' as the actual keymap to define the tool bar. Modes
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
32 ;; may either bind items under the [tool-bar] prefix key of the local
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
33 ;; map to add to the global bar or may set `tool-bar-map'
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
34 ;; buffer-locally to override it. (Some items are removed from the
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
35 ;; global bar in modes which have `special' as their `mode-class'
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
36 ;; property.)
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
37
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
38 ;; Todo: Somehow make tool bars easily customizable by the naive?
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
39
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
40 ;;; Code:
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
41
66494
b9971215f644 (tool-bar-mode): Delete autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents: 66168
diff changeset
42 ;; The autoload cookie doesn't work when preloading.
b9971215f644 (tool-bar-mode): Delete autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents: 66168
diff changeset
43 ;; Deleting it means invoking this command won't work
b9971215f644 (tool-bar-mode): Delete autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents: 66168
diff changeset
44 ;; when you are on a tty. I hope that won't cause too much trouble -- rms.
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
45 (define-minor-mode tool-bar-mode
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
46 "Toggle use of the tool bar.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
47 With numeric ARG, display the tool bar if and only if ARG is positive.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
48
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
49 See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
50 conveniently adding tool bar items."
109058
2f0720afc474 Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents: 108110
diff changeset
51 :init-value t
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
52 :global t
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
53 :group 'mouse
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
54 :group 'frames
109058
2f0720afc474 Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents: 108110
diff changeset
55 (let ((val (if tool-bar-mode 1 0)))
2f0720afc474 Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249).
Chong Yidong <cyd@stupidchicken.com>
parents: 108110
diff changeset
56 (dolist (frame (frame-list))
109147
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
57 (set-frame-parameter frame 'tool-bar-lines val))
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
58 ;; If the user has given `default-frame-alist' a `tool-bar-lines'
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
59 ;; parameter, replace it.
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
60 (if (assq 'tool-bar-lines default-frame-alist)
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
61 (setq default-frame-alist
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
62 (cons (cons 'tool-bar-lines val)
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
63 (assq-delete-all 'tool-bar-lines
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
64 default-frame-alist)))))
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
65 (and tool-bar-mode
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
66 (= 1 (length (default-value 'tool-bar-map))) ; not yet setup
783986775ee8 Set default-frame-alist, if necessary, in menu/tool-bar-mode.
Chong Yidong <cyd@stupidchicken.com>
parents: 109058
diff changeset
67 (tool-bar-setup)))
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
68
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
69 ;;;###autoload
83497
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
70 ;; Used in the Show/Hide menu, to have the toggle reflect the current frame.
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
71 (defun toggle-tool-bar-mode-from-frame (&optional arg)
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
72 "Toggle tool bar on or off, based on the status of the current frame.
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
73 See `tool-bar-mode' for more information."
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
74 (interactive (list (or current-prefix-arg 'toggle)))
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
75 (if (eq arg 'toggle)
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
76 (tool-bar-mode (if (> (frame-parameter nil 'tool-bar-lines) 0) 0 1))
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
77 (tool-bar-mode arg)))
a25bb5ef27bf Fix tool-bar and menu-bar toggles in Show/Hide menu to reflect the state of the current frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83496
diff changeset
78
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
79 (defvar tool-bar-map (make-sparse-keymap)
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
80 "Keymap for the tool bar.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
81 Define this locally to override the global tool bar.")
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
82
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
83 (global-set-key [tool-bar]
105870
26baacb565b0 * textmodes/tex-mode.el (tex-alt-dvi-print-command)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101039
diff changeset
84 `(menu-item ,(purecopy "tool bar") ignore
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
85 :filter tool-bar-make-keymap))
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
86
95841
b4e36ff621b3 Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents: 94899
diff changeset
87 (declare-function image-mask-p "image.c" (spec &optional frame))
b4e36ff621b3 Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents: 94899
diff changeset
88
99971
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
89 (defconst tool-bar-keymap-cache (make-hash-table :weakness t :test 'equal))
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
90
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
91 (defun tool-bar-make-keymap (&optional ignore)
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
92 "Generate an actual keymap from `tool-bar-map'.
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
93 Its main job is to figure out which images to use based on the display's
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
94 color capability and based on the available image libraries."
99971
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
95 (let ((key (cons (frame-terminal) tool-bar-map)))
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
96 (or (gethash key tool-bar-keymap-cache)
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
97 (puthash key (tool-bar-make-keymap-1) tool-bar-keymap-cache))))
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
98
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
99 (defun tool-bar-make-keymap-1 ()
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
100 "Generate an actual keymap from `tool-bar-map', without caching."
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
101 (mapcar (lambda (bind)
94897
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
102 (let (image-exp plist)
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
103 (when (and (eq (car-safe (cdr-safe bind)) 'menu-item)
94897
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
104 ;; For the format of menu-items, see node
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
105 ;; `Extended Menu Items' in the Elisp manual.
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
106 (setq plist (nthcdr (if (consp (nth 4 bind)) 5 4)
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
107 bind))
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
108 (setq image-exp (plist-get plist :image))
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
109 (consp image-exp)
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
110 (not (eq (car image-exp) 'image))
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
111 (fboundp (car image-exp)))
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
112 (if (not (display-images-p))
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
113 (setq bind nil)
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
114 (let ((image (eval image-exp)))
94899
29fb4d52c079 (tool-bar-make-keymap): Additional minor fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 94897
diff changeset
115 (unless (and image (image-mask-p image))
94897
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
116 (setq image (append image '(:mask heuristic))))
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
117 (setq bind (copy-sequence bind)
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
118 plist (nthcdr (if (consp (nth 4 bind)) 5 4)
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
119 bind))
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
120 (plist-put plist :image image))))
f23487dcd0a8 (tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents: 94727
diff changeset
121 bind))
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
122 tool-bar-map))
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
123
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
124 ;;;###autoload
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
125 (defun tool-bar-add-item (icon def key &rest props)
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
126 "Add an item to the tool bar.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
127 ICON names the image, DEF is the key definition and KEY is a symbol
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
128 for the fake function key in the menu keymap. Remaining arguments
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
129 PROPS are additional items to add to the menu item specification. See
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
130 Info node `(elisp)Tool Bar'. Items are added from left to right.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
131
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
132 ICON is the base name of a file containing the image to use. The
80756
76e75acf7e4e Fix typos (sync from the trunk).
Juanma Barranquero <lekktu@gmail.com>
parents: 79721
diff changeset
133 function will first try to use low-color/ICON.xpm if `display-color-cells'
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
134 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
135 ICON.xbm, using `find-image'.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
136
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
137 Use this function only to make bindings in the global value of `tool-bar-map'.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
138 To define items in any other map, use `tool-bar-local-item'."
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
139 (apply 'tool-bar-local-item icon def key tool-bar-map props))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
140
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
141 ;;;###autoload
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
142 (defun tool-bar-local-item (icon def key map &rest props)
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
143 "Add an item to the tool bar in map MAP.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
144 ICON names the image, DEF is the key definition and KEY is a symbol
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
145 for the fake function key in the menu keymap. Remaining arguments
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
146 PROPS are additional items to add to the menu item specification. See
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
147 Info node `(elisp)Tool Bar'. Items are added from left to right.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
148
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
149 ICON is the base name of a file containing the image to use. The
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
150 function will first try to use low-color/ICON.xpm if `display-color-cells'
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
151 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
152 ICON.xbm, using `find-image'."
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
153 (let* ((fg (face-attribute 'tool-bar :foreground))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
154 (bg (face-attribute 'tool-bar :background))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
155 (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
156 (if (eq bg 'unspecified) nil (list :background bg))))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
157 (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
98624
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
158 (xpm-lo-spec (list :type 'xpm :file
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
159 (concat "low-color/" icon ".xpm")))
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
160 (pbm-spec (append (list :type 'pbm :file
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
161 (concat icon ".pbm")) colors))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
162 (xbm-spec (append (list :type 'xbm :file
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
163 (concat icon ".xbm")) colors))
99971
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
164 (image-exp `(find-image
98624
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
165 (cond ((not (display-color-p))
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
166 ',(list pbm-spec xbm-spec xpm-lo-spec xpm-spec))
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
167 ((< (display-color-cells) 256)
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
168 ',(list xpm-lo-spec xpm-spec pbm-spec xbm-spec))
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
169 (t
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
170 ',(list xpm-spec pbm-spec xbm-spec))))))
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
171 (define-key-after map (vector key)
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
172 `(menu-item ,(symbol-name key) ,def :image ,image-exp ,@props))))
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
173
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
174 ;;;###autoload
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
175 (defun tool-bar-add-item-from-menu (command icon &optional map &rest props)
66512
759df5a9dc3e (tool-bar-add-item-from-menu)
Nick Roberts <nickrob@snap.net.nz>
parents: 66494
diff changeset
176 "Define tool bar binding for COMMAND in keymap MAP using the given ICON.
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
177 This makes a binding for COMMAND in `tool-bar-map', copying its
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
178 binding from the menu bar in MAP (which defaults to `global-map'), but
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
179 modifies the binding by adding an image specification for ICON. It
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
180 finds ICON just like `tool-bar-add-item'. PROPS are additional
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
181 properties to add to the binding.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
182
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
183 MAP must contain appropriate binding for `[menu-bar]' which holds a keymap.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
184
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
185 Use this function only to make bindings in the global value of `tool-bar-map'.
66512
759df5a9dc3e (tool-bar-add-item-from-menu)
Nick Roberts <nickrob@snap.net.nz>
parents: 66494
diff changeset
186 To define items in any other map, use `tool-bar-local-item-from-menu'."
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
187 (apply 'tool-bar-local-item-from-menu command icon
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
188 (default-value 'tool-bar-map) map props))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
189
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
190 ;;;###autoload
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
191 (defun tool-bar-local-item-from-menu (command icon in-map &optional from-map &rest props)
66512
759df5a9dc3e (tool-bar-add-item-from-menu)
Nick Roberts <nickrob@snap.net.nz>
parents: 66494
diff changeset
192 "Define local tool bar binding for COMMAND using the given ICON.
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
193 This makes a binding for COMMAND in IN-MAP, copying its binding from
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
194 the menu bar in FROM-MAP (which defaults to `global-map'), but
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
195 modifies the binding by adding an image specification for ICON. It
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
196 finds ICON just like `tool-bar-add-item'. PROPS are additional
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
197 properties to add to the binding.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
198
66512
759df5a9dc3e (tool-bar-add-item-from-menu)
Nick Roberts <nickrob@snap.net.nz>
parents: 66494
diff changeset
199 FROM-MAP must contain appropriate binding for `[menu-bar]' which
759df5a9dc3e (tool-bar-add-item-from-menu)
Nick Roberts <nickrob@snap.net.nz>
parents: 66494
diff changeset
200 holds a keymap."
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
201 (unless from-map
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
202 (setq from-map global-map))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
203 (let* ((menu-bar-map (lookup-key from-map [menu-bar]))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
204 (keys (where-is-internal command menu-bar-map))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
205 (fg (face-attribute 'tool-bar :foreground))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
206 (bg (face-attribute 'tool-bar :background))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
207 (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
208 (if (eq bg 'unspecified) nil (list :background bg))))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
209 (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
98624
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
210 (xpm-lo-spec (list :type 'xpm :file
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
211 (concat "low-color/" icon ".xpm")))
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
212 (pbm-spec (append (list :type 'pbm :file
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
213 (concat icon ".pbm")) colors))
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
214 (xbm-spec (append (list :type 'xbm :file
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
215 (concat icon ".xbm")) colors))
99971
1b6dc3613e69 (tool-bar-find-image-cache): Var deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98658
diff changeset
216 (image-exp `(find-image
98624
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
217 (cond ((not (display-color-p))
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
218 ',(list pbm-spec xbm-spec xpm-lo-spec xpm-spec))
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
219 ((< (display-color-cells) 256)
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
220 ',(list xpm-lo-spec xpm-spec pbm-spec xbm-spec))
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
221 (t
14621c767c96 (tool-bar-local-item)
Chong Yidong <cyd@stupidchicken.com>
parents: 98594
diff changeset
222 ',(list xpm-spec pbm-spec xbm-spec)))))
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
223 submap key)
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
224 ;; We'll pick up the last valid entry in the list of keys if
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
225 ;; there's more than one.
108085
34eca4ecfbe6 Provide byte-compiler warnings when set-default a read-only var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108024
diff changeset
226 ;; FIXME: Aren't they *all* "valid"?? --Stef
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
227 (dolist (k keys)
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
228 ;; We're looking for a binding of the command in a submap of
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
229 ;; the menu bar map, so the key sequence must be two or more
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
230 ;; long.
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
231 (if (and (vectorp k)
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
232 (> (length k) 1))
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
233 (let ((m (lookup-key menu-bar-map (substring k 0 -1)))
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
234 ;; Last element in the bound key sequence:
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
235 (kk (aref k (1- (length k)))))
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
236 (if (and (keymapp m)
108110
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
237 (symbolp kk))
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
238 (setq submap m
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
239 key kk)))))
108110
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
240 (when (and (symbolp submap) (boundp submap))
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
241 (setq submap (eval submap)))
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
242 (let ((defn (assq key (cdr submap))))
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
243 (if (eq (cadr defn) 'menu-item)
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
244 (define-key-after in-map (vector key)
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
245 (append (cdr defn) (list :image image-exp) props))
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
246 (setq defn (cdr defn))
94727
ddce4c48ffb7 Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94678
diff changeset
247 (define-key-after in-map (vector key)
108110
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
248 (let ((rest (cdr defn)))
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
249 ;; If the rest of the definition starts
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
250 ;; with a list of menu cache info, get rid of that.
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
251 (if (and (consp rest) (consp (car rest)))
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
252 (setq rest (cdr rest)))
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
253 (append `(menu-item ,(car defn) ,rest)
21b1df34bc55 tool-bar.el: Revert unintended checkin in rev 100010.
Jan D <jan.h.d@swipnet.se>
parents: 108085
diff changeset
254 (list :image image-exp) props)))))))
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
255
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
256 ;;; Set up some global items. Additions/deletions up for grabs.
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
257
98658
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
258 (defun tool-bar-setup ()
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
259 ;; People say it's bad to have EXIT on the tool bar, since users
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
260 ;; might inadvertently click that button.
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
261 ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit")
108024
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
262 (tool-bar-add-item-from-menu 'find-file "new" nil :label "New File")
98658
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
263 (tool-bar-add-item-from-menu 'menu-find-file-existing "open")
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
264 (tool-bar-add-item-from-menu 'dired "diropen")
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
265 (tool-bar-add-item-from-menu 'kill-this-buffer "close")
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
266 (tool-bar-add-item-from-menu 'save-buffer "save" nil
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
267 :visible '(or buffer-file-name
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
268 (not (eq 'special
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
269 (get major-mode
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
270 'mode-class)))))
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
271 (tool-bar-add-item-from-menu 'write-file "saveas" nil
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
272 :visible '(or buffer-file-name
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
273 (not (eq 'special
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
274 (get major-mode
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
275 'mode-class)))))
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
276 (tool-bar-add-item-from-menu 'undo "undo" nil
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
277 :visible '(not (eq 'special (get major-mode
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
278 'mode-class))))
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
279 (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut])
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
280 "cut" nil
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
281 :visible '(not (eq 'special (get major-mode
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
282 'mode-class))))
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
283 (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy])
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
284 "copy")
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
285 (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste])
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
286 "paste" nil
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
287 :visible '(not (eq 'special (get major-mode
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
288 'mode-class))))
108024
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
289 (tool-bar-add-item-from-menu 'nonincremental-search-forward "search"
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
290 nil :label "Search")
98658
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
291 ;;(tool-bar-add-item-from-menu 'ispell-buffer "spell")
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
292
98658
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
293 ;; There's no icon appropriate for News and we need a command rather
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
294 ;; than a lambda for Read Mail.
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
295 ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose")
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
296
108024
4d8277a44bb4 Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents: 106815
diff changeset
297 (tool-bar-add-item-from-menu 'print-buffer "print" nil :label "Print")
98658
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
298
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
299 ;; tool-bar-add-item-from-menu itself operates on
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
300 ;; (default-value 'tool-bar-map), but when we don't use that function,
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
301 ;; we must explicitly operate on the default value.
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
302
98658
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
303 (let ((tool-bar-map (default-value 'tool-bar-map)))
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
304 (tool-bar-add-item "preferences" 'customize 'customize
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
305 :help "Edit preferences (customize)")
70323
810cd69c168f (tool-bar-setup): Put Help and Preferences items in the default tool-bar-map.
Richard M. Stallman <rms@gnu.org>
parents: 68651
diff changeset
306
98658
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
307 (tool-bar-add-item "help" (lambda ()
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
308 (interactive)
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
309 (popup-menu menu-bar-help-menu))
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
310 'help
3e7bd62df13a (tool-bar-setup): Variable deleted.
Chong Yidong <cyd@stupidchicken.com>
parents: 98624
diff changeset
311 :help "Pop up the Help menu")))
83514
d9f8d2a65d18 Merged from emacs@sv.gnu.org
Karoly Lorentey <lorentey@elte.hu>
parents: 83497 70323
diff changeset
312
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
313
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
314 (provide 'tool-bar)
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92262
diff changeset
315 ;; arch-tag: 15f30f0a-d0d7-4d50-bbb7-f48fd0c8582f
66168
28718fa5d988 Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff changeset
316 ;;; tool-bar.el ends here