annotate lwlib/lwlib-Xm.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 2b21fb87e10a
children ec58e5c426ef e16f43875a48
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
60666
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
1 /* The lwlib interface to Motif widgets.
76176
90400c6ecd12 Remove FSF copyright since file does not differ significantly from
Glenn Morris <rgm@gnu.org>
parents: 75250
diff changeset
2 Copyright (C) 1992 Lucid, Inc.
60666
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
3
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
4 This file is part of the Lucid Widget Library.
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
5
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
6 The Lucid Widget Library is free software; you can redistribute it and/or
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
7 modify it under the terms of the GNU General Public License as published by
76215
2b21fb87e10a Lucid Widget Library was released under GPLv1 or later.
Glenn Morris <rgm@gnu.org>
parents: 76176
diff changeset
8 the Free Software Foundation; either version 1, or (at your option)
60666
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
9 any later version.
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
10
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
11 The Lucid Widget Library is distributed in the hope that it will be useful,
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
14 GNU General Public License for more details.
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
15
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
16 You should have received a copy of the GNU General Public License
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
17 along with GNU Emacs; see the file COPYING. If not, write to
64083
23a17af379b1 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 60666
diff changeset
18 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
23a17af379b1 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 60666
diff changeset
19 Boston, MA 02110-1301, USA. */
60666
5b0e15f7d88d Add missing copyright and license notice.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
20
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 #ifndef LWLIB_XM_H
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22 #define LWLIB_XM_H
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23
5627
7ff2d6076466 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 5626
diff changeset
24 #include "lwlib-int.h"
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26 extern widget_creation_entry xm_creation_table [];
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 29466
diff changeset
28 Widget
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
29 xm_create_dialog __P ((widget_instance* instance));
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
30
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31 Boolean
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
32 lw_motif_widget_p __P ((Widget widget));
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34 void
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
35 xm_update_one_widget __P ((widget_instance* instance, Widget widget,
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
36 widget_value* val, Boolean deep_p));
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38 void
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
39 xm_update_one_value __P ((widget_instance* instance, Widget widget,
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
40 widget_value* val));
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
41
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
42 void
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
43 xm_destroy_instance __P ((widget_instance* instance));
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45 void
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
46 xm_set_keyboard_focus __P ((Widget parent, Widget w));
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
48 void
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
49 xm_popup_menu __P ((Widget widget, XEvent *event));
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
50
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
51 void
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
52 xm_pop_instance __P ((widget_instance* instance, Boolean up));
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
53
9091
557a04cd151b entered into RCS
Paul Reilly <pmr@pajato.com>
parents: 5627
diff changeset
54 void
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
55 xm_set_main_areas __P ((Widget parent, Widget menubar, Widget work_area));
9091
557a04cd151b entered into RCS
Paul Reilly <pmr@pajato.com>
parents: 5627
diff changeset
56
9225
9e28a8ef9cad Declare xm_set_main_areas() and xm_manage_resizing().
Paul Reilly <pmr@pajato.com>
parents: 9091
diff changeset
57 void
29466
6ed38ee607e9 Enable prototypes.
Dave Love <fx@gnu.org>
parents: 15636
diff changeset
58 xm_manage_resizing __P ((Widget w, Boolean flag));
9225
9e28a8ef9cad Declare xm_set_main_areas() and xm_manage_resizing().
Paul Reilly <pmr@pajato.com>
parents: 9091
diff changeset
59
5626
93bb7e0935ba Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
60 #endif /* LWLIB_XM_H */
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
61
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
62 /* arch-tag: 61561304-c146-437b-8ed3-dc33818703c6
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
63 (do not change this comment) */