annotate src/toolbar.c @ 286:57709be46d1b r21-0b41

Import from CVS: tag r21-0b41
author cvs
date Mon, 13 Aug 2007 10:35:03 +0200
parents 558f606b08ae
children 8626e4521993
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* Generic toolbar implementation.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1995 Board of Trustees, University of Illinois.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 Copyright (C) 1995 Sun Microsystems, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 Copyright (C) 1995, 1996 Ben Wing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 Copyright (C) 1996 Chuck Thompson.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 /* Original implementation by Chuck Thompson for 19.12.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 Default-toolbar-position and specifier-related stuff by Ben Wing. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 #include "buffer.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 #include "frame.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 #include "device.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 #include "glyphs.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 #include "redisplay.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 #include "toolbar.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 #include "window.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 Lisp_Object Vtoolbar[4];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 Lisp_Object Vtoolbar_size[4];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 Lisp_Object Vtoolbar_visible_p[4];
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
43 Lisp_Object Vtoolbar_border_width[4];
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 Lisp_Object Vdefault_toolbar, Vdefault_toolbar_visible_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 Lisp_Object Vdefault_toolbar_width, Vdefault_toolbar_height;
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
47 Lisp_Object Vdefault_toolbar_border_width;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 Lisp_Object Vdefault_toolbar_position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 Lisp_Object Vtoolbar_buttons_captioned_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 Lisp_Object Qtoolbar_buttonp;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 Lisp_Object Q2D, Q3D, Q2d, Q3d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 Lisp_Object Q_size;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 Lisp_Object Qinit_toolbar_from_resources;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 mark_toolbar_button (Lisp_Object obj, void (*markobj) (Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 struct toolbar_button *data = (struct toolbar_button *) XPNTR (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63 ((markobj) (data->next));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 ((markobj) (data->frame));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 ((markobj) (data->up_glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 ((markobj) (data->down_glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 ((markobj) (data->disabled_glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 ((markobj) (data->cap_up_glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 ((markobj) (data->cap_down_glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 ((markobj) (data->cap_disabled_glyph));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 ((markobj) (data->callback));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 ((markobj) (data->enabled_p));
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
73 return data->help_string;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 print_toolbar_button (Lisp_Object obj, Lisp_Object printcharfun,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78 int escapeflag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 struct toolbar_button *tb = XTOOLBAR_BUTTON (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 char buf[100];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 if (print_readably)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 error ("printing unreadable object #<toolbar-button 0x%x>",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 tb->header.uid);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 sprintf (buf, "#<toolbar-button 0x%x>", tb->header.uid);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 write_c_string (buf, printcharfun);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 DEFINE_LRECORD_IMPLEMENTATION ("toolbar-button", toolbar_button,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 mark_toolbar_button, print_toolbar_button,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 0, 0, 0,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 struct toolbar_button);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
96 DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 Return non-nil if OBJECT is a toolbar button.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
98 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
99 (object))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
101 return TOOLBAR_BUTTONP (object) ? Qt : Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 /* Only query functions are provided for toolbar buttons. They are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 generated and updated from a toolbar description list. Any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 directly made changes would be wiped out the first time the toolbar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
107 was marked as dirty and was regenerated. The exception to this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
108 set-toolbar-button-down-flag. Having this allows us to control the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
109 toolbar from elisp. Since we only trigger the button callbacks on
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
110 up-mouse events and we reset the flag first, there shouldn't be any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
111 way for this to get us in trouble (like if someone decides to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
112 change the toolbar from a toolbar callback). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
114 DEFUN ("toolbar-button-callback", Ftoolbar_button_callback, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 Return the callback function associated with the toolbar BUTTON.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
116 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
117 (button))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
118 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
119 CHECK_TOOLBAR_BUTTON (button);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
121 return XTOOLBAR_BUTTON (button)->callback;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
124 DEFUN ("toolbar-button-help-string", Ftoolbar_button_help_string, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 Return the help string function associated with the toolbar BUTTON.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
126 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
127 (button))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 CHECK_TOOLBAR_BUTTON (button);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
131 return XTOOLBAR_BUTTON (button)->help_string;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
134 DEFUN ("toolbar-button-enabled-p", Ftoolbar_button_enabled_p, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 Return t if BUTTON is active.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
136 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
137 (button))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 CHECK_TOOLBAR_BUTTON (button);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
141 return XTOOLBAR_BUTTON (button)->enabled ? Qt : Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
142 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
144 DEFUN ("set-toolbar-button-down-flag", Fset_toolbar_button_down_flag, 2, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 Don't touch.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
146 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
147 (button, flag))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 struct toolbar_button *tb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 char old_flag;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 CHECK_TOOLBAR_BUTTON (button);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 tb = XTOOLBAR_BUTTON (button);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 old_flag = tb->down;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 /* If the button is ignored, don't do anything. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 if (!tb->enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 /* If flag is nil, unset the down flag, otherwise set it to true.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 This also triggers an immediate redraw of the button if the flag
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 does change. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 if (NILP (flag))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 tb->down = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 tb->down = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 if (tb->down != old_flag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 struct frame *f = XFRAME (tb->frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 struct device *d;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 if (DEVICEP (f->device))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 if (DEVICE_LIVE_P (XDEVICE (f->device)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 MAYBE_DEVMETH (d, output_toolbar_button, (f, button));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 return Qnil;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
187 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 get_toolbar_button_glyph (struct window *w, struct toolbar_button *tb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 Lisp_Object glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 /* The selected glyph logic:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 UP: up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 DOWN: down -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 DISABLED: disabled -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 CAP-UP: cap-up -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 CAP-DOWN: cap-down -> cap-up -> down -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 CAP-DISABLED: cap-disabled -> cap-up -> disabled -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
203
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
204 if (!NILP (w->toolbar_buttons_captioned_p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 if (tb->enabled && tb->down)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 glyph = tb->cap_down_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 else if (!tb->enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 glyph = tb->cap_disabled_glyph;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
210
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 if (NILP (glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 glyph = tb->cap_up_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 if (NILP (glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 if (tb->enabled && tb->down)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 glyph = tb->down_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 else if (!tb->enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 glyph = tb->disabled_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223 /* The non-captioned up button is the ultimate fallback. It is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 the only one we guarantee exists. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225 if (NILP (glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 glyph = tb->up_glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 return glyph;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 static enum toolbar_pos
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 decode_toolbar_position (Lisp_Object position)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 {
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
235 if (EQ (position, Qtop)) return TOP_TOOLBAR;
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
236 if (EQ (position, Qbottom)) return BOTTOM_TOOLBAR;
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
237 if (EQ (position, Qleft)) return LEFT_TOOLBAR;
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
238 if (EQ (position, Qright)) return RIGHT_TOOLBAR;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 signal_simple_error ("Invalid toolbar position", position);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
240
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
241 return TOP_TOOLBAR; /* not reached */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
244 DEFUN ("set-default-toolbar-position", Fset_default_toolbar_position, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
245 Set the position that the `default-toolbar' will be displayed at.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
246 Valid positions are 'top, 'bottom, 'left and 'right.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
247 See `default-toolbar-position'.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
248 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
249 (position))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
250 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 enum toolbar_pos cur = decode_toolbar_position (Vdefault_toolbar_position);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 enum toolbar_pos new = decode_toolbar_position (position);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
253
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
254 if (cur != new)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
255 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
256 /* The following calls will automatically cause the dirty
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
257 flags to be set; we delay frame size changes to avoid
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
258 lots of frame flickering. */
249
83b3d10dcba9 Import from CVS: tag r20-5b23
cvs
parents: 245
diff changeset
259 /* #### I think this should be GC protected. -sb */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
260 hold_frame_size_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261 set_specifier_fallback (Vtoolbar[cur], list1 (Fcons (Qnil, Qnil)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 set_specifier_fallback (Vtoolbar[new], Vdefault_toolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 set_specifier_fallback (Vtoolbar_size[cur], list1 (Fcons (Qnil, Qzero)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 set_specifier_fallback (Vtoolbar_size[new],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 new == TOP_TOOLBAR || new == BOTTOM_TOOLBAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 ? Vdefault_toolbar_height
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 : Vdefault_toolbar_width);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
268 set_specifier_fallback (Vtoolbar_border_width[cur],
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
269 list1 (Fcons (Qnil, Qzero)));
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
270 set_specifier_fallback (Vtoolbar_border_width[new],
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
271 Vdefault_toolbar_border_width);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 set_specifier_fallback (Vtoolbar_visible_p[cur],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 list1 (Fcons (Qnil, Qt)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 set_specifier_fallback (Vtoolbar_visible_p[new],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 Vdefault_toolbar_visible_p);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 Vdefault_toolbar_position = position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 unhold_frame_size_changes ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 return position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
283 DEFUN ("default-toolbar-position", Fdefault_toolbar_position, 0, 0, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 Return the position that the `default-toolbar' will be displayed at.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 The `default-toolbar' will only be displayed here if the corresponding
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 position-specific toolbar specifier does not provide a value.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
287 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
288 ())
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 return Vdefault_toolbar_position;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 update_toolbar_button (struct frame *f, struct toolbar_button *tb,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 Lisp_Object desc, int pushright)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 Lisp_Object *elt, glyphs, retval, buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 struct gcpro gcpro1, gcpro2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
301 elt = XVECTOR_DATA (desc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 buffer = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 if (!tb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
306 tb = alloc_lcrecord_type (struct toolbar_button, lrecord_toolbar_button);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 tb->next = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 XSETFRAME (tb->frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 tb->up_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 tb->down_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 tb->disabled_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 tb->cap_up_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 tb->cap_down_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 tb->cap_disabled_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 tb->callback = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 tb->enabled_p = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 tb->help_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 tb->enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320 tb->down = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 tb->pushright = pushright;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 tb->blank = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 tb->x = tb->y = tb->width = tb->height = -1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 XSETTOOLBAR_BUTTON (retval, tb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 /* Let's make sure nothing gets mucked up by the potential call to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 eval farther down. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 GCPRO2 (retval, desc);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332 glyphs = (CONSP (elt[0]) ? elt[0] : symbol_value_in_buffer (elt[0], buffer));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 /* If this is true we have a blank, otherwise it is an actual
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 button. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 if (KEYWORDP (glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 int pos;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 int style_seen = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 int size_seen = 0;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
341 int len = XVECTOR_LENGTH (desc);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 if (!tb->blank)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 tb->blank = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
346 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
347 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
348
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
349 for (pos = 0; pos < len; pos += 2)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
350 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
351 Lisp_Object key = elt[pos];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 Lisp_Object val = elt[pos + 1];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 if (EQ (key, Q_style))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
355 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
356 style_seen = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 if (EQ (val, Q2D) || EQ (val, Q2d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 if (!EQ (Qnil, tb->up_glyph) || !EQ (Qt, tb->disabled_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 tb->up_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
363 tb->disabled_glyph = Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
364 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 else if (EQ (val, Q3D) || (EQ (val, Q3d)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 if (!EQ (Qt, tb->up_glyph) || !EQ (Qnil, tb->disabled_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 tb->up_glyph = Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 tb->disabled_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
375 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
376 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 else if (EQ (key, Q_size))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 size_seen = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 if (!EQ (val, tb->down_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 tb->down_glyph = val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
388
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
389 if (!style_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 /* The default style is 3D. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 if (!EQ (Qt, tb->up_glyph) || !EQ (Qnil, tb->disabled_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 tb->up_glyph = Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 tb->disabled_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400 if (!size_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 /* The default width is set to nil. The device specific
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403 code will fill it in at its discretion. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 if (!NILP (tb->down_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406 tb->down_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 /* The rest of these fields are not used by blanks. We make
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 sure they are nulled out in case this button object formerly
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 represented a real button. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 if (!NILP (tb->callback)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 || !NILP (tb->enabled_p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 || !NILP (tb->help_string))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 tb->cap_up_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 tb->cap_down_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 tb->cap_disabled_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 tb->callback = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 tb->enabled_p = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 tb->help_string = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 if (tb->blank)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 tb->blank = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 /* We know that we at least have an up_glyph. Well, no, we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 don't. The user may have changed the button glyph on us. */
245
51092a27c943 Import from CVS: tag r20-5b21
cvs
parents: 215
diff changeset
437 if (CONSP (glyphs))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 if (!EQ (XCAR (glyphs), tb->up_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 tb->up_glyph = XCAR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 glyphs = XCDR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 tb->up_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 /* We might have a down_glyph. */
245
51092a27c943 Import from CVS: tag r20-5b21
cvs
parents: 215
diff changeset
450 if (CONSP (glyphs))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 if (!EQ (XCAR (glyphs), tb->down_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 tb->down_glyph = XCAR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 glyphs = XCDR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 tb->down_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 /* We might have a disabled_glyph. */
245
51092a27c943 Import from CVS: tag r20-5b21
cvs
parents: 215
diff changeset
463 if (CONSP (glyphs))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 if (!EQ (XCAR (glyphs), tb->disabled_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 tb->disabled_glyph = XCAR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 glyphs = XCDR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 tb->disabled_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 /* We might have a cap_up_glyph. */
245
51092a27c943 Import from CVS: tag r20-5b21
cvs
parents: 215
diff changeset
476 if (CONSP (glyphs))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 if (!EQ (XCAR (glyphs), tb->cap_up_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 tb->cap_up_glyph = XCAR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 glyphs = XCDR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 tb->cap_up_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 /* We might have a cap_down_glyph. */
245
51092a27c943 Import from CVS: tag r20-5b21
cvs
parents: 215
diff changeset
489 if (CONSP (glyphs))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 if (!EQ (XCAR (glyphs), tb->cap_down_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 tb->cap_down_glyph = XCAR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 glyphs = XCDR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 tb->cap_down_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 /* We might have a cap_disabled_glyph. */
245
51092a27c943 Import from CVS: tag r20-5b21
cvs
parents: 215
diff changeset
502 if (CONSP (glyphs))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 if (!EQ (XCAR (glyphs), tb->cap_disabled_glyph))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 tb->cap_disabled_glyph = XCAR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 tb->cap_disabled_glyph = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 /* Update the callback. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 if (!EQ (tb->callback, elt[1]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 tb->callback = elt[1];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 /* This does not have an impact on the display properties of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 button so we do not mark it as dirty if it has changed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 /* Update the enabled field. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 if (!EQ (tb->enabled_p, elt[2]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 tb->enabled_p = elt[2];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 /* We always do the following because if the enabled status is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 determined by a function its decision may change without us being
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 able to detect it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 int old_enabled = tb->enabled;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 if (NILP (tb->enabled_p))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 tb->enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 else if (EQ (tb->enabled_p, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 tb->enabled = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 if (NILP (tb->enabled_p) || EQ (tb->enabled_p, Qt))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 /* short-circuit the common case for speed */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 tb->enabled = !NILP (tb->enabled_p);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 Lisp_Object result =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 eval_in_buffer_trapping_errors
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 ("Error in toolbar enabled-p form",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 XBUFFER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 (WINDOW_BUFFER
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)))),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 tb->enabled_p);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 if (UNBOUNDP (result))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 /* #### if there was an error in the enabled-p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 form, should we pretend like it's enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 or disabled? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 tb->enabled = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 tb->enabled = !NILP (result);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 if (old_enabled != tb->enabled)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 /* Update the help echo string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 if (!EQ (tb->help_string, elt[3]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 tb->help_string = elt[3];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 /* This does not have an impact on the display properties of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 button so we do not mark it as dirty if it has changed. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 /* If this flag changes, the position is changing for sure unless
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 some very unlikely geometry occurs. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 if (tb->pushright != pushright)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 tb->pushright = pushright;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 tb->dirty = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 /* The position and size fields are only manipulated in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 device-dependent code. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 return retval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
589 void
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
590 mark_frame_toolbar_buttons_dirty (struct frame *f, enum toolbar_pos pos)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
591 {
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
592 Lisp_Object button = FRAME_TOOLBAR_BUTTONS (f, pos);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
593
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
594 while (!NILP (button))
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
595 {
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
596 struct toolbar_button *tb = XTOOLBAR_BUTTON (button);
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
597 tb->dirty = 1;
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
598 button = tb->next;
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
599 }
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
600 return;
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
601 }
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
602
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 compute_frame_toolbar_buttons (struct frame *f, enum toolbar_pos pos,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 Lisp_Object toolbar)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 Lisp_Object buttons, prev_button, first_button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 Lisp_Object orig_toolbar = toolbar;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 int pushright_seen = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
612 first_button = FRAME_TOOLBAR_BUTTONS (f, pos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 buttons = prev_button = first_button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 /* Yes, we're being paranoid. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 GCPRO5 (toolbar, buttons, prev_button, first_button, orig_toolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 if (NILP (toolbar))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 /* The output mechanisms will take care of clearing the former
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 toolbar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 if (!CONSP (toolbar))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 signal_simple_error ("toolbar description must be a list", toolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 /* First synchronize any existing buttons. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 while (!NILP (toolbar) && !NILP (buttons))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 struct toolbar_button *tb;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634 if (NILP (XCAR (toolbar)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 if (pushright_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 signal_simple_error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638 ("more than one partition (nil) in toolbar description",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639 orig_toolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 pushright_seen = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645 tb = XTOOLBAR_BUTTON (buttons);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 update_toolbar_button (f, tb, XCAR (toolbar), pushright_seen);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 prev_button = buttons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
648 buttons = tb->next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
649 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 toolbar = XCDR (toolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 /* If we hit the end of the toolbar, then clean up any excess
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655 buttons and return. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
656 if (NILP (toolbar))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 if (!NILP (buttons))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
659 {
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
660 /* If this is the case the only thing we saw was a
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 pushright marker. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 if (EQ (buttons, first_button))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
664 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
665 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 XTOOLBAR_BUTTON (prev_button)->next = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671 return first_button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 /* At this point there are more buttons on the toolbar than we
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 actually have in existence. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 while (!NILP (toolbar))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 Lisp_Object new_button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680 if (NILP (XCAR (toolbar)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 if (pushright_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 signal_simple_error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 ("more than one partition (nil) in toolbar description",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 orig_toolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 pushright_seen = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 new_button = update_toolbar_button (f, NULL, XCAR (toolbar),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 pushright_seen);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 if (NILP (first_button))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 first_button = prev_button = new_button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 XTOOLBAR_BUTTON (prev_button)->next = new_button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 prev_button = new_button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 toolbar = XCDR (toolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 return first_button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
712 static void
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
713 set_frame_toolbar (struct frame *f, enum toolbar_pos pos)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 struct window *w = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f));
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
716 Lisp_Object toolbar = w->toolbar[pos];
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
717 f->toolbar_buttons[pos] = (FRAME_REAL_TOOLBAR_VISIBLE (f, pos)
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
718 ? compute_frame_toolbar_buttons (f, pos, toolbar)
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
719 : Qnil);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 static void
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
723 compute_frame_toolbars_data (struct frame *f)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 {
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
725 set_frame_toolbar (f, TOP_TOOLBAR);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
726 set_frame_toolbar (f, BOTTOM_TOOLBAR);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
727 set_frame_toolbar (f, LEFT_TOOLBAR);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
728 set_frame_toolbar (f, RIGHT_TOOLBAR);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
731 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 update_frame_toolbars (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 struct device *d = XDEVICE (f->device);
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
735
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
736 if (DEVICE_SUPPORTS_TOOLBARS_P (d)
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
737 && (f->toolbar_changed || f->frame_changed || f->clear))
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
738 {
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
739 int pos;
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
740
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
741 /* We're not officially "in redisplay", so we still have a
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
742 chance to re-layout toolbars and windows. This is done here,
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
743 because toolbar is the only thing which currently might
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
744 necesseritate this layout, as it is outside any windows. We
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
745 take care not to change size if toolbar geometry is really
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
746 unchanged, as it will hose windows whose pixsizes are not
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
747 multiple of character sizes */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
749 for (pos = 0; pos < 4; pos++)
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
750 if (FRAME_REAL_TOOLBAR_SIZE (f, pos)
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
751 != FRAME_CURRENT_TOOLBAR_SIZE (f, pos))
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
752 {
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
753 int width, height;
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
754 pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f),
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
755 &width, &height);
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
756 change_frame_size (f, height, width, 0);
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
757 break;
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
758 }
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
759
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
760 for (pos = 0; pos < 4; pos++)
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
761 f->current_toolbar_size[pos] = FRAME_REAL_TOOLBAR_SIZE (f, pos);
284
558f606b08ae Import from CVS: tag r21-0b40
cvs
parents: 282
diff changeset
762
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 /* Removed the check for the minibuffer here. We handle this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
764 more correctly now by consistently using
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
765 FRAME_LAST_NONMINIBUF_WINDOW instead of FRAME_SELECTED_WINDOW
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 throughout the toolbar code. */
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
767 compute_frame_toolbars_data (f);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
768
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
769 DEVMETH (d, output_frame_toolbars, (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
771
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 f->toolbar_changed = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
775 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
776 init_frame_toolbars (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
777 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
778 struct device *d = XDEVICE (f->device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
780 if (DEVICE_SUPPORTS_TOOLBARS_P (d))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
781 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
782 Lisp_Object frame;
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
783 int pos;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
785 compute_frame_toolbars_data (f);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
786 XSETFRAME (frame, f);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
787 call_critical_lisp_code (XDEVICE (FRAME_DEVICE (f)),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
788 Qinit_toolbar_from_resources,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
789 frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
790 MAYBE_DEVMETH (d, initialize_frame_toolbars, (f));
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
791
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
792 /* We are here as far in frame creation so cached specifiers are
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
793 already recomputed, and possibly modified by resource
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
794 initialization. Remember current toolbar geometry so next
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
795 redisplay will not needlessly relayout toolbars. */
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
796 for (pos = 0; pos < 4; pos++)
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
797 f->current_toolbar_size[pos] = FRAME_REAL_TOOLBAR_SIZE (f, pos);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 init_device_toolbars (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
804 Lisp_Object device;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
805
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 XSETDEVICE (device, d);
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
807 if (DEVICE_SUPPORTS_TOOLBARS_P (d))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 call_critical_lisp_code (d,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 Qinit_toolbar_from_resources,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
810 device);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 init_global_toolbars (struct device *d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 {
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
816 if (DEVICE_SUPPORTS_TOOLBARS_P (d))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 call_critical_lisp_code (d,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 Qinit_toolbar_from_resources,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 Qglobal);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
822 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
823 free_frame_toolbars (struct frame *f)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
824 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 /* If we had directly allocated any memory for the toolbars instead
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826 of using all Lisp_Objects this is where we would now free it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
828 MAYBE_FRAMEMETH (f, free_frame_toolbars, (f));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 get_toolbar_coords (struct frame *f, enum toolbar_pos pos, int *x, int *y,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
833 int *width, int *height, int *vert, int for_layout)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 int visible_top_toolbar_height, visible_bottom_toolbar_height;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 int adjust = (for_layout ? 1 : 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 /* The top and bottom toolbars take precedence over the left and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 right. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 visible_top_toolbar_height = (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
841 ? FRAME_REAL_TOP_TOOLBAR_HEIGHT (f) +
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
842 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 : 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 visible_bottom_toolbar_height = (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f)
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
845 ? FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) +
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
846 2 *
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
847 FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 : 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 /* We adjust the width and height by one to give us a narrow border
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 at the outside edges. However, when we are simply determining
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852 toolbar location we don't want to do that. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
853
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 switch (pos)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 case TOP_TOOLBAR:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 *x = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 *y = 0; /* #### should be 1 if no menubar */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 *width = FRAME_PIXWIDTH (f) - 2;
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
860 *height = FRAME_REAL_TOP_TOOLBAR_HEIGHT (f) +
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
861 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) - adjust;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 *vert = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
864 case BOTTOM_TOOLBAR:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 *x = 1;
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
866 *y = FRAME_PIXHEIGHT (f) - FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) -
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
867 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
868 *width = FRAME_PIXWIDTH (f) - 2;
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
869 *height = FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) +
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
870 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f) - adjust;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
871 *vert = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
872 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 case LEFT_TOOLBAR:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 *x = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 *y = visible_top_toolbar_height;
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
876 *width = FRAME_REAL_LEFT_TOOLBAR_WIDTH (f) +
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
877 2 * FRAME_REAL_LEFT_TOOLBAR_BORDER_WIDTH (f) - adjust;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
878 *height = (FRAME_PIXHEIGHT (f) - visible_top_toolbar_height -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
879 visible_bottom_toolbar_height - 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
880 *vert = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 case RIGHT_TOOLBAR:
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
883 *x = FRAME_PIXWIDTH (f) - FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f) -
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
884 2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH (f);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885 *y = visible_top_toolbar_height;
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
886 *width = FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f) +
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
887 2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH (f) - adjust;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 *height = (FRAME_PIXHEIGHT (f) - visible_top_toolbar_height -
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 visible_bottom_toolbar_height);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 *vert = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
891 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
892 default:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
893 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
897 #define CHECK_TOOLBAR(pos) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
898 do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 get_toolbar_coords (f, pos, &x, &y, &width, &height, &vert, 0); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901 if ((x_coord >= x) && (x_coord < (x + width))) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
903 if ((y_coord >= y) && (y_coord < (y + height))) \
286
57709be46d1b Import from CVS: tag r21-0b41
cvs
parents: 284
diff changeset
904 return FRAME_TOOLBAR_BUTTONS (f, pos); \
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
905 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
906 } while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
907
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 toolbar_buttons_at_pixpos (struct frame *f, int x_coord, int y_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
911 int x, y, width, height, vert;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
912
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
914 CHECK_TOOLBAR (TOP_TOOLBAR);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916 CHECK_TOOLBAR (BOTTOM_TOOLBAR);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 CHECK_TOOLBAR (LEFT_TOOLBAR);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 CHECK_TOOLBAR (RIGHT_TOOLBAR);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 #undef CHECK_TOOLBAR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 /* The device dependent code actually does the work of positioning the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 buttons, but we are free to access that information at this
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 level. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929 Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930 toolbar_button_at_pixpos (struct frame *f, int x_coord, int y_coord)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
932 Lisp_Object buttons = toolbar_buttons_at_pixpos (f, x_coord, y_coord);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 if (NILP (buttons))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 while (!NILP (buttons))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 struct toolbar_button *tb = XTOOLBAR_BUTTON (buttons);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 if ((x_coord >= tb->x) && (x_coord < (tb->x + tb->width)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
943 if ((y_coord >= tb->y) && (y_coord < (tb->y + tb->height)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
944 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 /* If we are over a blank, return nil. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 if (tb->blank)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 return buttons;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
951 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 buttons = tb->next;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 /* We must be over a blank in the toolbar. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
958 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
959
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 /* Toolbar specifier type */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965 DEFINE_SPECIFIER_TYPE (toolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
966
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 #define CTB_ERROR(msg) \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 do \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 { \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 maybe_signal_simple_error (msg, button, Qtoolbar, errb); \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 RETURN__ Qnil; \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 } \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
973 while (0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
974
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 /* Returns Q_style if key was :style, Qt if ok otherwise, Qnil if error. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 check_toolbar_button_keywords (Lisp_Object button, Lisp_Object key,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 Lisp_Object val, Error_behavior errb)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980 if (!KEYWORDP (key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 maybe_signal_simple_error_2 ("not a keyword", key, button, Qtoolbar,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 errb);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 if (EQ (key, Q_style))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
989 if (!EQ (val, Q2D)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 && !EQ (val, Q3D)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 && !EQ (val, Q2d)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 && !EQ (val, Q3d))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 CTB_ERROR ("unrecognized toolbar blank style");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995 return Q_style;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 else if (EQ (key, Q_size))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 if (!NATNUMP (val))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1000 CTB_ERROR ("invalid toolbar blank size");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 CTB_ERROR ("invalid toolbar blank keyword");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 return Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 /* toolbar button spec is [pixmap-pair function enabled-p help]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011 or [:style 2d-or-3d :size width-or-height] */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1013 DEFUN ("check-toolbar-button-syntax", Fcheck_toolbar_button_syntax, 1, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 Verify the syntax of entry BUTTON in a toolbar description list.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 If you want to verify the syntax of a toolbar description list as a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 whole, use `check-valid-instantiator' with a specifier type of 'toolbar.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1017 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1018 (button, no_error))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020 Lisp_Object *elt, glyphs, value;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 int len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 Error_behavior errb = decode_error_behavior_flag (no_error);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 if (!VECTORP (button))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 CTB_ERROR ("toolbar button descriptors must be vectors");
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1026 elt = XVECTOR_DATA (button);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1028 if (XVECTOR_LENGTH (button) == 2)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 if (!EQ (Q_style, check_toolbar_button_keywords (button, elt[0],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 elt[1], errb)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 CTB_ERROR ("must specify toolbar blank style");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 return Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1037 if (XVECTOR_LENGTH (button) != 4)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 CTB_ERROR ("toolbar button descriptors must be 2 or 4 long");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 /* The first element must be a list of glyphs of length 1-6. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 first entry is the pixmap for the up state, the second for the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 down state, the third for the disabled state, the fourth for the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 captioned up state, the fifth for the captioned down state and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 the sixth for the captioned disabled state. Only the up state is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 mandatory. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 if (!CONSP (elt[0]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 /* We can't check the buffer-local here because we don't know
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 which buffer to check in. #### I think this is a bad thing.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 See if we can't get enough information to this function so
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 that it can check.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 #### Wrong. We shouldn't be checking the value at all here.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 The user might set or change the value at any time. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 value = Fsymbol_value (elt[0]);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1056
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1057 if (!CONSP (value))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059 if (KEYWORDP (elt[0]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 int fsty = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 if (EQ (Q_style, check_toolbar_button_keywords (button, elt[0],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 elt[1],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 errb)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066 fsty++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 if (EQ (Q_style, check_toolbar_button_keywords (button, elt[2],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 elt[3],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 errb)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 fsty++;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 if (!fsty)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 CTB_ERROR ("must specify toolbar blank style");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 else if (EQ (elt[0], elt[2]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 CTB_ERROR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1077 ("duplicate keywords in toolbar button blank description");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1078
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1079 return Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1080 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 CTB_ERROR ("first element of button must be a list (of glyphs)");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 value = elt[0];
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 len = XINT (Flength (value));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 if (len < 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 CTB_ERROR ("toolbar button glyph list must have at least 1 entry");
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1091
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 if (len > 6)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 CTB_ERROR ("toolbar button glyph list can have at most 6 entries");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095 glyphs = value;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 while (!NILP (glyphs))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 if (!GLYPHP (XCAR (glyphs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 /* We allow nil for the down and disabled glyphs but not for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 the up glyph. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 if (EQ (glyphs, value) || !NILP (XCAR (glyphs)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1104 CTB_ERROR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1105 ("all elements of toolbar button glyph list must be glyphs.");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1106 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1107 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1108 glyphs = XCDR (glyphs);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1109 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1110
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1111 /* The second element is the function to run when the button is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 activated. We do not do any checking on it because it is legal
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 for the function to not be defined until after the toolbar is.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 It is the user's problem to get this right.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 The third element is either a boolean indicating the enabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1117 status or a function used to determine it. Again, it is the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 user's problem if this is wrong.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 The fourth element, if not nil, must be a string which will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 displayed as the help echo. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 /* #### This should be allowed to be a function returning a string
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 as well as just a string. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125 if (!NILP (elt[3]) && !STRINGP (elt[3]))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 CTB_ERROR ("toolbar button help echo string must be a string");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 return Qt;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130 #undef CTB_ERROR
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 toolbar_validate (Lisp_Object instantiator)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1135 int pushright_seen = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136 Lisp_Object rest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 if (NILP (instantiator))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 if (!CONSP (instantiator))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 signal_simple_error ("toolbar spec must be list or nil", instantiator);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1144 for (rest = instantiator; !NILP (rest); rest = XCDR (rest))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1145 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 if (!CONSP (rest))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147 signal_simple_error ("bad list in toolbar spec", instantiator);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 if (NILP (XCAR (rest)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 if (pushright_seen)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 error
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 ("more than one partition (nil) in instantiator description");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 pushright_seen = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 Fcheck_toolbar_button_syntax (XCAR (rest), Qnil);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 toolbar_after_change (Lisp_Object specifier, Lisp_Object locale)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 /* #### This is overkill. I really need to rethink the after-change
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 functions to make them easier to use. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 MARK_TOOLBAR_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1170 DEFUN ("toolbar-specifier-p", Ftoolbar_specifier_p, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 Return non-nil if OBJECT is a toolbar specifier.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 Toolbar specifiers are used to specify the format of a toolbar.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 The values of the variables `default-toolbar', `top-toolbar',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 `left-toolbar', `right-toolbar', and `bottom-toolbar' are always
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 toolbar specifiers.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
1177 Valid toolbar instantiators are called "toolbar descriptors"
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178 and are lists of vectors. See `default-toolbar' for a description
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 of the exact format.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1180 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1181 (object))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1183 return TOOLBAR_SPECIFIERP (object) ? Qt : Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1187 /*
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1188 Helper for invalidating the real specifier when default
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1189 specifier caching changes
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1190 */
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1191 static void
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1192 recompute_overlaying_specifier (Lisp_Object real_one[4])
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1193 {
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1194 enum toolbar_pos pos = decode_toolbar_position (Vdefault_toolbar_position);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1195 Fset_specifier_dirty_flag (real_one[pos]);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1196 }
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1197
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 toolbar_specs_changed (Lisp_Object specifier, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 /* This could be smarter but I doubt that it would make any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 noticable difference given the infrequency with which this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 probably going to be called.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 MARK_TOOLBAR_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 default_toolbar_specs_changed (Lisp_Object specifier, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212 {
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1213 recompute_overlaying_specifier (Vtoolbar);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 default_toolbar_size_changed_in_frame (Lisp_Object specifier, struct frame *f,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 {
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1220 recompute_overlaying_specifier (Vtoolbar_size);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 static void
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1224 default_toolbar_border_width_changed_in_frame (Lisp_Object specifier,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1225 struct frame *f,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1226 Lisp_Object oldval)
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1227 {
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1228 recompute_overlaying_specifier (Vtoolbar_border_width);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1229 }
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1230
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1231 static void
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 default_toolbar_visible_p_changed_in_frame (Lisp_Object specifier,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 struct frame *f,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 {
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1236 recompute_overlaying_specifier (Vtoolbar_visible_p);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1237 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1239 static void
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1240 toolbar_geometry_changed_in_window (Lisp_Object specifier, struct window *w,
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1241 Lisp_Object oldval)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1242 {
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 MARK_TOOLBAR_CHANGED;
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1244 MARK_WINDOWS_CHANGED (w);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1245 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1246
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1247 static void
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1248 default_toolbar_size_changed_in_window (Lisp_Object specifier, struct window *w,
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1249 Lisp_Object oldval)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1250 {
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1251 recompute_overlaying_specifier (Vtoolbar_size);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1252 }
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1253
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1254 static void
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1255 default_toolbar_border_width_changed_in_window (Lisp_Object specifier,
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1256 struct window *w,
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1257 Lisp_Object oldval)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1258 {
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1259 recompute_overlaying_specifier (Vtoolbar_border_width);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1260 }
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1261
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1262 static void
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1263 default_toolbar_visible_p_changed_in_window (Lisp_Object specifier,
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1264 struct window *w,
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1265 Lisp_Object oldval)
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1266 {
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1267 recompute_overlaying_specifier (Vtoolbar_visible_p);
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1268 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1269
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1270 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1271 toolbar_buttons_captioned_p_changed (Lisp_Object specifier, struct window *w,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1272 Lisp_Object oldval)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1273 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1274 /* This could be smarter but I doubt that it would make any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1275 noticable difference given the infrequency with which this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1276 probably going to be called. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1277 MARK_TOOLBAR_CHANGED;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1278 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1279
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1280
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1281 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1282 syms_of_toolbar (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1284 defsymbol (&Qtoolbar_buttonp, "toolbar-button-p");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1285 defsymbol (&Q2D, "2D");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1286 defsymbol (&Q3D, "3D");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1287 defsymbol (&Q2d, "2d");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1288 defsymbol (&Q3d, "3d");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 defsymbol (&Q_size, ":size"); Fset (Q_size, Q_size);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 defsymbol (&Qinit_toolbar_from_resources, "init-toolbar-from-resources");
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1292 DEFSUBR (Ftoolbar_button_p);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1293 DEFSUBR (Ftoolbar_button_callback);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1294 DEFSUBR (Ftoolbar_button_help_string);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1295 DEFSUBR (Ftoolbar_button_enabled_p);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1296 DEFSUBR (Fset_toolbar_button_down_flag);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1297 DEFSUBR (Fcheck_toolbar_button_syntax);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1298 DEFSUBR (Fset_default_toolbar_position);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1299 DEFSUBR (Fdefault_toolbar_position);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1300 DEFSUBR (Ftoolbar_specifier_p);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1301 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1302
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1303 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1304 vars_of_toolbar (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1305 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1306 staticpro (&Vdefault_toolbar_position);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1307 Vdefault_toolbar_position = Qtop;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1308
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1309 #ifdef HAVE_WINDOW_SYSTEM
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1310 Fprovide (Qtoolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1311 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1312 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1313
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1314 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1315 specifier_type_create_toolbar (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1316 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1317 INITIALIZE_SPECIFIER_TYPE (toolbar, "toolbar", "toolbar-specifier-p");
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1318
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1319 SPECIFIER_HAS_METHOD (toolbar, validate);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1320 SPECIFIER_HAS_METHOD (toolbar, after_change);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1321 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1322
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1323 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1324 specifier_vars_of_toolbar (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1325 {
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1326 Lisp_Object fb;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 120
diff changeset
1327
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1328 DEFVAR_SPECIFIER ("default-toolbar", &Vdefault_toolbar /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1329 Specifier for a fallback toolbar.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1330 Use `set-specifier' to change this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1331
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1332 The position of this toolbar is specified in the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1333 `default-toolbar-position'. If the corresponding position-specific
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1334 toolbar (e.g. `top-toolbar' if `default-toolbar-position' is 'top)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1335 does not specify a toolbar in a particular domain (usually a window),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1336 then the value of `default-toolbar' in that domain, if any, will be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1337 used instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1338
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1339 Note that the toolbar at any particular position will not be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1340 displayed unless its visibility flag is true and its thickness
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1341 \(width or height, depending on orientation) is non-zero. The
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1342 visibility is controlled by the specifiers `top-toolbar-visible-p',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1343 `bottom-toolbar-visible-p', `left-toolbar-visible-p', and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1344 `right-toolbar-visible-p', and the thickness is controlled by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1345 specifiers `top-toolbar-height', `bottom-toolbar-height',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1346 `left-toolbar-width', and `right-toolbar-width'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1348 Note that one of the four visibility specifiers inherits from
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1349 `default-toolbar-visibility' and one of the four thickness
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1350 specifiers inherits from either `default-toolbar-width' or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1351 `default-toolbar-height' (depending on orientation), just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1352 like for the toolbar description specifiers (e.g. `top-toolbar')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1353 mentioned above.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1354
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1355 Therefore, if you are setting `default-toolbar', you should control
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1356 the visibility and thickness using `default-toolbar-visible-p',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1357 `default-toolbar-width', and `default-toolbar-height', rather than
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1358 using position-specific specifiers. That way, you will get sane
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1359 behavior if the user changes the default toolbar position.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1360
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1361 The format of the instantiator for a toolbar is a list of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1362 toolbar-button-descriptors. Each toolbar-button-descriptor
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1363 is a vector in one of the following formats:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1364
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1365 [GLYPH-LIST FUNCTION ENABLED-P HELP] or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1366 [:style 2D-OR-3D] or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1367 [:style 2D-OR-3D :size WIDTH-OR-HEIGHT] or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1368 [:size WIDTH-OR-HEIGHT :style 2D-OR-3D]
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1369
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1370 Optionally, one of the toolbar-button-descriptors may be nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1371 instead of a vector; this signifies the division between
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1372 the toolbar buttons that are to be displayed flush-left,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1373 and the buttons to be displayed flush-right.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1374
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1375 The first vector format above specifies a normal toolbar button;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1376 the others specify blank areas in the toolbar.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1378 For the first vector format:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1379
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1380 -- GLYPH-LIST should be a list of one to six glyphs (as created by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1381 `make-glyph') or a symbol whose value is such a list. The first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1382 glyph, which must be provided, is the glyph used to display the
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
1383 toolbar button when it is in the "up" (not pressed) state. The
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1384 optional second glyph is for displaying the button when it is in
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
1385 the "down" (pressed) state. The optional third glyph is for when
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1386 the button is disabled. The optional fourth, fifth and sixth glyphs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1387 are used to specify captioned versions for the up, down and disabled
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1388 states respectively. The function `toolbar-make-button-list' is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1389 useful in creating these glyph lists. The specifier variable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1390 `toolbar-buttons-captioned-p' controls which glyphs are actually used.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1391
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1392 -- Even if you do not provide separate down-state and disabled-state
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1393 glyphs, the user will still get visual feedback to indicate which
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1394 state the button is in. Buttons in the up-state are displayed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1395 with a shadowed border that gives a raised appearance to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1396 button. Buttons in the down-state are displayed with shadows that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1397 give a recessed appearance. Buttons in the disabled state are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1398 displayed with no shadows, giving a 2-d effect.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1399
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1400 -- If some of the toolbar glyphs are not provided, they inherit as follows:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1401
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1402 UP: up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1403 DOWN: down -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1404 DISABLED: disabled -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1405 CAP-UP: cap-up -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1406 CAP-DOWN: cap-down -> cap-up -> down -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1407 CAP-DISABLED: cap-disabled -> cap-up -> disabled -> up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1408
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1409 -- The second element FUNCTION is a function to be called when the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1410 toolbar button is activated (i.e. when the mouse is released over
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1411 the toolbar button, if the press occurred in the toolbar). It
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1412 can be any form accepted by `call-interactively', since this is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1413 how it is invoked.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1414
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1415 -- The third element ENABLED-P specifies whether the toolbar button
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1416 is enabled (disabled buttons do nothing when they are activated,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1417 and are displayed differently; see above). It should be either
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1418 a boolean or a form that evaluates to a boolean.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1419
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1420 -- The fourth element HELP, if non-nil, should be a string. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1421 string is displayed in the echo area when the mouse passes over
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1422 the toolbar button.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1423
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1424 For the other vector formats (specifying blank areas of the toolbar):
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1425
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1426 -- 2D-OR-3D should be one of the symbols '2d or '3d, indicating
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1427 whether the area is displayed with shadows (giving it a raised,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1428 3-d appearance) or without shadows (giving it a flat appearance).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1429
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1430 -- WIDTH-OR-HEIGHT specifies the length, in pixels, of the blank
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1431 area. If omitted, it defaults to a device-specific value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1432 (8 pixels for X devices).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1433 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1435 Vdefault_toolbar = Fmake_specifier (Qtoolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1436 /* #### It would be even nicer if the specifier caching
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1437 automatically knew about specifier fallbacks, so we didn't
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1438 have to do it ourselves. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1439 set_specifier_caching (Vdefault_toolbar,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1440 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1441 default_toolbar),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1442 default_toolbar_specs_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1443 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1445 DEFVAR_SPECIFIER ("top-toolbar",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1446 &Vtoolbar[TOP_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1447 Specifier for the toolbar at the top of the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1448 Use `set-specifier' to change this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1449 See `default-toolbar' for a description of a valid toolbar instantiator.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1450 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1451 Vtoolbar[TOP_TOOLBAR] = Fmake_specifier (Qtoolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1452 set_specifier_caching (Vtoolbar[TOP_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1453 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1454 toolbar[TOP_TOOLBAR]),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1455 toolbar_specs_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1456 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1457
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1458 DEFVAR_SPECIFIER ("bottom-toolbar",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1459 &Vtoolbar[BOTTOM_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1460 Specifier for the toolbar at the bottom of the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1461 Use `set-specifier' to change this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1462 See `default-toolbar' for a description of a valid toolbar instantiator.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1464 Note that, unless the `default-toolbar-position' is `bottom', by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1465 default the height of the bottom toolbar (controlled by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1466 `bottom-toolbar-height') is 0; thus, a bottom toolbar will not be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1467 displayed even if you provide a value for `bottom-toolbar'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1468 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1469 Vtoolbar[BOTTOM_TOOLBAR] = Fmake_specifier (Qtoolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1470 set_specifier_caching (Vtoolbar[BOTTOM_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1471 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1472 toolbar[BOTTOM_TOOLBAR]),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1473 toolbar_specs_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1474 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1475
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1476 DEFVAR_SPECIFIER ("left-toolbar",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1477 &Vtoolbar[LEFT_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1478 Specifier for the toolbar at the left edge of the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1479 Use `set-specifier' to change this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1480 See `default-toolbar' for a description of a valid toolbar instantiator.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1481
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1482 Note that, unless the `default-toolbar-position' is `left', by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1483 default the height of the left toolbar (controlled by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1484 `left-toolbar-width') is 0; thus, a left toolbar will not be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1485 displayed even if you provide a value for `left-toolbar'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1486 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1487 Vtoolbar[LEFT_TOOLBAR] = Fmake_specifier (Qtoolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1488 set_specifier_caching (Vtoolbar[LEFT_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1489 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1490 toolbar[LEFT_TOOLBAR]),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1491 toolbar_specs_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1492 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1493
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1494 DEFVAR_SPECIFIER ("right-toolbar",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1495 &Vtoolbar[RIGHT_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1496 Specifier for the toolbar at the right edge of the frame.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1497 Use `set-specifier' to change this.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1498 See `default-toolbar' for a description of a valid toolbar instantiator.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1499
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1500 Note that, unless the `default-toolbar-position' is `right', by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1501 default the height of the right toolbar (controlled by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1502 `right-toolbar-width') is 0; thus, a right toolbar will not be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1503 displayed even if you provide a value for `right-toolbar'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1504 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1505 Vtoolbar[RIGHT_TOOLBAR] = Fmake_specifier (Qtoolbar);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1506 set_specifier_caching (Vtoolbar[RIGHT_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1507 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1508 toolbar[RIGHT_TOOLBAR]),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1509 toolbar_specs_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1510 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1511
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1512 /* initially, top inherits from default; this can be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1513 changed with `set-default-toolbar-position'. */
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1514 fb = list1 (Fcons (Qnil, Qnil));
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1515 set_specifier_fallback (Vdefault_toolbar, fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1516 set_specifier_fallback (Vtoolbar[TOP_TOOLBAR], Vdefault_toolbar);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1517 set_specifier_fallback (Vtoolbar[BOTTOM_TOOLBAR], fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1518 set_specifier_fallback (Vtoolbar[LEFT_TOOLBAR], fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1519 set_specifier_fallback (Vtoolbar[RIGHT_TOOLBAR], fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1521 DEFVAR_SPECIFIER ("default-toolbar-height", &Vdefault_toolbar_height /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1522 *Height of the default toolbar, if it's oriented horizontally.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1523 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1525 The position of the default toolbar is specified by the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1526 `set-default-toolbar-position'. If the corresponding position-specific
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1527 toolbar thickness specifier (e.g. `top-toolbar-height' if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1528 `default-toolbar-position' is 'top) does not specify a thickness in a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1529 particular domain (a window or a frame), then the value of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1530 `default-toolbar-height' or `default-toolbar-width' (depending on the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1531 toolbar orientation) in that domain, if any, will be used instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1532
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1533 Note that `default-toolbar-height' is only used when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1534 `default-toolbar-position' is 'top or 'bottom, and `default-toolbar-width'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1535 is only used when `default-toolbar-position' is 'left or 'right.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1536
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1537 Note that all of the position-specific toolbar thickness specifiers
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1538 have a fallback value of zero when they do not correspond to the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1539 default toolbar. Therefore, you will have to set a non-zero thickness
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1540 value if you want a position-specific toolbar to be displayed.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1542 Internally, toolbar thickness specifiers are instantiated in both
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1543 window and frame domains, for different purposes. The value in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1544 domain of a frame's selected window specifies the actual toolbar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1545 thickness that you will see in that frame. The value in the domain of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1546 a frame itself specifies the toolbar thickness that is used in frame
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1547 geometry calculations.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1548
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1549 Thus, for example, if you set the frame width to 80 characters and the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1550 left toolbar width for that frame to 68 pixels, then the frame will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1551 be sized to fit 80 characters plus a 68-pixel left toolbar. If you
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1552 then set the left toolbar width to 0 for a particular buffer (or if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1553 that buffer does not specify a left toolbar or has a nil value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1554 specified for `left-toolbar-visible-p'), you will find that, when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1555 that buffer is displayed in the selected window, the window will have
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1556 a width of 86 or 87 characters -- the frame is sized for a 68-pixel
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1557 left toolbar but the selected window specifies that the left toolbar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1558 is not visible, so it is expanded to take up the slack.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1559 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1560 Vdefault_toolbar_height = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1561 set_specifier_caching (Vdefault_toolbar_height,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1562 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1563 default_toolbar_height),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1564 default_toolbar_size_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1565 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1566 default_toolbar_height),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1567 default_toolbar_size_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1568
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1569 DEFVAR_SPECIFIER ("default-toolbar-width", &Vdefault_toolbar_width /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1570 *Width of the default toolbar, if it's oriented vertically.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1571 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1573 See `default-toolbar-height' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1574 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1575 Vdefault_toolbar_width = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1576 set_specifier_caching (Vdefault_toolbar_width,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1577 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1578 default_toolbar_width),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1579 default_toolbar_size_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1580 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1581 default_toolbar_width),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1582 default_toolbar_size_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1584 DEFVAR_SPECIFIER ("top-toolbar-height",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1585 &Vtoolbar_size[TOP_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1586 *Height of the top toolbar.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1587 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1589 See `default-toolbar-height' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1590 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1591 Vtoolbar_size[TOP_TOOLBAR] = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1592 set_specifier_caching (Vtoolbar_size[TOP_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1593 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1594 toolbar_size[TOP_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1595 toolbar_geometry_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1596 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1597 toolbar_size[TOP_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1598 frame_size_slipped);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1599
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1600 DEFVAR_SPECIFIER ("bottom-toolbar-height",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1601 &Vtoolbar_size[BOTTOM_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1602 *Height of the bottom toolbar.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1603 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1604
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1605 See `default-toolbar-height' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1606 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1607 Vtoolbar_size[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1608 set_specifier_caching (Vtoolbar_size[BOTTOM_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1609 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1610 toolbar_size[BOTTOM_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1611 toolbar_geometry_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1612 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1613 toolbar_size[BOTTOM_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1614 frame_size_slipped);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1616 DEFVAR_SPECIFIER ("left-toolbar-width",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1617 &Vtoolbar_size[LEFT_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1618 *Width of left toolbar.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1619 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1620
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1621 See `default-toolbar-height' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1622 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1623 Vtoolbar_size[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1624 set_specifier_caching (Vtoolbar_size[LEFT_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1625 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1626 toolbar_size[LEFT_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1627 toolbar_geometry_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1628 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1629 toolbar_size[LEFT_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1630 frame_size_slipped);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1631
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1632 DEFVAR_SPECIFIER ("right-toolbar-width",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1633 &Vtoolbar_size[RIGHT_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1634 *Width of right toolbar.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1635 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1636
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1637 See `default-toolbar-height' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1638 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1639 Vtoolbar_size[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1640 set_specifier_caching (Vtoolbar_size[RIGHT_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1641 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1642 toolbar_size[RIGHT_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1643 toolbar_geometry_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1644 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1645 toolbar_size[RIGHT_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1646 frame_size_slipped);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1647
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1648 fb = Qnil;
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 70
diff changeset
1649 #ifdef HAVE_TTY
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1650 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 70
diff changeset
1651 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1652 #ifdef HAVE_X_WINDOWS
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1653 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1654 #endif
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1655 #ifdef HAVE_MS_WINDOWS
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1656 fb = Fcons (Fcons (list1 (Qmswindows),
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1657 make_int (MSWINDOWS_DEFAULT_TOOLBAR_HEIGHT)), fb);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1658 #endif
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1659 if (!NILP (fb))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1660 set_specifier_fallback (Vdefault_toolbar_height, fb);
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 70
diff changeset
1661
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1662 fb = Qnil;
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 70
diff changeset
1663 #ifdef HAVE_TTY
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1664 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
78
c7528f8e288d Import from CVS: tag r20-0b34
cvs
parents: 70
diff changeset
1665 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1666 #ifdef HAVE_X_WINDOWS
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1667 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1668 #endif
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1669 #ifdef HAVE_MS_WINDOWS
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1670 fb = Fcons (Fcons (list1 (Qmswindows),
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1671 make_int (MSWINDOWS_DEFAULT_TOOLBAR_WIDTH)), fb);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1672 #endif
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1673 if (!NILP (fb))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1674 set_specifier_fallback (Vdefault_toolbar_width, fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1675
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1676 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1677 fb = list1 (Fcons (Qnil, Qzero));
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1678 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1679 set_specifier_fallback (Vtoolbar_size[LEFT_TOOLBAR], fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1680 set_specifier_fallback (Vtoolbar_size[RIGHT_TOOLBAR], fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1681
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1682 DEFVAR_SPECIFIER ("default-toolbar-border-width",
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1683 &Vdefault_toolbar_border_width /*
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1684 *Width of the border around the default toolbar.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1685 This is a specifier; use `set-specifier' to change it.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1686
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1687 The position of the default toolbar is specified by the function
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1688 `set-default-toolbar-position'. If the corresponding position-specific
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1689 toolbar border width specifier (e.g. `top-toolbar-border-width' if
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1690 `default-toolbar-position' is 'top) does not specify a border width in a
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1691 particular domain (a window or a frame), then the value of
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1692 `default-toolbar-border-width' in that domain, if any, will be used
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1693 instead.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1694
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1695 Internally, toolbar border width specifiers are instantiated in both
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1696 window and frame domains, for different purposes. The value in the
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1697 domain of a frame's selected window specifies the actual toolbar border
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1698 width that you will see in that frame. The value in the domain of a
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1699 frame itself specifies the toolbar border width that is used in frame
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1700 geometry calculations. Changing the border width value in the frame
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1701 domain will result in a size change in the frame itself, while changing
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1702 the value in a window domain will not.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1703 */ );
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1704 Vdefault_toolbar_border_width = Fmake_specifier (Qnatnum);
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1705 set_specifier_caching (Vdefault_toolbar_border_width,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1706 slot_offset (struct window,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1707 default_toolbar_border_width),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1708 default_toolbar_border_width_changed_in_window,
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1709 slot_offset (struct frame,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1710 default_toolbar_border_width),
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1711 default_toolbar_border_width_changed_in_frame);
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1712
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1713 DEFVAR_SPECIFIER ("top-toolbar-border-width",
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1714 &Vtoolbar_border_width[TOP_TOOLBAR] /*
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1715 *Border width of the top toolbar.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1716 This is a specifier; use `set-specifier' to change it.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1717
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1718 See `default-toolbar-height' for more information.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1719 */ );
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1720 Vtoolbar_border_width[TOP_TOOLBAR] = Fmake_specifier (Qnatnum);
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1721 set_specifier_caching (Vtoolbar_border_width[TOP_TOOLBAR],
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1722 slot_offset (struct window,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1723 toolbar_border_width[TOP_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1724 toolbar_geometry_changed_in_window,
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1725 slot_offset (struct frame,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1726 toolbar_border_width[TOP_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1727 frame_size_slipped);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1728
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1729 DEFVAR_SPECIFIER ("bottom-toolbar-border-width",
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1730 &Vtoolbar_border_width[BOTTOM_TOOLBAR] /*
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1731 *Border width of the bottom toolbar.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1732 This is a specifier; use `set-specifier' to change it.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1733
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1734 See `default-toolbar-height' for more information.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1735 */ );
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1736 Vtoolbar_border_width[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum);
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1737 set_specifier_caching (Vtoolbar_border_width[BOTTOM_TOOLBAR],
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1738 slot_offset (struct window,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1739 toolbar_border_width[BOTTOM_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1740 toolbar_geometry_changed_in_window,
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1741 slot_offset (struct frame,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1742 toolbar_border_width[BOTTOM_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1743 frame_size_slipped);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1744
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1745 DEFVAR_SPECIFIER ("left-toolbar-border-width",
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1746 &Vtoolbar_border_width[LEFT_TOOLBAR] /*
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1747 *Border width of left toolbar.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1748 This is a specifier; use `set-specifier' to change it.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1749
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1750 See `default-toolbar-height' for more information.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1751 */ );
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1752 Vtoolbar_border_width[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum);
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1753 set_specifier_caching (Vtoolbar_border_width[LEFT_TOOLBAR],
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1754 slot_offset (struct window,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1755 toolbar_border_width[LEFT_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1756 toolbar_geometry_changed_in_window,
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1757 slot_offset (struct frame,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1758 toolbar_border_width[LEFT_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1759 frame_size_slipped);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1760
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1761 DEFVAR_SPECIFIER ("right-toolbar-border-width",
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1762 &Vtoolbar_border_width[RIGHT_TOOLBAR] /*
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1763 *Border width of right toolbar.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1764 This is a specifier; use `set-specifier' to change it.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1765
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1766 See `default-toolbar-height' for more information.
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1767 */ );
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1768 Vtoolbar_border_width[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum);
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1769 set_specifier_caching (Vtoolbar_border_width[RIGHT_TOOLBAR],
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1770 slot_offset (struct window,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1771 toolbar_border_width[RIGHT_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1772 toolbar_geometry_changed_in_window,
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1773 slot_offset (struct frame,
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1774 toolbar_border_width[RIGHT_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1775 frame_size_slipped);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1776
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1777 fb = Qnil;
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1778 #ifdef HAVE_TTY
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1779 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1780 #endif
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1781 #ifdef HAVE_X_WINDOWS
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1782 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_BORDER_WIDTH)), fb);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1783 #endif
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1784 #ifdef HAVE_MS_WINDOWS
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1785 fb = Fcons (Fcons (list1 (Qmswindows), make_int (MSWINDOWS_DEFAULT_TOOLBAR_BORDER_WIDTH)), fb);
6330739388db Import from CVS: tag r21-0b36
cvs
parents: 272
diff changeset
1786 #endif
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1787 if (!NILP (fb))
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1788 set_specifier_fallback (Vdefault_toolbar_border_width, fb);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1789
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1790 set_specifier_fallback (Vtoolbar_border_width[TOP_TOOLBAR], Vdefault_toolbar_border_width);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1791 fb = list1 (Fcons (Qnil, Qzero));
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1792 set_specifier_fallback (Vtoolbar_border_width[BOTTOM_TOOLBAR], fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1793 set_specifier_fallback (Vtoolbar_border_width[LEFT_TOOLBAR], fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1794 set_specifier_fallback (Vtoolbar_border_width[RIGHT_TOOLBAR], fb);
215
1f0dabaa0855 Import from CVS: tag r20-4b6
cvs
parents: 185
diff changeset
1795
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1796 DEFVAR_SPECIFIER ("default-toolbar-visible-p", &Vdefault_toolbar_visible_p /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1797 *Whether the default toolbar is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1798 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1799
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1800 The position of the default toolbar is specified by the function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1801 `set-default-toolbar-position'. If the corresponding position-specific
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1802 toolbar visibility specifier (e.g. `top-toolbar-visible-p' if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1803 `default-toolbar-position' is 'top) does not specify a visible-p value
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1804 in a particular domain (a window or a frame), then the value of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1805 `default-toolbar-visible-p' in that domain, if any, will be used
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1806 instead.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1807
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1808 Both window domains and frame domains are used internally, for
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1809 different purposes. The distinction here is exactly the same as
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1810 for thickness specifiers; see `default-toolbar-height' for more
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1811 information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1812
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1813 `default-toolbar-visible-p' and all of the position-specific toolbar
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1814 visibility specifiers have a fallback value of true.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1815 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1816 Vdefault_toolbar_visible_p = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1817 set_specifier_caching (Vdefault_toolbar_visible_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1818 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1819 default_toolbar_visible_p),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1820 default_toolbar_visible_p_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1821 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1822 default_toolbar_visible_p),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1823 default_toolbar_visible_p_changed_in_frame);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1824
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1825 DEFVAR_SPECIFIER ("top-toolbar-visible-p",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1826 &Vtoolbar_visible_p[TOP_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1827 *Whether the top toolbar is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1828 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1830 See `default-toolbar-visible-p' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1831 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1832 Vtoolbar_visible_p[TOP_TOOLBAR] = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1833 set_specifier_caching (Vtoolbar_visible_p[TOP_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1834 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1835 toolbar_visible_p[TOP_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1836 toolbar_geometry_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1837 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1838 toolbar_visible_p[TOP_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1839 frame_size_slipped);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1840
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1841 DEFVAR_SPECIFIER ("bottom-toolbar-visible-p",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1842 &Vtoolbar_visible_p[BOTTOM_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1843 *Whether the bottom toolbar is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1844 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1845
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1846 See `default-toolbar-visible-p' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1847 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1848 Vtoolbar_visible_p[BOTTOM_TOOLBAR] = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1849 set_specifier_caching (Vtoolbar_visible_p[BOTTOM_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1850 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1851 toolbar_visible_p[BOTTOM_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1852 toolbar_geometry_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1853 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1854 toolbar_visible_p[BOTTOM_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1855 frame_size_slipped);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1856
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1857 DEFVAR_SPECIFIER ("left-toolbar-visible-p",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1858 &Vtoolbar_visible_p[LEFT_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1859 *Whether the left toolbar is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1860 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1861
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1862 See `default-toolbar-visible-p' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1863 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1864 Vtoolbar_visible_p[LEFT_TOOLBAR] = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1865 set_specifier_caching (Vtoolbar_visible_p[LEFT_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1866 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1867 toolbar_visible_p[LEFT_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1868 toolbar_geometry_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1869 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1870 toolbar_visible_p[LEFT_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1871 frame_size_slipped);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1872
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1873 DEFVAR_SPECIFIER ("right-toolbar-visible-p",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1874 &Vtoolbar_visible_p[RIGHT_TOOLBAR] /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1875 *Whether the right toolbar is visible.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1876 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1877
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1878 See `default-toolbar-visible-p' for more information.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1879 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1880 Vtoolbar_visible_p[RIGHT_TOOLBAR] = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1881 set_specifier_caching (Vtoolbar_visible_p[RIGHT_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1882 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1883 toolbar_visible_p[RIGHT_TOOLBAR]),
280
7df0dd720c89 Import from CVS: tag r21-0b38
cvs
parents: 276
diff changeset
1884 toolbar_geometry_changed_in_window,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1885 slot_offset (struct frame,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1886 toolbar_visible_p[RIGHT_TOOLBAR]),
282
c42ec1d1cded Import from CVS: tag r21-0b39
cvs
parents: 280
diff changeset
1887 frame_size_slipped);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1888
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1889 /* initially, top inherits from default; this can be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1890 changed with `set-default-toolbar-position'. */
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1891 fb = list1 (Fcons (Qnil, Qt));
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1892 set_specifier_fallback (Vdefault_toolbar_visible_p, fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1893 set_specifier_fallback (Vtoolbar_visible_p[TOP_TOOLBAR],
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1894 Vdefault_toolbar_visible_p);
272
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1895 set_specifier_fallback (Vtoolbar_visible_p[BOTTOM_TOOLBAR], fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1896 set_specifier_fallback (Vtoolbar_visible_p[LEFT_TOOLBAR], fb);
c5d627a313b1 Import from CVS: tag r21-0b34
cvs
parents: 249
diff changeset
1897 set_specifier_fallback (Vtoolbar_visible_p[RIGHT_TOOLBAR], fb);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1898
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1899 DEFVAR_SPECIFIER ("toolbar-buttons-captioned-p",
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1900 &Vtoolbar_buttons_captioned_p /*
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1901 *Whether the toolbar buttons are captioned.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1902 This will only have a visible effect for those toolbar buttons which had
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1903 captioned versions specified.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1904 This is a specifier; use `set-specifier' to change it.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1905 */ );
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1906 Vtoolbar_buttons_captioned_p = Fmake_specifier (Qboolean);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1907 set_specifier_caching (Vtoolbar_buttons_captioned_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1908 slot_offset (struct window,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1909 toolbar_buttons_captioned_p),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1910 toolbar_buttons_captioned_p_changed,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1911 0, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1912 set_specifier_fallback (Vtoolbar_buttons_captioned_p,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1913 list1 (Fcons (Qnil, Qt)));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1914 }