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