Mercurial > hg > xemacs-beta
view lwlib/lwlib.h @ 5013:ae48681c47fa
changes to VOID_TO_LISP et al.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* casetab.c (compute_canon_mapper):
* casetab.c (initialize_identity_mapper):
* casetab.c (compute_up_or_eqv_mapper):
* casetab.c (recompute_case_table):
* casetab.c (set_case_table):
* chartab.c (copy_mapper):
* chartab.c (copy_char_table_range):
* chartab.c (get_range_char_table_1):
* console.c (find_nonminibuffer_frame_not_on_console_predicate):
* console.c (find_nonminibuffer_frame_not_on_console):
* console.c (nuke_all_console_slots):
* device.c:
* device.c (find_nonminibuffer_frame_not_on_device_predicate):
* device.c (find_nonminibuffer_frame_not_on_device):
* dialog-msw.c (dialog_proc):
* dialog-msw.c (handle_question_dialog_box):
* dialog-x.c (maybe_run_dbox_text_callback):
* eval.c:
* eval.c (safe_run_hook_trapping_problems_1):
* eval.c (safe_run_hook_trapping_problems):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (mswindows_find_frame):
* faces.c (update_face_inheritance_mapper):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_get_mouse_position):
* frame-msw.c (mswindows_get_frame_parent):
* glade.c (connector):
* glade.c (Fglade_xml_signal_connect):
* glade.c (Fglade_xml_signal_autoconnect):
* glade.c (Fglade_xml_textdomain):
* glyphs-msw.c (mswindows_subwindow_instantiate):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs.c (check_instance_cache_mapper):
* glyphs.c (check_window_subwindow_cache):
* glyphs.c (check_image_instance_structure):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (popup_selection_callback):
* gui-x.c (button_item_to_widget_value):
* keymap.c (map_keymap_mapper):
* keymap.c (Fmap_keymap):
* menubar-gtk.c (__torn_off_sir):
* menubar-gtk.c (__activate_menu):
* menubar-gtk.c (menu_convert):
* menubar-gtk.c (__generic_button_callback):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c:
* menubar-msw.c (EMPTY_ITEM_ID):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* menubar-x.c (pre_activate_callback):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (command_builder_find_menu_accelerator):
* print.c (print_internal):
* process-unix.c (close_process_descs_mapfun):
* process.c (get_process_from_usid):
* process.c (init_process_io_handles):
* profile.c (sigprof_handler):
* profile.c (get_profiling_info_timing_maphash):
* profile.c (Fget_profiling_info):
* profile.c (set_profiling_info_timing_maphash):
* profile.c (mark_profiling_info_maphash):
* scrollbar-msw.c (mswindows_create_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* specifier.c (recompute_cached_specifier_everywhere_mapfun):
* specifier.c (recompute_cached_specifier_everywhere):
* syntax.c (copy_to_mirrortab):
* syntax.c (copy_if_not_already_present):
* syntax.c (update_just_this_syntax_table):
* text.c (new_dfc_convert_now_damn_it):
* text.h (LISP_STRING_TO_EXTERNAL):
* tooltalk.c:
* tooltalk.c (tooltalk_message_callback):
* tooltalk.c (tooltalk_pattern_callback):
* tooltalk.c (Fcreate_tooltalk_message):
* tooltalk.c (Fcreate_tooltalk_pattern):
* ui-byhand.c (__generic_toolbar_callback):
* ui-byhand.c (generic_toolbar_insert_item):
* ui-byhand.c (__emacs_gtk_ctree_recurse_internal):
* ui-byhand.c (Fgtk_ctree_recurse):
* ui-gtk.c (__internal_callback_destroy):
* ui-gtk.c (__internal_callback_marshal):
* ui-gtk.c (Fgtk_signal_connect):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* lisp-disunion.h:
* lisp-disunion.h (NON_LVALUE):
* lisp-union.h:
* lisp.h (LISP_HASH):
Rename:
LISP_TO_VOID -> STORE_LISP_IN_VOID
VOID_TO_LISP -> GET_LISP_FROM_VOID
These new names are meant to clearly identify that the Lisp object
is the source and void the sink, and that they can't be used the
other way around -- they aren't exact opposites despite the old
names. The names are also important given the new functions
created just below. Also, clarify comments in lisp-union.h and
lisp-disunion.h about the use of the functions.
* lisp.h:
New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These
are different from the above in that the source is a void *
(previously, you had to use make_opaque_ptr()).
* eval.c (restore_lisp_object):
* eval.c (record_unwind_protect_restoring_lisp_object):
* eval.c (struct restore_int):
* eval.c (restore_int):
* eval.c (record_unwind_protect_restoring_int):
* eval.c (free_pointer):
* eval.c (record_unwind_protect_freeing):
* eval.c (free_dynarr):
* eval.c (record_unwind_protect_freeing_dynarr):
* eval.c (unbind_to_1):
Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the
use of make_opaque_ptr() and mostly eliminate Lisp consing
entirely in the use of these various record_unwind_protect_*
functions as well as internal_bind_* (e.g. internal_bind_int).
* tests.c:
* tests.c (Ftest_store_void_in_lisp):
* tests.c (syms_of_tests):
* tests.c (vars_of_tests):
Add an C-assert-style test to test STORE_VOID_IN_LISP and
GET_VOID_FROM_LISP to make sure the same value comes back that
was put in.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 06:42:16 -0600 |
parents | 726060ee587c |
children | ade4c7e2c6cb |
line wrap: on
line source
#ifndef INCLUDED_lwlib_h_ #define INCLUDED_lwlib_h_ #include <X11/Intrinsic.h> #include "xt-wrappers.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_ */