Mercurial > emacs
annotate lwlib/lwlib-utils.c @ 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 | 1d1d5d9bd884 |
children | 384b3408c143 376148b31b5e |
rev | line source |
---|---|
5626 | 1 /* Defines some widget utility functions. |
76177 | 2 Copyright (C) 1992 Lucid, Inc. |
106815 | 3 Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, |
4 2010 Free Software Foundation, Inc. | |
5626 | 5 |
6 This file is part of the Lucid Widget Library. | |
7 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
41767
diff
changeset
|
8 The Lucid Widget Library is free software; you can redistribute it and/or |
5626 | 9 modify it under the terms of the GNU General Public License as published by |
10 the Free Software Foundation; either version 1, or (at your option) | |
11 any later version. | |
12 | |
13 The Lucid Widget Library is distributed in the hope that it will be useful, | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
41767
diff
changeset
|
14 but WITHOUT ANY WARRANTY; without even the implied warranty of |
5626 | 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with GNU Emacs; see the file COPYING. If not, write to | |
64083 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
5626 | 22 |
11358
cba458f0dc21
If HAVE_CONFIG_H, include config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7514
diff
changeset
|
23 #ifdef HAVE_CONFIG_H |
cba458f0dc21
If HAVE_CONFIG_H, include config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7514
diff
changeset
|
24 #include <config.h> |
cba458f0dc21
If HAVE_CONFIG_H, include config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7514
diff
changeset
|
25 #endif |
cba458f0dc21
If HAVE_CONFIG_H, include config.h.
Richard M. Stallman <rms@gnu.org>
parents:
7514
diff
changeset
|
26 |
13758
5a7e9e98add7
Add #undef for index and rindex.
Karl Heuer <kwzh@gnu.org>
parents:
11358
diff
changeset
|
27 /* Definitions of these in config.h can cause |
5a7e9e98add7
Add #undef for index and rindex.
Karl Heuer <kwzh@gnu.org>
parents:
11358
diff
changeset
|
28 declaration conflicts later on between declarations for index |
5a7e9e98add7
Add #undef for index and rindex.
Karl Heuer <kwzh@gnu.org>
parents:
11358
diff
changeset
|
29 and declarations for strchr. This file doesn't use |
5a7e9e98add7
Add #undef for index and rindex.
Karl Heuer <kwzh@gnu.org>
parents:
11358
diff
changeset
|
30 index and rindex, so cancel them. */ |
5a7e9e98add7
Add #undef for index and rindex.
Karl Heuer <kwzh@gnu.org>
parents:
11358
diff
changeset
|
31 #undef index |
5a7e9e98add7
Add #undef for index and rindex.
Karl Heuer <kwzh@gnu.org>
parents:
11358
diff
changeset
|
32 #undef rindex |
5a7e9e98add7
Add #undef for index and rindex.
Karl Heuer <kwzh@gnu.org>
parents:
11358
diff
changeset
|
33 |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100957
diff
changeset
|
34 #include <setjmp.h> |
41767 | 35 #include "../src/lisp.h" |
36 | |
5626 | 37 #include <X11/Xatom.h> |
38 #include <X11/IntrinsicP.h> | |
39 #include <X11/ObjectP.h> | |
40 #include "lwlib-utils.h" | |
29891 | 41 #include "lwlib.h" |
5626 | 42 |
43 /* Redisplay the contents of the widget, without first clearing it. */ | |
44 void | |
5708
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
45 XtNoClearRefreshWidget (widget) |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
46 Widget widget; |
5626 | 47 { |
48 XEvent event; | |
49 | |
50 event.type = Expose; | |
51 event.xexpose.serial = 0; | |
52 event.xexpose.send_event = 0; | |
53 event.xexpose.display = XtDisplay (widget); | |
54 event.xexpose.window = XtWindow (widget); | |
55 event.xexpose.x = 0; | |
56 event.xexpose.y = 0; | |
57 event.xexpose.width = widget->core.width; | |
58 event.xexpose.height = widget->core.height; | |
59 event.xexpose.count = 0; | |
60 | |
61 (*widget->core.widget_class->core_class.expose) | |
62 (widget, &event, (Region)NULL); | |
63 } | |
64 | |
65 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
41767
diff
changeset
|
66 /* |
5626 | 67 * Apply a function to all the subwidgets of a given widget recursively. |
68 */ | |
69 void | |
5708
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
70 XtApplyToWidgets (w, proc, arg) |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
71 Widget w; |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
72 XtApplyToWidgetsProc proc; |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
73 XtPointer arg; |
5626 | 74 { |
75 if (XtIsComposite (w)) | |
76 { | |
77 CompositeWidget cw = (CompositeWidget) w; | |
78 /* We have to copy the children list before mapping over it, because | |
79 the procedure might add/delete elements, which would lose badly. | |
80 */ | |
81 int nkids = cw->composite.num_children; | |
82 Widget *kids = (Widget *) malloc (sizeof (Widget) * nkids); | |
83 int i; | |
30279
3f00bdb24c1f
(XtApplyToWidgets): Cast args of lwlib_bcopy.
Dave Love <fx@gnu.org>
parents:
29891
diff
changeset
|
84 lwlib_bcopy ((char *) cw->composite.children, (char *) kids, |
3f00bdb24c1f
(XtApplyToWidgets): Cast args of lwlib_bcopy.
Dave Love <fx@gnu.org>
parents:
29891
diff
changeset
|
85 sizeof (Widget) * nkids); |
5626 | 86 for (i = 0; i < nkids; i++) |
87 /* This prevent us from using gadgets, why is it here? */ | |
88 /* if (XtIsWidget (kids [i])) */ | |
89 { | |
90 /* do the kiddies first in case we're destroying */ | |
91 XtApplyToWidgets (kids [i], proc, arg); | |
92 proc (kids [i], arg); | |
93 } | |
94 free (kids); | |
95 } | |
96 } | |
97 | |
98 | |
99 /* | |
100 * Apply a function to all the subwidgets of a given widget recursively. | |
101 * Stop as soon as the function returns non NULL and returns this as a value. | |
102 */ | |
103 void * | |
5708
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
104 XtApplyUntilToWidgets (w, proc, arg) |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
105 Widget w; |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
106 XtApplyUntilToWidgetsProc proc; |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
107 XtPointer arg; |
5626 | 108 { |
109 void* result; | |
110 if (XtIsComposite (w)) | |
111 { | |
112 CompositeWidget cw = (CompositeWidget)w; | |
113 int i; | |
114 for (i = 0; i < cw->composite.num_children; i++) | |
115 if (XtIsWidget (cw->composite.children [i])){ | |
116 result = proc (cw->composite.children [i], arg); | |
117 if (result) | |
118 return result; | |
119 result = XtApplyUntilToWidgets (cw->composite.children [i], proc, | |
120 arg); | |
121 if (result) | |
122 return result; | |
123 } | |
124 } | |
125 return NULL; | |
126 } | |
127 | |
128 | |
129 /* | |
130 * Returns a copy of the list of all children of a composite widget | |
131 */ | |
132 Widget * | |
5708
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
133 XtCompositeChildren (widget, number) |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
134 Widget widget; |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
135 unsigned int* number; |
5626 | 136 { |
137 CompositeWidget cw = (CompositeWidget)widget; | |
138 Widget* result; | |
139 int n; | |
140 int i; | |
141 | |
142 if (!XtIsComposite (widget)) | |
143 { | |
144 *number = 0; | |
145 return NULL; | |
146 } | |
147 n = cw->composite.num_children; | |
148 result = (Widget*)XtMalloc (n * sizeof (Widget)); | |
149 *number = n; | |
150 for (i = 0; i < n; i++) | |
151 result [i] = cw->composite.children [i]; | |
152 return result; | |
153 } | |
154 | |
155 Boolean | |
5708
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
156 XtWidgetBeingDestroyedP (widget) |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
157 Widget widget; |
5626 | 158 { |
159 return widget->core.being_destroyed; | |
160 } | |
161 | |
162 void | |
5708
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
163 XtSafelyDestroyWidget (widget) |
4870efc489ea
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
164 Widget widget; |
5626 | 165 { |
166 #if 0 | |
167 | |
168 /* this requires IntrinsicI.h (actually, InitialI.h) */ | |
169 | |
170 XtAppContext app = XtWidgetToApplicationContext(widget); | |
171 | |
172 if (app->dispatch_level == 0) | |
173 { | |
174 app->dispatch_level = 1; | |
175 XtDestroyWidget (widget); | |
176 /* generates an event so that the event loop will be called */ | |
177 XChangeProperty (XtDisplay (widget), XtWindow (widget), | |
178 XA_STRING, XA_STRING, 32, PropModeAppend, NULL, 0); | |
179 app->dispatch_level = 0; | |
180 } | |
181 else | |
182 XtDestroyWidget (widget); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
41767
diff
changeset
|
183 |
5626 | 184 #else |
185 abort (); | |
186 #endif | |
187 } | |
52401 | 188 |
189 /* arch-tag: f21f0a1f-2a4e-44e1-8715-7f234fe2d159 | |
190 (do not change this comment) */ |