annotate src/toolbar.c @ 282:c42ec1d1cded r21-0b39

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