Mercurial > emacs
annotate lisp/tool-bar.el @ 97718:bb0e27c55c2e
Typo.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 26 Aug 2008 03:05:04 +0000 |
parents | b4e36ff621b3 |
children | ab6494b53df0 |
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, |
79721 | 4 ;; 2005, 2006, 2007, 2008 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." |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
51 :init-value nil |
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 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
55 (and (display-images-p) |
83496
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
56 (modify-all-frames-parameters (list (cons 'tool-bar-lines |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
57 (if tool-bar-mode 1 0)))) |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
58 (if (and tool-bar-mode |
83496
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
59 (display-graphic-p)) |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
60 (tool-bar-setup)))) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
61 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
62 ;;;###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
|
63 ;; 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
|
64 (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
|
65 "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
|
66 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
|
67 (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
|
68 (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
|
69 (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
|
70 (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
|
71 |
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 ;;;###autoload |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
73 ;; We want to pretend the toolbar by standard is on, as this will make |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
74 ;; customize consider disabling the toolbar a customization, and save |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
75 ;; that. We could do this for real by setting :init-value above, but |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
76 ;; that would turn on the toolbar in MS Windows where it is currently |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
77 ;; useless, and it would overwrite disabling the tool bar from X |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
78 ;; resources. If anyone want to implement this in a cleaner way, |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
79 ;; please do so. |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
80 ;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-21. |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
81 (put 'tool-bar-mode 'standard-value '(t)) |
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 (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
|
84 "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
|
85 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
|
86 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
87 (global-set-key [tool-bar] |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
88 '(menu-item "tool bar" ignore |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
89 :filter tool-bar-make-keymap)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
90 |
95841
b4e36ff621b3
Add some compiler declarations, for builds without X.
Glenn Morris <rgm@gnu.org>
parents:
94899
diff
changeset
|
91 (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
|
92 |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
93 (defun tool-bar-make-keymap (&optional ignore) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
94 "Generate an actual keymap from `tool-bar-map'. |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
95 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
|
96 color capability and based on the available image libraries." |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
97 (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
|
98 (let (image-exp plist) |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
99 (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
|
100 ;; 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
|
101 ;; `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
|
102 (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
|
103 bind)) |
f23487dcd0a8
(tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents:
94727
diff
changeset
|
104 (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
|
105 (consp image-exp) |
f23487dcd0a8
(tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents:
94727
diff
changeset
|
106 (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
|
107 (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
|
108 (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
|
109 (setq bind nil) |
f23487dcd0a8
(tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents:
94727
diff
changeset
|
110 (let ((image (eval image-exp))) |
94899
29fb4d52c079
(tool-bar-make-keymap): Additional minor fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
94897
diff
changeset
|
111 (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
|
112 (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
|
113 (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
|
114 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
|
115 bind)) |
f23487dcd0a8
(tool-bar-make-keymap): Account for the optional KEY-BINDING-DATA
Chong Yidong <cyd@stupidchicken.com>
parents:
94727
diff
changeset
|
116 (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
|
117 bind)) |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
118 tool-bar-map)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
119 |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
120 (defconst tool-bar-find-image-cache (make-hash-table :weakness t :test 'equal)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
121 |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
122 (defun tool-bar-find-image (specs) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
123 "Like `find-image' but with caching." |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
124 (or (gethash specs tool-bar-find-image-cache) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
125 (puthash specs (find-image specs) tool-bar-find-image-cache))) |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
126 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
127 ;;;###autoload |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
128 (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
|
129 "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
|
130 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
|
131 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
|
132 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
|
133 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
|
134 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
135 ICON is the base name of a file containing the image to use. The |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
136 function will first try to use low-color/ICON.xpm if display-color-cells |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
137 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
|
138 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
|
139 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
140 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
|
141 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
|
142 (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
|
143 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
144 ;;;###autoload |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
145 (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
|
146 "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
|
147 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
|
148 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
|
149 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
|
150 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
|
151 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
152 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
|
153 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
|
154 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
|
155 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
|
156 (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
|
157 (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
|
158 (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
|
159 (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
|
160 (xpm-spec (list :type 'xpm :file (concat icon ".xpm"))) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
161 (xpm-lo-spec (if (> (display-color-cells) 256) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
162 nil |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
163 (list :type 'xpm :file |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
164 (concat "low-color/" icon ".xpm")))) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
165 (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
|
166 (concat icon ".pbm")) colors)) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
167 (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
|
168 (concat icon ".xbm")) colors)) |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
169 (image-exp `(tool-bar-find-image |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
170 (if (display-color-p) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
171 ',(list xpm-lo-spec xpm-spec pbm-spec xbm-spec) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
172 ',(list pbm-spec xbm-spec xpm-lo-spec xpm-spec))))) |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
173 |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
174 (define-key-after map (vector key) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
175 `(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
|
176 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
177 ;;;###autoload |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
178 (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
|
179 "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
|
180 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
|
181 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
|
182 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
|
183 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
|
184 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
|
185 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
186 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
|
187 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
188 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
|
189 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
|
190 (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
|
191 (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
|
192 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
193 ;;;###autoload |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
194 (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
|
195 "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
|
196 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
|
197 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
|
198 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
|
199 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
|
200 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
|
201 |
66512
759df5a9dc3e
(tool-bar-add-item-from-menu)
Nick Roberts <nickrob@snap.net.nz>
parents:
66494
diff
changeset
|
202 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
|
203 holds a keymap." |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
204 (unless from-map |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
205 (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
|
206 (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
|
207 (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
|
208 (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
|
209 (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
|
210 (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
|
211 (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
|
212 (xpm-spec (list :type 'xpm :file (concat icon ".xpm"))) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
213 (xpm-lo-spec (if (> (display-color-cells) 256) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
214 nil |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
215 (list :type 'xpm :file |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
216 (concat "low-color/" icon ".xpm")))) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
217 (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
|
218 (concat icon ".pbm")) colors)) |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
219 (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
|
220 (concat icon ".xbm")) colors)) |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
221 (image-exp `(tool-bar-find-image |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
222 (if (display-color-p) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
223 ',(list xpm-lo-spec xpm-spec pbm-spec xbm-spec) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
224 ',(list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))) |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
225 submap key) |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
226 ;; 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
|
227 ;; there's more than one. |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
228 (dolist (k keys) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
229 ;; 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
|
230 ;; 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
|
231 ;; long. |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
232 (if (and (vectorp k) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
233 (> (length k) 1)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
234 (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
|
235 ;; Last element in the bound key sequence: |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
236 (kk (aref k (1- (length k))))) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
237 (if (and (keymapp m) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
238 (symbolp kk)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
239 (setq submap m |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
240 key kk))))) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
241 (when (and (symbolp submap) (boundp submap)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
242 (setq submap (eval submap))) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
243 (let ((defn (assq key (cdr submap)))) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
244 (if (eq (cadr defn) 'menu-item) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
245 (define-key-after in-map (vector key) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
246 (append (cdr defn) (list :image image-exp) props)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
247 (setq defn (cdr defn)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
248 (define-key-after in-map (vector key) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
249 (let ((rest (cdr defn))) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
250 ;; If the rest of the definition starts |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
251 ;; with a list of menu cache info, get rid of that. |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
252 (if (and (consp rest) (consp (car rest))) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
253 (setq rest (cdr rest))) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
254 (append `(menu-item ,(car defn) ,rest) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
255 (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
|
256 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
257 ;;; 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
|
258 |
83496
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
259 (defvar tool-bar-setup nil |
92262
618fc74048e4
(tool-bar-setup): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
87649
diff
changeset
|
260 "Set to t if the tool-bar has been set up by `tool-bar-setup'.") |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
261 |
83496
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
262 (defun tool-bar-setup (&optional frame) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
263 (unless tool-bar-setup |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
264 (with-selected-frame (or frame (selected-frame)) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
265 ;; People say it's bad to have EXIT on the tool bar, since users |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
266 ;; might inadvertently click that button. |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
267 ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit") |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
268 (tool-bar-add-item-from-menu 'find-file "new") |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
269 (tool-bar-add-item-from-menu 'menu-find-file-existing "open") |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
270 (tool-bar-add-item-from-menu 'dired "diropen") |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
271 (tool-bar-add-item-from-menu 'kill-this-buffer "close") |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
272 (tool-bar-add-item-from-menu 'save-buffer "save" nil |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
273 :visible '(or buffer-file-name |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
274 (not (eq 'special |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
275 (get major-mode |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
276 'mode-class))))) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
277 (tool-bar-add-item-from-menu 'write-file "saveas" nil |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
278 :visible '(or buffer-file-name |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
279 (not (eq 'special |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
280 (get major-mode |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
281 'mode-class))))) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
282 (tool-bar-add-item-from-menu 'undo "undo" nil |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
283 :visible '(not (eq 'special (get major-mode |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
284 'mode-class)))) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
285 (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut]) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
286 "cut" nil |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
287 :visible '(not (eq 'special (get major-mode |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
288 'mode-class)))) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
289 (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy]) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
290 "copy") |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
291 (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste]) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
292 "paste" nil |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
293 :visible '(not (eq 'special (get major-mode |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
294 'mode-class)))) |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
295 (tool-bar-add-item-from-menu 'nonincremental-search-forward "search") |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
296 ;;(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
|
297 |
83496
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
298 ;; There's no icon appropriate for News and we need a command rather |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
299 ;; than a lambda for Read Mail. |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
300 ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose") |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
301 |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
302 (tool-bar-add-item-from-menu 'print-buffer "print") |
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
|
303 |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
304 ;; tool-bar-add-item-from-menu itself operates on |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
305 ;; (default-value 'tool-bar-map), but when we don't use that function, |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
306 ;; 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
|
307 |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
308 (let ((tool-bar-map (default-value 'tool-bar-map))) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
309 (tool-bar-add-item "preferences" 'customize 'customize |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
310 :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
|
311 |
94727
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
312 (tool-bar-add-item "help" (lambda () |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
313 (interactive) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
314 (popup-menu menu-bar-help-menu)) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
315 'help |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
316 :help "Pop up the Help menu")) |
ddce4c48ffb7
Choose images dynamically.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94678
diff
changeset
|
317 (setq tool-bar-setup t)))) |
83514 | 318 |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
319 |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
320 (provide 'tool-bar) |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92262
diff
changeset
|
321 ;; 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
|
322 ;;; tool-bar.el ends here |