Mercurial > emacs
view lwlib/lwlib-Xlw.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 |
line wrap: on
line source
/* The lwlib interface to "xlwmenu" menus. Copyright (C) 1992 Lucid, Inc. Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of the Lucid Widget Library. The Lucid Widget Library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. The Lucid Widget Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <setjmp.h> #include "lisp.h" #include "lwlib-Xlw.h" #include <X11/StringDefs.h> #include <X11/IntrinsicP.h> #include <X11/ObjectP.h> #include <X11/CompositeP.h> #include <X11/Shell.h> #include "xlwmenu.h" #if 0 #include <stdio.h> /* Print the complete X resource name of widget WIDGET to stderr. This is sometimes handy to have available. */ void x_print_complete_resource_name (widget) Widget widget; { int i; String names[100]; for (i = 0; i < 100 && widget != NULL; ++i) { names[i] = XtName (widget); widget = XtParent (widget); } for (--i; i >= 1; --i) fprintf (stderr, "%s.", names[i]); fprintf (stderr, "%s\n", names[0]); } #endif /* 0 */ /* Menu callbacks */ /* Callback XtNhighlightCallback for Lucid menus. W is the menu widget, CLIENT_DATA contains a pointer to the widget_instance for the menu, CALL_DATA contains a pointer to the widget_value structure for the highlighted menu item. The latter may be null if there isn't any highlighted menu item. */ static void highlight_hook (w, client_data, call_data) Widget w; XtPointer client_data; XtPointer call_data; { widget_instance *instance = (widget_instance *) client_data; if (instance->info->highlight_cb && !w->core.being_destroyed) instance->info->highlight_cb (w, instance->info->id, call_data); } static void enter_hook (w, client_data, call_data) Widget w; XtPointer client_data; XtPointer call_data; { highlight_hook (w, client_data, call_data); } static void leave_hook (w, client_data, call_data) Widget w; XtPointer client_data; XtPointer call_data; { highlight_hook (w, client_data, NULL); } static void pre_hook (w, client_data, call_data) Widget w; XtPointer client_data; XtPointer call_data; { widget_instance* instance = (widget_instance*)client_data; widget_value* val; if (w->core.being_destroyed) return; val = lw_get_widget_value_for_widget (instance, w); if (instance->info->pre_activate_cb) instance->info->pre_activate_cb (w, instance->info->id, val ? val->call_data : NULL); } static void pick_hook (w, client_data, call_data) Widget w; XtPointer client_data; XtPointer call_data; { widget_instance* instance = (widget_instance*)client_data; widget_value* contents_val = (widget_value*)call_data; widget_value* widget_val; XtPointer widget_arg; if (w->core.being_destroyed) return; if (instance->info->selection_cb && contents_val && contents_val->enabled && !contents_val->contents) instance->info->selection_cb (w, instance->info->id, contents_val->call_data); widget_val = lw_get_widget_value_for_widget (instance, w); widget_arg = widget_val ? widget_val->call_data : NULL; if (instance->info->post_activate_cb) instance->info->post_activate_cb (w, instance->info->id, widget_arg); } /* creation functions */ static Widget xlw_create_menubar (instance) widget_instance* instance; { Widget widget; Arg al[5]; int ac = 0; XtSetArg (al[ac], XtNmenu, instance->info->val); ac++; #ifdef emacs XtSetArg (al[ac], XtNshowGrip, 0); ac++; XtSetArg (al[ac], XtNresizeToPreferred, 1); ac++; XtSetArg (al[ac], XtNallowResize, 1); ac++; #endif /* This used to use XtVaCreateWidget, but an old Xt version has a bug in XtVaCreateWidget that frees instance->info->name. */ widget = XtCreateWidget (instance->info->name, xlwMenuWidgetClass, instance->parent, al, ac); XtAddCallback (widget, XtNopen, pre_hook, (XtPointer)instance); XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance); XtAddCallback (widget, XtNleaveCallback, leave_hook, (XtPointer)instance); XtAddCallback (widget, XtNenterCallback, enter_hook, (XtPointer)instance); return widget; } static Widget xlw_create_popup_menu (instance) widget_instance* instance; { Widget popup_shell = XtCreatePopupShell (instance->info->name, overrideShellWidgetClass, instance->parent, NULL, 0); Widget widget; Arg al[2]; int ac = 0; XtSetArg (al[ac], XtNmenu, instance->info->val); ac++; XtSetArg (al[ac], XtNhorizontal, False); ac++; /* This used to use XtVaManagedCreateWidget, but an old Xt version has a bug in XtVaManagedCreateWidget that frees instance->info->name. */ widget = XtCreateManagedWidget ("popup", xlwMenuWidgetClass, popup_shell, al, ac); XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance); XtAddCallback (widget, XtNleaveCallback, leave_hook, (XtPointer)instance); XtAddCallback (widget, XtNenterCallback, enter_hook, (XtPointer)instance); return popup_shell; } widget_creation_entry xlw_creation_table [] = { {"menubar", xlw_create_menubar}, {"popup", xlw_create_popup_menu}, {NULL, NULL} }; Boolean lw_lucid_widget_p (widget) Widget widget; { WidgetClass the_class = XtClass (widget); if (the_class == xlwMenuWidgetClass) return True; if (the_class == overrideShellWidgetClass) return (XtClass (((CompositeWidget)widget)->composite.children [0]) == xlwMenuWidgetClass); return False; } void #ifdef PROTOTYPES xlw_update_one_widget (widget_instance* instance, Widget widget, widget_value* val, Boolean deep_p) #else xlw_update_one_widget (instance, widget, val, deep_p) widget_instance* instance; Widget widget; widget_value* val; Boolean deep_p; #endif { Arg al[1]; /* This used to use XtVaSetValues, but some old Xt versions that have a bug in XtVaCreateWidget might have it here too. */ XtSetArg (al[0], XtNmenu, instance->info->val); XtSetValues (widget, al, 1); } void xlw_update_one_value (instance, widget, val) widget_instance* instance; Widget widget; widget_value* val; { return; } void #ifdef PROTOTYPES xlw_pop_instance (widget_instance* instance, Boolean up) #else xlw_pop_instance (instance, up) widget_instance* instance; Boolean up; #endif { } void xlw_popup_menu (widget, event) Widget widget; XEvent *event; { XlwMenuWidget mw; if (!XtIsShell (widget)) return; mw = (XlwMenuWidget)((CompositeWidget)widget)->composite.children [0]; if (event) XtCallActionProc ((Widget) mw, "start", event, NULL, 0); else { XEvent dummy; XButtonPressedEvent *bd = &dummy.xbutton; bd->type = ButtonPress; bd->serial = 0; bd->send_event = 0; bd->display = XtDisplay (widget); bd->window = XtWindow (XtParent (widget)); bd->time = CurrentTime; bd->button = 0; XQueryPointer (bd->display, bd->window, &bd->root, &bd->subwindow, &bd->x_root, &bd->y_root, &bd->x, &bd->y, &bd->state); XtCallActionProc ((Widget) mw, "start", &dummy, NULL, 0); } } /* Destruction of instances */ void xlw_destroy_instance (instance) widget_instance* instance; { if (instance->widget) XtDestroyWidget (instance->widget); } /* arch-tag: 541e3912-477d-406e-9bf2-dbf2b7ff8c3b (do not change this comment) */