Mercurial > hg > xemacs-beta
view lwlib/xlwcheckbox.c @ 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 | 5460287a3327 |
children | 308d34e9f07d |
line wrap: on
line source
/* Checkbox Widget for XEmacs. Copyright (C) 1999 Edward A. Falk This file is part of XEmacs. XEmacs 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 2, or (at your option) any later version. XEmacs 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 XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Checkbox.c 1.1 */ /* * Checkbox.c - Checkbox button widget * * Author: Edward A. Falk * falk@falconer.vip.best.com * * Date: June 30, 1997 * * Overview: This widget is identical to the Radio widget in behavior, * except that the button is square and has a check mark. */ #include <config.h> #include <stdio.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include ATHENA_XawInit_h_ #include "xt-wrappers.h" #include "xlwcheckboxP.h" /* by using the same size for the checkbox as for the diamond box, * we can let the Radio widget do the vast majority of the work. */ #define BOX_SIZE 8 #define DRAW_CHECK 0 /* don't draw the check mark */ #define cclass(w) ((CheckboxWidgetClass)((w)->core.widget_class)) #ifdef _ThreeDP_h #define swid(cw) ((cw)->threeD.shadow_width) #else #define swid(cw) ((cw)->core.border_width) #endif #define bsize(cw) (cclass(cw)->radio_class.dsize) #define bs(cw) (bsize(cw) + 2*swid(cw)) #if DRAW_CHECK #define check_width 14 #define check_height 14 static unsigned char check_bits[] = { 0x00, 0x00, 0x00, 0x20, 0x00, 0x18, 0x00, 0x0c, 0x00, 0x06, 0x00, 0x03, 0x8c, 0x03, 0xde, 0x01, 0xff, 0x01, 0xfe, 0x00, 0xfc, 0x00, 0x78, 0x00, 0x70, 0x00, 0x20, 0x00}; #endif /**************************************************************** * * Full class record constant * ****************************************************************/ #if DRAW_CHECK static char defaultTranslations[] = "<EnterWindow>: highlight()\n\ <LeaveWindow>: unpress(draw) unhighlight()\n\ <Btn1Down>: press()\n\ <Btn1Down>,<Btn1Up>: unpress(nodraw) toggle() notify()"; #endif #define offset(field) XtOffsetOf(CheckboxRec, checkbox.field) #define res(name,_class,intrepr,type,member,extrepr,value) \ Xt_RESOURCE (name, _class, intrepr, type, offset(member), extrepr, value) static XtResource resources[] = { res (XtNtristate, XtCTristate, XtRBoolean, Boolean, tristate, XtRImmediate, FALSE), } ; #undef offset /* Member functions */ static void CheckboxClassInit (void); static void CheckboxInit (Widget, Widget, ArgList, Cardinal *); #if DRAW_CHECK static void CheckboxRealize (Widget, Mask *, XSetWindowAttributes *); #endif static void DrawCheck (Widget); /* Action procs */ #if DRAW_CHECK static void CheckboxPress (Widget, XEvent *, String *, Cardinal *); static void CheckboxUnpress (Widget, XEvent *, String *, Cardinal *); #endif /* internal privates */ #if DRAW_CHECK static XtActionsRec actionsList[] = { {"press", CheckboxPress}, {"unpress", CheckboxUnpress}, } ; #endif #define SuperClass ((RadioWidgetClass)&radioClassRec) CheckboxClassRec checkboxClassRec = { { (WidgetClass) SuperClass, /* superclass */ (String) "Checkbox", /* class_name */ sizeof(CheckboxRec), /* size */ CheckboxClassInit, /* class_initialize */ NULL, /* class_part_initialize */ FALSE, /* class_inited */ CheckboxInit, /* initialize */ NULL, /* initialize_hook */ #if DRAW_CHECK CheckboxRealize, /* realize */ actionsList, /* actions */ XtNumber(actionsList), /* num_actions */ #else XtInheritRealize, /* realize */ NULL, /* actions */ 0, /* num_actions */ #endif resources, /* resources */ XtNumber(resources), /* resource_count */ NULLQUARK, /* xrm_class */ TRUE, /* compress_motion */ TRUE, /* compress_exposure */ TRUE, /* compress_enterleave */ FALSE, /* visible_interest */ NULL, /* destroy */ XtInheritResize, /* resize */ XtInheritExpose, /* expose */ NULL, /* set_values */ NULL, /* set_values_hook */ XtInheritSetValuesAlmost, /* set_values_almost */ NULL, /* get_values_hook */ NULL, /* accept_focus */ XtVersion, /* version */ NULL, /* callback_private */ #if DRAW_CHECK defaultTranslations, /* tm_table */ #else XtInheritTranslations, /* tm_table */ #endif XtInheritQueryGeometry, /* query_geometry */ XtInheritDisplayAccelerator, /* display_accelerator */ NULL /* extension */ }, /* CoreClass fields initialization */ { XtInheritChangeSensitive /* change_sensitive */ }, /* SimpleClass fields initialization */ #ifdef _ThreeDP_h { XtInheritXaw3dShadowDraw /* field not used */ }, /* ThreeDClass fields initialization */ #endif { 0 /* field not used */ }, /* LabelClass fields initialization */ { 0 /* field not used */ }, /* CommandClass fields initialization */ { RadioSet, /* Set Procedure. */ RadioUnset, /* Unset Procedure. */ NULL /* extension. */ }, /* ToggleClass fields initialization */ { BOX_SIZE, DrawCheck, /* draw procedure */ NULL /* extension. */ }, /* RadioClass fields initialization */ { NULL /* extension. */ }, /* CheckboxClass fields initialization */ }; /* for public consumption */ WidgetClass checkboxWidgetClass = (WidgetClass) &checkboxClassRec; /**************************************************************** * * Class Methods * ****************************************************************/ static void CheckboxClassInit (void) { XawInitializeWidgetSet(); } /*ARGSUSED*/ static void CheckboxInit (Widget UNUSED (request), #if DRAW_CHECK Widget new, #else Widget UNUSED (new_), #endif ArgList UNUSED (args), Cardinal *UNUSED (num_args)) { #if DRAW_CHECK CheckboxWidget cw = (CheckboxWidget) new_; cw->checkbox.checkmark = None ; cw->checkbox.checkmark_GC = None ; #endif } #if DRAW_CHECK static void CheckboxRealize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes) { CheckboxWidget cw = (CheckboxWidget) w; XtGCMask value_mask, dynamic_mask, dontcare_mask ; XGCValues values ; /* first, call superclass realize */ (*checkboxWidgetClass->core_class.superclass->core_class.realize) (w, valueMask, attributes); /* TODO: cache this via xmu */ if( cw->checkbox.checkmark == None ) cw->checkbox.checkmark = XCreateBitmapFromData( XtDisplay(w), XtWindow(w), check_bits,check_width,check_height); values.fill_style = FillStippled ; values.stipple = cw->checkbox.checkmark ; values.foreground = cw->label.foreground ; value_mask = GCFillStyle | GCStipple | GCForeground ; dynamic_mask = GCTileStipXOrigin | GCTileStipYOrigin ; dontcare_mask = GCLineWidth | GCLineStyle | GCCapStyle | GCJoinStyle | GCFont | GCSubwindowMode | GCGraphicsExposures | GCDashOffset | GCDashList | GCArcMode ; cw->checkbox.checkmark_GC = XtAllocateGC(w, 0, value_mask, &values, dynamic_mask, dontcare_mask) ; } #endif /* Function Name: CheckboxDestroy * Description: Destroy Callback for checkbox widget. * Arguments: w - the checkbox widget that is being destroyed. * junk, garbage - not used. * Returns: none. */ /* ARGSUSED */ #if DRAW_CHECK static void CheckboxDestroy ( Widget w, XtPointer UNUSED (junk), XtPointer UNUSED (garbage)) { CheckboxWidget cw = (CheckboxWidget) w; /* TODO: cache this via xmu */ if( cw->checkbox.checkmark != None ) XFreePixmap( XtDisplay(w), cw->checkbox.checkmark ) ; if( cw->checkbox.checkmark_GC != None ) XtReleaseGC(w, cw->checkbox.checkmark_GC) ; } #endif /* DRAW_CHECK */ #if DRAW_CHECK /************************************************************ * * Actions Procedures * ************************************************************/ /* ARGSUSED */ static void CheckboxPress (Widget w, XEvent *event, String *params, /* unused */ Cardinal *num_params) /* unused */ { CheckboxWidget cw = (CheckboxWidget) w ; if( !cw->checkbox.pressed ) { cw->checkbox.pressed = TRUE ; ((CheckboxWidgetClass)(w->core.widget_class))->radio_class.drawDiamond(w) ; } } static void CheckboxUnpress (Widget w, XEvent *event, String *params, /* unused */ Cardinal *num_params) /* unused */ { CheckboxWidget cw = (CheckboxWidget) w ; int i ; if( cw->checkbox.pressed ) { cw->checkbox.pressed = FALSE ; if( *num_params > 0 && **params == 'd' ) ((CheckboxWidgetClass)(w->core.widget_class))->radio_class.drawDiamond(w); } } #endif /************************************************************ * * Internal Procedures * ************************************************************/ static void DrawCheck (Widget w) { CheckboxWidget cw = (CheckboxWidget) w ; Display *dpy = XtDisplay(w) ; Window win = XtWindow(w) ; GC gc ; #ifdef _ThreeDP_h XPoint pts[6] ; #endif Dimension s = swid(cw); Dimension bsz = bsize(cw); Position bx,by ; /* Check upper-left */ Dimension bh ; #ifdef _ThreeDP_h Dimension bw; GC top, bot; #endif GC ctr ; /* foreground GC */ gc = XtIsSensitive(w) ? cw->command.normal_GC : cw->label.gray_GC ; bh = bs(cw) ; bx = cw->label.internal_width ; by = cw->core.height/2 - bh/2 ; #ifdef _ThreeDP_h bw = bh ; if( !cw->command.set ) { top = cw->threeD.top_shadow_GC ; bot = cw->threeD.bot_shadow_GC ; } else { top = cw->threeD.bot_shadow_GC ; bot = cw->threeD.top_shadow_GC ; } ctr = cw->command.inverse_GC ; #else ctr = cw->command.set ? cw->command.normal_GC : cw->command.inverse_GC ; #endif XFillRectangle(dpy,win,ctr, bx+s,by+s, bsz,bsz) ; #ifdef _ThreeDP_h /* top-left shadow */ pts[0].x = bx ; pts[0].y = by ; pts[1].x = bw ; pts[1].y = 0 ; pts[2].x = -s ; pts[2].y = s ; pts[3].x = -bsz ; pts[3].y = 0 ; pts[4].x = 0 ; pts[4].y = bsz ; pts[5].x = -s ; pts[5].y = s ; XFillPolygon(dpy,win,top, pts,6, Nonconvex,CoordModePrevious) ; /* bottom-right shadow */ pts[0].x = bx+bw ; pts[0].y = by+bh ; pts[1].x = -bw ; pts[1].y = 0 ; pts[2].x = s ; pts[2].y = -s ; pts[3].x = bsz ; pts[3].y = 0 ; pts[4].x = 0 ; pts[4].y = -bsz ; pts[5].x = s ; pts[5].y = -s ; XFillPolygon(dpy,win,bot, pts,6, Nonconvex,CoordModePrevious) ; #else XDrawRectangle(dpy,win,gc, bx+s,by+s, bsz,bsz) ; #endif #if DRAW_CHECK if( cw->command.set && cw->checkbox.checkmark_GC != None ) { XSetTSOrigin(dpy,cw->checkbox.checkmark_GC, bx+s, by+s) ; XFillRectangle(dpy,win,cw->checkbox.checkmark_GC, bx+s, by+s, check_width,check_height) ; } #endif }