annotate lwlib/xlwgcs.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 5460287a3327
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
1 /* Tabs Widget for XEmacs.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
2 Copyright (C) 1999 Edward A. Falk
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
3
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
4 This file is part of XEmacs.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
5
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
6 XEmacs is free software; you can redistribute it and/or modify it
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
7 under the terms of the GNU General Public License as published by the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
8 Free Software Foundation; either version 2, or (at your option) any
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
9 later version.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
10
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
14 for more details.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
15
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
16 You should have received a copy of the GNU General Public License
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
17 along with XEmacs; see the file COPYING. If not, write to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
19 Boston, MA 02111-1307, USA. */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
20
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
21 /* Synched up with: Gcs 1.7 */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
22
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
23
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
24 #ifndef GCS_H
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
25 #define GCS_H
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
26
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
27 /* Overview of functions provided here:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
28 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
29 * AllocFgGC()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
30 * Given a foreground pixel & a font, return an appropriate GC
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
31 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
32 * AllocBackgroundGC()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
33 * Given a widget, return a GC for painting the background color
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
34 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
35 * AllocShadeGC()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
36 * Given foreground, background, a contrast value & be_nice_to_colormap
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
37 * flag, return a GC suitable for rendering in an intermediate color,
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 398
diff changeset
38 * as determined by contrast. May return a dither pattern or a
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
39 * solid color, as appropriate.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
40 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
41 * Contrast 0 = background color, 100 = foreground color. It is legal
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
42 * for contrast to be more than 100 or less than 0.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
43 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
44 * AllocGreyGC()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
45 * Given widget, foreground, font, contrast & be_nice_to_colormap,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
46 * return a shade GC (see above) based on foreground and widget
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
47 * background.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
48 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
49 * AllocTopShadowGC()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
50 * Given widget, contrast & be_nice_to_colormap, return a GC suitable
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
51 * for rendering the top shadow.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
52 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
53 * Contrast 0 = use background pixel. Contrast > 0 = use brighter
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
54 * colors.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
55 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
56 * AllocBotShadowGC()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
57 * Given widget, contrast & be_nice_to_colormap, return a GC suitable
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
58 * for rendering the bottom shadow.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
59 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
60 * Contrast 0 = use background pixel. Contrast > 0 = use darker
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
61 * colors.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
62 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
63 * AllocArmShadowGC()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
64 * Given widget, contrast & be_nice_to_colormap, return a GC suitable
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
65 * for rendering the "armed" shadow.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
66 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
67 * Contrast 0 = use background pixel. Contrast > 0 = use darker
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
68 * colors.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
69 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
70 * AllocShadowPixel()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
71 * Given a widget & scale factor, allocate & return a color darker
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
72 * or lighter than the background pixel, as determined by scale.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
73 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
74 * Scale 100 = use background pixel. Scale > 100 = brighter color,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
75 * Scale < 100 = darker color.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
76 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
77 * AllocGreyPixel()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
78 * Given two pixel values and scale factor, allocate & return a
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
79 * pixel value between them, according to scale.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
80 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
81 * Scale == 0: background color
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
82 * Scale == 100: foreground color
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
83 * 0<Scale<100: intermediate color
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
84 * Scale > 100: more foreground
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
85 * Scale < 0: more background
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
86 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
87 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
88 * AllocGreyPixelC()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
89 * Given two color values and scale factor, allocate & return a
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
90 * pixel value between them, according to scale.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
91 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
92 * Scale == 0: background color
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
93 * Scale == 100: foreground color
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
94 * 0<Scale<100: intermediate color
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
95 * Scale > 100: more foreground
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
96 * Scale < 0: more background
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
97 *
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
98 * Draw3dBox()
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
99 * Given box dimensions, shadow width, top shadow GC & bottom shadow GC,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
100 * draw a 3-d box.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
101 */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
102
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
103 #if NeedFunctionPrototypes
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
104
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
105 extern GC AllocFgGC( Widget w, Pixel fg, Font font) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
106 extern GC AllocBackgroundGC( Widget w, Font font) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
107 extern GC AllocShadeGC( Widget w, Pixel fg, Pixel bg, Font,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
108 int contrast, Bool ) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
109 extern GC AllocGreyGC( Widget w, Pixel fg, Font, int, Bool ) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
110 extern GC AllocTopShadowGC( Widget w, int contrast, int ) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
111 extern GC AllocBotShadowGC( Widget w, int contrast, int ) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
112 extern GC AllocArmGC( Widget w, int contrast, int) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
113 extern Pixel AllocShadowPixel(Widget, int scale) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
114 extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
115 extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
116 extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
117 GC topgc, GC botgc) ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
118
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
119 #else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
120
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
121 extern GC AllocFgGC() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
122 extern GC AllocBackgroundGC() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
123 extern GC AllocShadeGC() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
124 extern GC AllocGreyGC() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
125 extern GC AllocTopShadowGC() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
126 extern GC AllocBotShadowGC() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
127 extern GC AllocArmGC() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
128 extern Pixel AllocShadowPixel() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
129 extern Pixel AllocGreyPixel() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
130 extern Pixel AllocGreyPixelC() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
131 extern void Draw3dBox() ;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
132
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
133 #endif
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
134
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
135 #endif /* GCS_H */