Mercurial > hg > xemacs-beta
view lwlib/lwlib.h @ 4885:6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
lisp/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Correct the semantics of #'member*, #'eql, #'assoc* in the
presence of bignums; change the integerp byte code to fixnump
semantics.
* bytecomp.el (fixnump, integerp, byte-compile-integerp):
Change the integerp byte code to fixnump; add a byte-compile
method to integerp using fixnump and numberp and avoiding a
funcall most of the time, since in the non-core contexts where
integerp is used, it's mostly distinguishing between fixnums and
things that are not numbers at all.
* byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops)
(byte-compile-side-effect-and-error-free-ops):
Replace the integerp bytecode with fixnump; add fixnump to the
side-effect-free-fns. Add the other extended number type
predicates to the list in passing.
* obsolete.el (floatp-safe): Mark this as obsolete.
* cl.el (eql): Go into more detail in the docstring here. Don't
bother checking whether both arguments are numbers; one is enough,
#'equal will fail correctly if they have distinct types.
(subst): Replace a call to #'integerp (deciding whether to use
#'memq or not) with one to #'fixnump.
Delete most-positive-fixnum, most-negative-fixnum from this file;
they're now always in C, so they can't be modified from Lisp.
* cl-seq.el (member*, assoc*, rassoc*):
Correct these functions in the presence of bignums.
* cl-macs.el (cl-make-type-test): The type test for a fixnum is
now fixnump. Ditch floatp-safe, use floatp instead.
(eql): Correct this compiler macro in the presence of bignums.
(assoc*): Correct this compiler macro in the presence of bignums.
* simple.el (undo):
Change #'integerp to #'fixnump here, since we use #'delq with the
same value as ELT a few lines down.
src/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Fix problems with #'eql, extended number types, and the hash table
implementation; change the Bintegerp bytecode to fixnump semantics
even on bignum builds, since #'integerp can have a fast
implementation in terms of #'fixnump for most of its extant uses,
but not vice-versa.
* lisp.h: Always #include number.h; we want the macros provided in
it, even if the various number types are not available.
* number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its
argument is of non-immediate number type. Equivalent to FLOATP if
WITH_NUMBER_TYPES is not defined.
* elhash.c (lisp_object_eql_equal, lisp_object_eql_hash):
Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP,
giving more correct behaviour in the presence of the extended
number types.
* bytecode.c (Bfixnump, execute_optimized_program):
Rename Bintegerp to Bfixnump; change its semantics to reflect the
new name on builds with bignum support.
* data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data):
Always make #'fixnump available, even on non-BIGNUM builds;
always implement #'integerp in this file, even on BIGNUM builds.
Move most-positive-fixnum, most-negative-fixnum here from
number.c, so they are Lisp constants even on builds without number
types, and attempts to change or bind them error.
Use the NUMBERP and INTEGERP macros even on builds without
extended number types.
* data.c (fixnum_char_or_marker_to_int):
Rename this function from integer_char_or_marker_to_int, to better
reflect the arguments it accepts.
* number.c (Fevenp, Foddp, syms_of_number):
Never provide #'integerp in this file. Remove #'oddp,
#'evenp; their implementations are overridden by those in cl.el.
* number.c (vars_of_number):
most-positive-fixnum, most-negative-fixnum are no longer here.
man/ChangeLog addition:
2010-01-23 Aidan Kehoe <kehoea@parhasard.net>
Generally: be careful to say fixnum, not integer, when talking
about fixed-precision integral types. I'm sure I've missed
instances, both here and in the docstrings, but this is a decent
start.
* lispref/text.texi (Columns):
Document where only fixnums, not integers generally, are accepted.
(Registers):
Remove some ancient char-int confoundance here.
* lispref/strings.texi (Creating Strings, Creating Strings):
Be more exact in describing where fixnums but not integers in
general are accepted.
(Creating Strings): Use a more contemporary example to illustrate
how concat deals with lists including integers about #xFF. Delete
some obsolete documentation on same.
(Char Table Types): Document that only fixnums are accepted as
values in syntax tables.
* lispref/searching.texi (String Search, Search and Replace):
Be exact in describing where fixnums but not integers in general
are accepted.
* lispref/range-tables.texi (Range Tables): Be exact in describing
them; only fixnums are accepted to describe ranges.
* lispref/os.texi (Killing XEmacs, User Identification)
(Time of Day, Time Conversion):
Be more exact about using fixnum where only fixed-precision
integers are accepted.
* lispref/objects.texi (Integer Type): Be more exact (and
up-to-date) about the possible values for
integers. Cross-reference to documentation of the bignum extension.
(Equality Predicates):
(Range Table Type):
(Array Type): Use fixnum, not integer, to describe a
fixed-precision integer.
(Syntax Table Type): Correct some English syntax here.
* lispref/numbers.texi (Numbers): Change the phrasing here to use
fixnum to mean the fixed-precision integers normal in emacs.
Document that our terminology deviates from that of Common Lisp,
and that we're working on it.
(Compatibility Issues): Reiterate the Common Lisp versus Emacs
Lisp compatibility issues.
(Comparison of Numbers, Arithmetic Operations):
* lispref/commands.texi (Command Loop Info, Working With Events):
* lispref/buffers.texi (Modification Time):
Be more exact in describing where fixnums but not integers in
general are accepted.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 24 Jan 2010 15:21:27 +0000 |
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_ */