Mercurial > hg > xemacs-beta
view lwlib/lwlib.h @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 09 Jul 2008 20:46:22 +0200 |
parents | 4b7d425dd3c2 |
children | 383ab474a241 |
line wrap: on
line source
#ifndef INCLUDED_lwlib_h_ #define INCLUDED_lwlib_h_ #include <X11/Intrinsic.h> #if defined (LWLIB_MENUBARS_LUCID) || defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_MENUBARS_ATHENA) #define NEED_MENUBARS #endif #if defined (LWLIB_SCROLLBARS_LUCID) || defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_ATHENA) #define NEED_SCROLLBARS #endif #if defined (LWLIB_DIALOGS_LUCID) || defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_DIALOGS_ATHENA) #define NEED_DIALOGS #endif /* ** Widget values depend on the Widget type: ** ** widget: (name value key enabled data contents/selected) ** ** label: ("name" "string" NULL NULL NULL NULL) ** BUTTON: ("name" "string" "key" T/F data <default-button-p>) ** CASCADE (button w/menu): ** ("name" "string" "key" T/F data (label|button|button w/menu...)) ** INCREMENTAL (button w/menu construction callback): ** ("name" "string" NULL T/F <opaque pointer>) ** menubar: ("name" NULL NULL T/F data (button w/menu)) ** scrollbar:("name" NULL NULL T/F NULL NULL) ** selectable thing: ** ("name" "string" "key" T/F data T/F) ** checkbox: selectable thing ** radio: ("name" NULL NULL T/F data (selectable thing...)) ** strings: ("name" NULL NULL T/F data (selectable thing...)) ** TEXT: ("name" "string" <ign> T/F data) ** ** Note that the above is EXTREMELY bogus. The "type" of the various entities ** that a widget_value structure can represent is implicit in the contents of ** half a dozen slots, instead of there simply being a type field. This ** should all be rethunk. I've added a type field, but for now it's only used ** by the new xlwmenu code. */ typedef unsigned long LWLIB_ID; typedef enum _change_type { NO_CHANGE = 0, INVISIBLE_CHANGE = 1, VISIBLE_CHANGE = 2, STRUCTURAL_CHANGE = 3 } change_type; typedef enum _widget_value_type { UNSPECIFIED_TYPE = 0, BUTTON_TYPE = 1, TOGGLE_TYPE = 2, RADIO_TYPE = 3, TEXT_TYPE = 4, SEPARATOR_TYPE = 5, CASCADE_TYPE = 6, PUSHRIGHT_TYPE = 7, INCREMENTAL_TYPE = 8 } widget_value_type; typedef enum _scroll_action { SCROLLBAR_LINE_UP = 0, SCROLLBAR_LINE_DOWN = 1, SCROLLBAR_PAGE_UP = 2, SCROLLBAR_PAGE_DOWN = 3, SCROLLBAR_DRAG = 4, SCROLLBAR_CHANGE = 5, SCROLLBAR_TOP = 6, SCROLLBAR_BOTTOM = 7 } scroll_action; typedef struct _scroll_event { scroll_action action; int slider_value; Time time; } scroll_event; typedef struct _scrollbar_values { int line_increment; int page_increment; int minimum; int maximum; int slider_size; int slider_position; int scrollbar_width, scrollbar_height; int scrollbar_x, scrollbar_y; } scrollbar_values; typedef struct _widget_args { /* some things are only possible at creation time. args are applied to widgets at creation time. */ ArgList args; int nargs; /* Copying args is impossible so we make the caller give us heap allocated args and free them when no one wants them any more. */ int ref_count; /* Since we are reference counting we need to be able to determine when something has changed. */ Boolean args_changed; } widget_args; typedef struct _widget_value { /* This slot is only partially utilized right now. */ widget_value_type type; /* name of widget */ char* name; /* value (meaning BOGUSLY depends on widget type) */ char* value; /* keyboard equivalent. no implications for XtTranslations */ char* key; /* accelerator key. For XEmacs, this should be a Lisp_Object holding a char or symbol suitable for passing to event_matches_key_specifier_p. Outside of emacs, this can be anything: an X KeySym is a good idea. lwlib provides support functions for keyboard traversal of menus. Actual implementation of those accelerators is up to the application. */ XtPointer accel; /* true if enabled */ Boolean enabled; /* true if selected */ Boolean selected; /* true if was edited (maintained by get_value) */ Boolean edited; /* true if has changed (maintained by lw library) */ change_type change; /* Contents of sub-widgets, also selected slot for checkbox */ struct _widget_value* contents; /* data passed to callback */ XtPointer call_data; /* next in the list of siblings */ struct _widget_value* next; /* slot for the toolkit dependent part. Always initialize to NULL. */ void* toolkit_data; /* tell us if we should free the toolkit data slot when freeing the widget_value itself. */ Boolean free_toolkit_data; /* data defining a scrollbar; only valid if type == "scrollbar" */ scrollbar_values *scrollbar_data; /* A reference counted arg structure. */ struct _widget_args *args; /* we resource the widget_value structures; this points to the next one on the free list if this one has been deallocated. */ struct _widget_value *free_list; } widget_value; typedef void (*lw_callback) (Widget w, LWLIB_ID id, XtPointer data); /* menu stuff */ /* maybe this should go into a generic lwmenu.h */ extern int lw_menu_active; #if defined (LWLIB_MENUBARS_LUCID) #include "xlwmenu.h" #define lw_set_menu xlw_set_menu #define lw_push_menu xlw_push_menu #define lw_pop_menu xlw_pop_menu #define lw_set_item xlw_set_item #define lw_map_menu xlw_map_menu #define lw_display_menu xlw_display_menu #define lw_kill_menus xlw_kill_menus #define lw_get_entries xlw_get_entries #define lw_menu_level xlw_menu_level #else /* LWLIB_MENUBARS_LUCID */ /* do this for the other toolkits too */ #endif /* LWLIB_MENUBARS_LUCID */ #if defined (LWLIB_TABS_LUCID) #include "xlwtabs.h" #endif void lw_register_widget (const char* type, const char* name, LWLIB_ID id, widget_value* val, lw_callback pre_activate_cb, lw_callback selection_cb, lw_callback post_activate_cb); Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); Widget lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); Widget lw_create_widget (const char* type, const char* name, LWLIB_ID id, widget_value* val, Widget parent, Boolean pop_up_p, lw_callback pre_activate_cb, lw_callback selection_cb, lw_callback post_activate_cb); LWLIB_ID lw_get_widget_id (Widget w); int lw_map_widget_values (LWLIB_ID id, int (*mapfunc) (widget_value *value, void *closure), void *closure); void lw_modify_all_widgets (LWLIB_ID id, widget_value* val, Boolean deep_p); void lw_destroy_widget (Widget w); void lw_destroy_all_widgets (LWLIB_ID id); void lw_destroy_everything (void); void lw_destroy_all_pop_ups (void); Widget lw_raise_all_pop_up_widgets (void); widget_value* lw_get_all_values (LWLIB_ID id); Boolean lw_get_some_values (LWLIB_ID id, widget_value* val); void lw_pop_up_all_widgets (LWLIB_ID id); void lw_pop_down_all_widgets (LWLIB_ID id); void lw_add_value_args_to_args (widget_value* wv, ArgList addto, int* offset); void lw_add_widget_value_arg (widget_value* wv, String name, XtArgVal value); XtArgVal lw_get_value_arg (widget_value* wv, String name); void lw_copy_widget_value_args (widget_value* copy, widget_value* val); widget_value * copy_widget_value_tree (widget_value *val, change_type change); widget_value *malloc_widget_value (void); void free_widget_value (widget_value *); void free_widget_value_tree (widget_value *wv); widget_value *replace_widget_value_tree (widget_value*, widget_value*); void lw_popup_menu (Widget, XEvent *); /* Toolkit independent way of focusing on a Widget at the Xt level. */ void lw_set_keyboard_focus (Widget parent, Widget w); /* Silly Energize hack to invert the "sheet" button */ void lw_show_busy (Widget w, Boolean busy); void lw_remove_accelerator_spec (char *val); #endif /* INCLUDED_lwlib_h_ */