Mercurial > emacs
annotate lwlib/xlwmenu.h @ 107984:bef5d1738c0b
Make variable forwarding explicit rather the using special values.
Basically, this makes the structure of buffer-local values and object
forwarding explicit in the type of Lisp_Symbols rather than use
special Lisp_Objects for that. This tends to lead to slightly more
verbose code, but is more C-like, simpler, and makes it easier to make
sure we handled all cases, among other things by letting the compiler
help us check it.
* lisp.h (enum Lisp_Misc_Type, union Lisp_Misc):
Removing forwarding objects.
(enum Lisp_Fwd_Type, enum symbol_redirect, union Lisp_Fwd): New types.
(struct Lisp_Symbol): Make the various forms of variable-forwarding
explicit rather than hiding them inside Lisp_Object "values".
(XFWDTYPE): New macro.
(XINTFWD, XBOOLFWD, XOBJFWD, XKBOARD_OBJFWD): Redefine.
(XBUFFER_LOCAL_VALUE): Remove.
(SYMBOL_VAL, SYMBOL_ALIAS, SYMBOL_BLV, SYMBOL_FWD, SET_SYMBOL_VAL)
(SET_SYMBOL_ALIAS, SET_SYMBOL_BLV, SET_SYMBOL_FWD): New macros.
(SYMBOL_VALUE, SET_SYMBOL_VALUE): Remove.
(struct Lisp_Intfwd, struct Lisp_Boolfwd, struct Lisp_Objfwd)
(struct Lisp_Buffer_Objfwd, struct Lisp_Kboard_Objfwd):
Remove the Lisp_Misc_* header.
(struct Lisp_Buffer_Local_Value): Redefine.
(BLV_FOUND, SET_BLV_FOUND, BLV_VALUE, SET_BLV_VALUE): New macros.
(struct Lisp_Misc_Any): Add filler to get the right size.
(struct Lisp_Free): Use struct Lisp_Misc_Any rather than struct
Lisp_Intfwd.
(DEFVAR_LISP, DEFVAR_LISP_NOPRO, DEFVAR_BOOL, DEFVAR_INT)
(DEFVAR_KBOARD): Allocate a forwarding object.
* data.c (do_blv_forwarding, store_blv_forwarding): New macros.
(let_shadows_global_binding_p): New function.
(union Lisp_Val_Fwd): New type.
(make_blv): New function.
(swap_in_symval_forwarding, indirect_variable, do_symval_forwarding)
(store_symval_forwarding, swap_in_global_binding, Fboundp)
(swap_in_symval_forwarding, find_symbol_value, Fset)
(let_shadows_buffer_binding_p, set_internal, default_value)
(Fset_default, Fmake_variable_buffer_local, Fmake_local_variable)
(Fkill_local_variable, Fmake_variable_frame_local)
(Flocal_variable_p, Flocal_variable_if_set_p)
(Fvariable_binding_locus):
* xdisp.c (select_frame_for_redisplay):
* lread.c (Fintern, Funintern, init_obarray, defvar_int)
(defvar_bool, defvar_lisp_nopro, defvar_lisp, defvar_kboard):
* frame.c (store_frame_param):
* eval.c (Fdefvaralias, Fuser_variable_p, specbind, unbind_to):
* bytecode.c (Fbyte_code) <varref, varset>: Adapt to the new symbol
value structure.
* buffer.c (PER_BUFFER_SYMBOL): Move from buffer.h.
(clone_per_buffer_values): Only adjust markers into the current buffer.
(reset_buffer_local_variables): PER_BUFFER_IDX is never -2.
(Fbuffer_local_value, set_buffer_internal_1)
(swap_out_buffer_local_variables):
Adapt to the new symbol value structure.
(DEFVAR_PER_BUFFER): Allocate a Lisp_Buffer_Objfwd object.
(defvar_per_buffer): Take a new arg for the fwd object.
(buffer_lisp_local_variables): Return a proper alist (different fix
for bug#4138).
* alloc.c (Fmake_symbol): Use SET_SYMBOL_VAL.
(Fgarbage_collect): Don't handle buffer_defaults specially.
(mark_object): Handle new symbol value structure rather than the old
special Lisp_Misc_* objects.
(gc_sweep) <symbols>: Free also the buffer-local-value objects.
* term.c (set_tty_color_mode):
* bidi.c (bidi_initialize): Don't access the ->value field directly.
* buffer.h (PER_BUFFER_VAR_OFFSET): Don't bother with
a buffer_local_flags.
* print.c (print_object): Get rid of impossible forwarding objects.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 19 Apr 2010 21:50:52 -0400 |
parents | 24c4451bcaf7 |
children | 05aff7edcc3d |
rev | line source |
---|---|
60584
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
1 /* Interface of a lightweight menubar widget. |
76180 | 2 Copyright (C) 1992 Lucid, Inc. |
106815 | 3 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
76180 | 4 Free Software Foundation, Inc. |
60584
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
5 |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
6 This file is part of the Lucid Widget Library. |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
7 |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
8 The Lucid Widget Library is free software; you can redistribute it and/or |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
9 modify it under the terms of the GNU General Public License as published by |
76216
707d586d3aaa
Lucid Widget Library was released under GPLv1 or later (license only
Glenn Morris <rgm@gnu.org>
parents:
76180
diff
changeset
|
10 the Free Software Foundation; either version 1, or (at your option) |
60584
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
11 any later version. |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
12 |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
13 The Lucid Widget Library is distributed in the hope that it will be useful, |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
14 but WITHOUT ANY WARRANTY; without even the implied warranty of |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
16 GNU General Public License for more details. |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
17 |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
18 You should have received a copy of the GNU General Public License |
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
19 along with GNU Emacs; see the file COPYING. If not, write to the |
64083 | 20 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
60584
597c62d04dec
Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53564
diff
changeset
|
22 |
5626 | 23 #ifndef _XlwMenu_h |
24 #define _XlwMenu_h | |
25 | |
26 /*********************************************************************** | |
27 * | |
28 * XlwMenu Widget | |
29 * | |
30 ***********************************************************************/ | |
31 | |
32 #include "lwlib.h" | |
33 | |
34 /* Resource names used by the XlwMenu widget */ | |
45146
174fe450ad23
(XtNdisabledForeground, XtCDisabledForeground): New resource names.
Pavel Janík <Pavel@Janik.cz>
parents:
29466
diff
changeset
|
35 #define XtNdisabledForeground "disabledForeground" |
174fe450ad23
(XtNdisabledForeground, XtCDisabledForeground): New resource names.
Pavel Janík <Pavel@Janik.cz>
parents:
29466
diff
changeset
|
36 #define XtCDisabledForeground "DisabledForeground" |
5626 | 37 #define XtNbuttonForeground "buttonForeground" |
38 #define XtCButtonForeground "ButtonForeground" | |
39 #define XtNmargin "margin" | |
40 #define XtNhorizontalSpacing "horizontalSpacing" | |
41 #define XtNverticalSpacing "verticalSpacing" | |
42 #define XtNarrowSpacing "arrowSpacing" | |
43 #define XtNmenu "menu" | |
44 #define XtCMenu "Menu" | |
45 #define XtNopen "open" | |
46 #define XtNselect "select" | |
27339
8b90339beb04
(XtNhighlightCallback): New define.
Gerd Moellmann <gerd@gnu.org>
parents:
8786
diff
changeset
|
47 #define XtNhighlightCallback "highlightCallback" |
75016
6a01460d75ba
(XtNleaveCallback, XtNenterCallback): New strings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68640
diff
changeset
|
48 #define XtNenterCallback "enterCallback" |
6a01460d75ba
(XtNleaveCallback, XtNenterCallback): New strings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68640
diff
changeset
|
49 #define XtNleaveCallback "leaveCallback" |
5626 | 50 #define XtNmenuBorderWidth "menuBorderWidth" |
51 #define XtNhorizontal "horizontal" | |
52 #define XtCHorizontal "Horizontal" | |
53 #define XtNcursor "cursor" | |
54 #define XtNCursor "Cursor" | |
8786 | 55 #define XtNshowGrip "showGrip" |
56 #define XtCShowGrip "ShowGrip" | |
57 #define XtNresizeToPreferred "resizeToPreferred" | |
58 #define XtCResizeToPreferred "ResizeToPreferred" | |
59 #define XtNallowResize "allowResize" | |
60 #define XtCAllowResize "AllowResize" | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
61 #define XtNfaceName "faceName" |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
62 #define XtCFaceName "FaceName" |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
63 #define XtNdefaultFace "defaultFace" |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
64 #define XtCDefaultFace "DefaultFace" |
5626 | 65 |
66 /* Motif-compatible resource names */ | |
67 #define XmNshadowThickness "shadowThickness" | |
68 #define XmCShadowThickness "ShadowThickness" | |
69 #define XmNtopShadowColor "topShadowColor" | |
70 #define XmCTopShadowColor "TopShadowColor" | |
71 #define XmNbottomShadowColor "bottomShadowColor" | |
72 #define XmCBottomShadowColor "BottomShadowColor" | |
73 #define XmNtopShadowPixmap "topShadowPixmap" | |
74 #define XmCTopShadowPixmap "TopShadowPixmap" | |
75 #define XmNbottomShadowPixmap "bottomShadowPixmap" | |
76 #define XmCBottomShadowPixmap "BottomShadowPixmap" | |
77 #define XmRHorizontalDimension "HorizontalDimension" | |
78 | |
79 typedef struct _XlwMenuRec *XlwMenuWidget; | |
80 typedef struct _XlwMenuClassRec *XlwMenuWidgetClass; | |
81 | |
82 extern WidgetClass xlwMenuWidgetClass; | |
83 | |
84 #endif /* _XlwMenu_h */ | |
52401 | 85 |
86 /* arch-tag: 0c019735-d61b-4080-be85-4fdd6e50ae07 | |
87 (do not change this comment) */ |