Mercurial > hg > xemacs-beta
annotate lwlib/lwlib.h @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 4b7d425dd3c2 |
children | 383ab474a241 |
rev | line source |
---|---|
440 | 1 #ifndef INCLUDED_lwlib_h_ |
2 #define INCLUDED_lwlib_h_ | |
428 | 3 |
4 #include <X11/Intrinsic.h> | |
5 | |
6 #if defined (LWLIB_MENUBARS_LUCID) || defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_MENUBARS_ATHENA) | |
7 #define NEED_MENUBARS | |
8 #endif | |
9 #if defined (LWLIB_SCROLLBARS_LUCID) || defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_ATHENA) | |
10 #define NEED_SCROLLBARS | |
11 #endif | |
12 #if defined (LWLIB_DIALOGS_LUCID) || defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_DIALOGS_ATHENA) | |
13 #define NEED_DIALOGS | |
14 #endif | |
15 | |
16 /* | |
17 ** Widget values depend on the Widget type: | |
18 ** | |
19 ** widget: (name value key enabled data contents/selected) | |
20 ** | |
21 ** label: ("name" "string" NULL NULL NULL NULL) | |
22 ** BUTTON: ("name" "string" "key" T/F data <default-button-p>) | |
23 ** CASCADE (button w/menu): | |
24 ** ("name" "string" "key" T/F data (label|button|button w/menu...)) | |
25 ** INCREMENTAL (button w/menu construction callback): | |
26 ** ("name" "string" NULL T/F <opaque pointer>) | |
27 ** menubar: ("name" NULL NULL T/F data (button w/menu)) | |
28 ** scrollbar:("name" NULL NULL T/F NULL NULL) | |
29 ** selectable thing: | |
30 ** ("name" "string" "key" T/F data T/F) | |
31 ** checkbox: selectable thing | |
32 ** radio: ("name" NULL NULL T/F data (selectable thing...)) | |
33 ** strings: ("name" NULL NULL T/F data (selectable thing...)) | |
34 ** TEXT: ("name" "string" <ign> T/F data) | |
35 ** | |
36 ** Note that the above is EXTREMELY bogus. The "type" of the various entities | |
37 ** that a widget_value structure can represent is implicit in the contents of | |
38 ** half a dozen slots, instead of there simply being a type field. This | |
39 ** should all be rethunk. I've added a type field, but for now it's only used | |
40 ** by the new xlwmenu code. | |
41 */ | |
42 | |
43 typedef unsigned long LWLIB_ID; | |
44 | |
45 typedef enum _change_type | |
46 { | |
47 NO_CHANGE = 0, | |
48 INVISIBLE_CHANGE = 1, | |
49 VISIBLE_CHANGE = 2, | |
50 STRUCTURAL_CHANGE = 3 | |
51 } change_type; | |
52 | |
53 typedef enum _widget_value_type | |
54 { | |
55 UNSPECIFIED_TYPE = 0, | |
56 BUTTON_TYPE = 1, | |
57 TOGGLE_TYPE = 2, | |
58 RADIO_TYPE = 3, | |
59 TEXT_TYPE = 4, | |
60 SEPARATOR_TYPE = 5, | |
61 CASCADE_TYPE = 6, | |
62 PUSHRIGHT_TYPE = 7, | |
63 INCREMENTAL_TYPE = 8 | |
64 } widget_value_type; | |
65 | |
66 typedef enum _scroll_action | |
67 { | |
68 SCROLLBAR_LINE_UP = 0, | |
69 SCROLLBAR_LINE_DOWN = 1, | |
70 SCROLLBAR_PAGE_UP = 2, | |
71 SCROLLBAR_PAGE_DOWN = 3, | |
72 SCROLLBAR_DRAG = 4, | |
73 SCROLLBAR_CHANGE = 5, | |
74 SCROLLBAR_TOP = 6, | |
75 SCROLLBAR_BOTTOM = 7 | |
76 } scroll_action; | |
77 | |
78 typedef struct _scroll_event | |
79 { | |
80 scroll_action action; | |
81 int slider_value; | |
82 Time time; | |
83 } scroll_event; | |
84 | |
85 typedef struct _scrollbar_values | |
86 { | |
87 int line_increment; | |
88 int page_increment; | |
89 | |
90 int minimum; | |
91 int maximum; | |
92 | |
93 int slider_size; | |
94 int slider_position; | |
95 | |
96 int scrollbar_width, scrollbar_height; | |
97 int scrollbar_x, scrollbar_y; | |
98 } scrollbar_values; | |
99 | |
434 | 100 typedef struct _widget_args |
101 { | |
102 /* some things are only possible at creation time. args are applied | |
103 to widgets at creation time. */ | |
104 ArgList args; | |
105 int nargs; | |
106 /* Copying args is impossible so we make the caller give us heap allocated | |
444 | 107 args and free them when no one wants them any more. */ |
434 | 108 int ref_count; |
450 | 109 /* Since we are reference counting we need to be able to determine |
110 when something has changed. */ | |
111 Boolean args_changed; | |
434 | 112 } widget_args; |
113 | |
428 | 114 typedef struct _widget_value |
115 { | |
116 /* This slot is only partially utilized right now. */ | |
117 widget_value_type type; | |
118 | |
119 /* name of widget */ | |
120 char* name; | |
444 | 121 /* value (meaning BOGUSLY depends on widget type) */ |
428 | 122 char* value; |
123 /* keyboard equivalent. no implications for XtTranslations */ | |
124 char* key; | |
125 /* accelerator key. For XEmacs, this should be a Lisp_Object holding a | |
126 char or symbol suitable for passing to event_matches_key_specifier_p. | |
127 Outside of emacs, this can be anything: an X KeySym is a good idea. | |
128 lwlib provides support functions for keyboard traversal of menus. Actual | |
129 implementation of those accelerators is up to the application. | |
130 */ | |
131 XtPointer accel; | |
132 /* true if enabled */ | |
133 Boolean enabled; | |
134 /* true if selected */ | |
135 Boolean selected; | |
136 /* true if was edited (maintained by get_value) */ | |
137 Boolean edited; | |
138 /* true if has changed (maintained by lw library) */ | |
139 change_type change; | |
444 | 140 /* Contents of sub-widgets, also selected slot for checkbox */ |
428 | 141 struct _widget_value* contents; |
142 /* data passed to callback */ | |
143 XtPointer call_data; | |
444 | 144 /* next in the list of siblings */ |
428 | 145 struct _widget_value* next; |
146 /* slot for the toolkit dependent part. Always initialize to NULL. */ | |
147 void* toolkit_data; | |
148 /* tell us if we should free the toolkit data slot when freeing the | |
149 widget_value itself. */ | |
150 Boolean free_toolkit_data; | |
151 | |
152 /* data defining a scrollbar; only valid if type == "scrollbar" */ | |
153 scrollbar_values *scrollbar_data; | |
154 | |
434 | 155 /* A reference counted arg structure. */ |
156 struct _widget_args *args; | |
428 | 157 /* we resource the widget_value structures; this points to the next |
158 one on the free list if this one has been deallocated. */ | |
159 struct _widget_value *free_list; | |
160 | |
161 } widget_value; | |
162 | |
163 | |
164 typedef void (*lw_callback) (Widget w, LWLIB_ID id, XtPointer data); | |
165 | |
166 /* menu stuff */ | |
167 /* maybe this should go into a generic lwmenu.h */ | |
168 | |
169 extern int lw_menu_active; | |
170 | |
171 #if defined (LWLIB_MENUBARS_LUCID) | |
172 #include "xlwmenu.h" | |
173 #define lw_set_menu xlw_set_menu | |
174 #define lw_push_menu xlw_push_menu | |
175 #define lw_pop_menu xlw_pop_menu | |
176 #define lw_set_item xlw_set_item | |
177 #define lw_map_menu xlw_map_menu | |
178 #define lw_display_menu xlw_display_menu | |
179 #define lw_kill_menus xlw_kill_menus | |
180 #define lw_get_entries xlw_get_entries | |
181 #define lw_menu_level xlw_menu_level | |
182 #else /* LWLIB_MENUBARS_LUCID */ | |
183 /* do this for the other toolkits too */ | |
184 #endif /* LWLIB_MENUBARS_LUCID */ | |
185 | |
186 #if defined (LWLIB_TABS_LUCID) | |
187 #include "xlwtabs.h" | |
188 #endif | |
189 | |
442 | 190 void lw_register_widget (const char* type, const char* name, LWLIB_ID id, |
428 | 191 widget_value* val, lw_callback pre_activate_cb, |
192 lw_callback selection_cb, | |
193 lw_callback post_activate_cb); | |
194 Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); | |
195 Widget lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); | |
442 | 196 Widget lw_create_widget (const char* type, const char* name, LWLIB_ID id, |
428 | 197 widget_value* val, Widget parent, Boolean pop_up_p, |
198 lw_callback pre_activate_cb, | |
199 lw_callback selection_cb, | |
200 lw_callback post_activate_cb); | |
201 LWLIB_ID lw_get_widget_id (Widget w); | |
202 int lw_map_widget_values (LWLIB_ID id, int (*mapfunc) (widget_value *value, | |
203 void *closure), | |
204 void *closure); | |
205 void lw_modify_all_widgets (LWLIB_ID id, widget_value* val, Boolean deep_p); | |
206 void lw_destroy_widget (Widget w); | |
207 void lw_destroy_all_widgets (LWLIB_ID id); | |
208 void lw_destroy_everything (void); | |
209 void lw_destroy_all_pop_ups (void); | |
210 Widget lw_raise_all_pop_up_widgets (void); | |
211 widget_value* lw_get_all_values (LWLIB_ID id); | |
212 Boolean lw_get_some_values (LWLIB_ID id, widget_value* val); | |
213 void lw_pop_up_all_widgets (LWLIB_ID id); | |
214 void lw_pop_down_all_widgets (LWLIB_ID id); | |
215 void lw_add_value_args_to_args (widget_value* wv, ArgList addto, int* offset); | |
434 | 216 void lw_add_widget_value_arg (widget_value* wv, String name, XtArgVal value); |
639 | 217 XtArgVal lw_get_value_arg (widget_value* wv, String name); |
434 | 218 void lw_copy_widget_value_args (widget_value* copy, widget_value* val); |
442 | 219 widget_value * copy_widget_value_tree (widget_value *val, change_type change); |
428 | 220 |
221 widget_value *malloc_widget_value (void); | |
222 void free_widget_value (widget_value *); | |
223 void free_widget_value_tree (widget_value *wv); | |
224 widget_value *replace_widget_value_tree (widget_value*, widget_value*); | |
225 | |
226 void lw_popup_menu (Widget, XEvent *); | |
227 | |
228 /* Toolkit independent way of focusing on a Widget at the Xt level. */ | |
229 void lw_set_keyboard_focus (Widget parent, Widget w); | |
230 | |
231 /* Silly Energize hack to invert the "sheet" button */ | |
232 void lw_show_busy (Widget w, Boolean busy); | |
233 | |
442 | 234 void lw_remove_accelerator_spec (char *val); |
235 | |
440 | 236 #endif /* INCLUDED_lwlib_h_ */ |