Mercurial > hg > xemacs-beta
annotate lwlib/xlwmenuP.h @ 5307:c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
src/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.c (Fexpand_abbrev):
* alloc.c:
* alloc.c (Fmake_list):
* alloc.c (Fmake_vector):
* alloc.c (Fmake_bit_vector):
* alloc.c (Fmake_byte_code):
* alloc.c (Fmake_string):
* alloc.c (vars_of_alloc):
* bytecode.c (UNUSED):
* bytecode.c (Fbyte_code):
* chartab.c (decode_char_table_range):
* cmds.c (Fself_insert_command):
* data.c (check_integer_range):
* data.c (Fnatnump):
* data.c (Fnonnegativep):
* data.c (Fstring_to_number):
* elhash.c (hash_table_size_validate):
* elhash.c (decode_hash_table_size):
* eval.c (Fbacktrace_frame):
* event-stream.c (lisp_number_to_milliseconds):
* event-stream.c (Faccept_process_output):
* event-stream.c (Frecent_keys):
* event-stream.c (Fdispatch_event):
* events.c (Fmake_event):
* events.c (Fevent_timestamp):
* events.c (Fevent_timestamp_lessp):
* events.h:
* events.h (struct command_builder):
* file-coding.c (gzip_putprop):
* fns.c:
* fns.c (check_sequence_range):
* fns.c (Frandom):
* fns.c (Fnthcdr):
* fns.c (Flast):
* fns.c (Fnbutlast):
* fns.c (Fbutlast):
* fns.c (Fmember):
* fns.c (Ffill):
* fns.c (Freduce):
* fns.c (replace_string_range_1):
* fns.c (Freplace):
* font-mgr.c (Ffc_pattern_get):
* frame-msw.c (msprinter_set_frame_properties):
* glyphs.c (check_valid_xbm_inline):
* indent.c (Fmove_to_column):
* intl-win32.c (mswindows_multibyte_to_unicode_putprop):
* lisp.h:
* lisp.h (ARRAY_DIMENSION_LIMIT):
* lread.c (decode_mode_1):
* mule-ccl.c (ccl_get_compiled_code):
* number.h:
* process-unix.c (unix_open_multicast_group):
* process.c (Fset_process_window_size):
* profile.c (Fstart_profiling):
* unicode.c (Funicode_to_char):
Change NATNUMP to return 1 for positive bignums; changes uses of
it and of CHECK_NATNUM appropriately, usually by checking for an
integer in an appropriate range.
Add array-dimension-limit and use it in #'make-vector,
#'make-string. Add array-total-size-limit, array-rank-limit while
we're at it, for the sake of any Common Lisp-oriented code that
uses these limits.
Rename check_int_range to check_integer_range, have it take
Lisp_Objects (and thus bignums) instead.
Remove bignum_butlast(), just set int_n to an appropriately large
integer if N is a bignum.
Accept bignums in check_sequence_range(), change the functions
that use check_sequence_range() appropriately.
Move the definition of NATNUMP() to number.h; document why it's a
reasonable name, contradicting an old comment.
tests/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (featurep):
* automated/lisp-tests.el (wrong-type-argument):
* automated/mule-tests.el (featurep):
Check for args-out-of-range errors instead of wrong-type-argument
errors in various places when code is handed a large bignum
instead of a fixnum.
Also check for the wrong-type-argument errors when giving the same
code a non-integer value.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 20 Nov 2010 16:49:11 +0000 |
parents | a6c778975d7d |
children | ade4c7e2c6cb |
rev | line source |
---|---|
440 | 1 #ifndef INCLUDED_xlwmenuP_h_ |
2 #define INCLUDED_xlwmenuP_h_ | |
428 | 3 |
4 #include "xlwmenu.h" | |
5 #include <X11/CoreP.h> | |
6 | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3685
diff
changeset
|
7 #ifdef HAVE_XFT_MENUBARS |
3094 | 8 #include <X11/Xft/Xft.h> |
9 #endif | |
10 | |
11 | |
428 | 12 /* Elements in the stack arrays. */ |
13 typedef struct _window_state | |
14 { | |
15 Window window; | |
16 Position x; | |
17 Position y; | |
18 Dimension width; | |
19 Dimension height; | |
20 Dimension label_width; | |
21 Dimension toggle_width; | |
22 } window_state; | |
23 | |
24 | |
25 /* New fields for the XlwMenu widget instance record */ | |
26 typedef struct _XlwMenu_part | |
27 { | |
28 /* slots set by the resources */ | |
29 | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3685
diff
changeset
|
30 #if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS) |
428 | 31 XmFontList font_list; |
32 XmFontList font_list_2; | |
33 XmFontList fallback_font_list; | |
34 #else | |
35 XFontStruct * font; | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3685
diff
changeset
|
36 #ifdef HAVE_XFT_MENUBARS |
3397 | 37 String fcFontName; |
3685 | 38 String xftFontName; |
3094 | 39 XftFont *renderFont; |
40 #endif | |
428 | 41 # ifdef USE_XFONTSET |
42 XFontSet font_set; | |
43 # endif | |
44 #endif | |
45 Dimension font_ascent, font_descent; /* extracted from font/fontlist */ | |
46 | |
47 Pixel foreground; | |
48 Pixel button_foreground; | |
49 Pixel highlight_foreground; | |
50 Pixel title_foreground; | |
51 Dimension margin; | |
52 Dimension horizontal_margin; | |
53 Dimension vertical_margin; | |
54 Dimension column_spacing; | |
55 Dimension shadow_thickness; | |
56 Dimension indicator_size; | |
57 Pixel top_shadow_color; | |
58 Pixel bottom_shadow_color; | |
59 Pixel select_color; | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3685
diff
changeset
|
60 #ifdef HAVE_XFT_MENUBARS |
3094 | 61 #endif |
428 | 62 Pixmap top_shadow_pixmap; |
63 Pixmap bottom_shadow_pixmap; | |
64 Cursor cursor_shape; | |
65 XtCallbackList open; | |
66 XtCallbackList select; | |
67 widget_value* contents; | |
68 int horizontal; | |
69 Boolean use_backing_store; | |
70 Boolean bounce_down; | |
71 Boolean lookup_labels; | |
72 | |
73 /* State of the XlwMenu */ | |
74 int old_depth; | |
75 widget_value** old_stack; | |
76 int old_stack_length; | |
77 | |
78 /* New state after the user moved */ | |
79 int new_depth; | |
80 widget_value** new_stack; | |
81 int new_stack_length; | |
82 | |
83 /* Window resources */ | |
84 window_state* windows; | |
85 int windows_length; | |
86 | |
87 /* Internal part, set by the XlwMenu */ | |
88 GC foreground_gc; | |
89 GC button_gc; | |
90 GC background_gc; | |
91 GC inactive_gc; | |
92 GC inactive_button_gc; | |
93 GC shadow_top_gc; | |
94 GC shadow_bottom_gc; | |
95 GC select_gc; | |
96 GC highlight_gc; | |
97 GC title_gc; | |
98 Cursor cursor; | |
99 Boolean popped_up; | |
100 Pixmap gray_pixmap; | |
101 | |
102 /* Stay-up stuff */ | |
103 Boolean pointer_grabbed; | |
104 Boolean next_release_must_exit; | |
105 Time menu_post_time, menu_bounce_time; | |
106 widget_value * last_selected_val; | |
107 } XlwMenuPart; | |
108 | |
109 /* Full instance record declaration */ | |
110 typedef struct _XlwMenuRec | |
111 { | |
112 CorePart core; | |
113 XlwMenuPart menu; | |
114 } XlwMenuRec; | |
115 | |
116 /* New fields for the XlwMenu widget class record */ | |
117 typedef struct | |
118 { | |
119 int dummy; | |
120 } XlwMenuClassPart; | |
121 | |
122 /* Full class record declaration. */ | |
123 typedef struct _XlwMenuClassRec | |
124 { | |
125 CoreClassPart core_class; | |
126 XlwMenuClassPart menu_class; | |
127 } XlwMenuClassRec; | |
128 | |
129 /* Class pointer. */ | |
130 extern XlwMenuClassRec xlwMenuClassRec; | |
131 | |
440 | 132 #endif /* INCLUDED_xlwmenuP_h_ */ |