annotate src/toolbar.c @ 0:376386a54a3c r19-14

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