Mercurial > hg > xemacs-beta
annotate src/dialog-x.c @ 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 | 2b6fa2618f76 |
children | 01c57eb70ae9 |
rev | line source |
---|---|
428 | 1 /* Implements elisp-programmable dialog boxes -- X interface. |
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
3 Copyright (C) 1995 Tinker Systems and INS Engineering Corp. | |
853 | 4 Copyright (C) 2000, 2002 Ben Wing. |
428 | 5 |
6 This file is part of XEmacs. | |
7 | |
8 XEmacs is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Not in FSF. */ | |
24 | |
442 | 25 /* This file Mule-ized by Ben Wing, 7-8-00. */ |
26 | |
428 | 27 #include <config.h> |
28 #include "lisp.h" | |
29 | |
30 #include "buffer.h" | |
31 #include "commands.h" /* zmacs_regions */ | |
32 #include "events.h" | |
872 | 33 #include "frame-impl.h" |
428 | 34 #include "gui.h" |
35 #include "opaque.h" | |
36 #include "window.h" | |
37 | |
872 | 38 #include "console-x-impl.h" |
39 #include "gui-x.h" | |
40 | |
41 #include "EmacsFrame.h" | |
428 | 42 |
43 static void | |
44 maybe_run_dbox_text_callback (LWLIB_ID id) | |
45 { | |
46 widget_value *wv; | |
47 int got_some; | |
48 wv = xmalloc_widget_value (); | |
436 | 49 wv->name = xstrdup ("value"); |
428 | 50 got_some = lw_get_some_values (id, wv); |
51 if (got_some) | |
52 { | |
53 Lisp_Object text_field_callback; | |
442 | 54 Extbyte *text_field_value = wv->value; |
826 | 55 text_field_callback = VOID_TO_LISP (wv->call_data); |
442 | 56 text_field_callback = XCAR (XCDR (text_field_callback)); |
428 | 57 if (text_field_value) |
58 { | |
442 | 59 void *tmp = |
60 LISP_TO_VOID (cons3 (Qnil, | |
61 list2 (text_field_callback, | |
62 build_ext_string (text_field_value, | |
63 Qlwlib_encoding)), | |
64 Qnil)); | |
428 | 65 popup_selection_callback (0, id, (XtPointer) tmp); |
66 } | |
67 } | |
436 | 68 /* This code tried to optimize, newing/freeing. This is generally |
442 | 69 unsafe so we will always strdup and always use |
436 | 70 free_widget_value_tree. */ |
71 free_widget_value_tree (wv); | |
428 | 72 } |
73 | |
74 static void | |
75 dbox_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data) | |
76 { | |
77 /* This is called with client_data == -1 when WM_DELETE_WINDOW is sent | |
78 instead of a button being selected. */ | |
79 struct device *d = get_device_from_display (XtDisplay (widget)); | |
80 struct frame *f = 0; | |
81 Widget cur_widget = widget; | |
82 | |
83 /* The parent which is actually connected to our EmacsFrame may be a | |
84 ways up the tree. */ | |
85 while (!f && cur_widget) | |
86 { | |
87 f = x_any_window_to_frame (d, XtWindow (cur_widget)); | |
88 cur_widget = XtParent (cur_widget); | |
89 } | |
90 | |
91 if (popup_handled_p (id)) | |
92 return; | |
93 assert (popup_up_p != 0); | |
94 ungcpro_popup_callbacks (id); | |
95 popup_up_p--; | |
96 maybe_run_dbox_text_callback (id); | |
97 popup_selection_callback (widget, id, client_data); | |
442 | 98 /* #### need to error-protect! will do so when i merge in |
99 my working ws */ | |
100 va_run_hook_with_args (Qdelete_dialog_box_hook, 1, make_int (id)); | |
428 | 101 lw_destroy_all_widgets (id); |
102 | |
103 /* The Motif dialog box sets the keyboard focus to itself. When it | |
104 goes away we have to take care of getting the focus back | |
105 ourselves. */ | |
106 #ifdef EXTERNAL_WIDGET | |
107 /* #### Not sure if this special case is necessary. */ | |
108 if (!FRAME_X_EXTERNAL_WINDOW_P (f) && f) | |
109 #else | |
110 if (f) | |
111 #endif | |
112 lw_set_keyboard_focus (FRAME_X_SHELL_WIDGET (f), FRAME_X_TEXT_WIDGET (f)); | |
113 } | |
114 | |
442 | 115 static const Extbyte * const button_names [] = { |
428 | 116 "button1", "button2", "button3", "button4", "button5", |
117 "button6", "button7", "button8", "button9", "button10" }; | |
118 | |
119 static widget_value * | |
442 | 120 dbox_descriptor_to_widget_value (Lisp_Object keys) |
428 | 121 { |
122 /* This function can GC */ | |
123 int lbuttons = 0, rbuttons = 0; | |
124 int partition_seen = 0; | |
125 int text_field_p = 0; | |
126 int allow_text_p = 1; | |
127 widget_value *prev = 0, *kids = 0; | |
128 int n = 0; | |
853 | 129 int count; |
428 | 130 Lisp_Object wv_closure, gui_item; |
444 | 131 Lisp_Object question = Qnil; |
132 Lisp_Object title = Qnil; /* #### currently unused */ | |
133 Lisp_Object buttons = Qnil; | |
428 | 134 |
442 | 135 { |
136 EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) | |
137 { | |
138 if (EQ (key, Q_question)) | |
139 { | |
140 CHECK_STRING (value); | |
141 question = value; | |
142 } | |
143 else if (EQ (key, Q_title)) | |
144 { | |
145 CHECK_STRING (value); | |
146 title = value; | |
147 } | |
148 else if (EQ (key, Q_buttons)) | |
149 { | |
150 CHECK_LIST (value); | |
151 buttons = value; | |
152 } | |
153 else | |
563 | 154 invalid_constant ("Unrecognized question-dialog keyword", key); |
442 | 155 } |
156 } | |
157 | |
158 if (NILP (question)) | |
563 | 159 sferror ("Dialog descriptor provides no question", keys); |
428 | 160 |
161 /* Inhibit GC during this conversion. The reasons for this are | |
162 the same as in menu_item_descriptor_to_widget_value(); see | |
163 the large comment above that function. */ | |
164 | |
853 | 165 count = begin_gc_forbidden (); |
428 | 166 |
167 kids = prev = xmalloc_widget_value (); | |
168 | |
169 /* Also make sure that we free the partially-created widget_value | |
170 tree on Lisp error. */ | |
171 | |
172 wv_closure = make_opaque_ptr (kids); | |
173 record_unwind_protect (widget_value_unwind, wv_closure); | |
436 | 174 prev->name = xstrdup ("message"); |
442 | 175 LISP_STRING_TO_EXTERNAL_MALLOC (question, prev->value, Qlwlib_encoding); |
428 | 176 prev->enabled = 1; |
177 | |
442 | 178 { |
179 EXTERNAL_LIST_LOOP_2 (button, buttons) | |
180 { | |
181 widget_value *wv; | |
428 | 182 |
442 | 183 if (NILP (button)) |
184 { | |
185 if (partition_seen) | |
563 | 186 sferror ("More than one partition (nil) seen in dbox spec", |
442 | 187 keys); |
188 partition_seen = 1; | |
189 continue; | |
190 } | |
191 CHECK_VECTOR (button); | |
192 wv = xmalloc_widget_value (); | |
428 | 193 |
442 | 194 gui_item = gui_parse_item_keywords (button); |
195 if (!button_item_to_widget_value (Qdialog, | |
196 gui_item, wv, allow_text_p, 1, 0, 1)) | |
197 { | |
198 free_widget_value_tree (wv); | |
199 continue; | |
200 } | |
428 | 201 |
442 | 202 if (wv->type == TEXT_TYPE) |
203 { | |
204 text_field_p = 1; | |
205 allow_text_p = 0; /* only allow one */ | |
206 } | |
207 else /* it's a button */ | |
208 { | |
209 allow_text_p = 0; /* only allow text field at the front */ | |
210 if (wv->value) | |
211 xfree (wv->value); | |
212 wv->value = wv->name; /* what a mess... */ | |
213 wv->name = xstrdup (button_names [n]); | |
428 | 214 |
442 | 215 if (partition_seen) |
216 rbuttons++; | |
217 else | |
218 lbuttons++; | |
219 n++; | |
428 | 220 |
442 | 221 if (lbuttons > 9 || rbuttons > 9) |
563 | 222 sferror ("Too many buttons (9)", |
442 | 223 keys); /* #### this leaks */ |
224 } | |
428 | 225 |
442 | 226 prev->next = wv; |
227 prev = wv; | |
228 } | |
229 } | |
428 | 230 |
231 if (n == 0) | |
563 | 232 sferror ("Dialog boxes must have some buttons", keys); |
442 | 233 |
428 | 234 { |
442 | 235 Extbyte type = (text_field_p ? 'P' : 'Q'); |
236 static Extbyte tmp_dbox_name [255]; | |
237 | |
428 | 238 widget_value *dbox; |
239 sprintf (tmp_dbox_name, "%c%dBR%d", type, lbuttons + rbuttons, rbuttons); | |
240 dbox = xmalloc_widget_value (); | |
436 | 241 dbox->name = xstrdup (tmp_dbox_name); |
428 | 242 dbox->contents = kids; |
243 | |
244 /* No more need to free the half-filled-in structures. */ | |
245 set_opaque_ptr (wv_closure, 0); | |
771 | 246 unbind_to (count); |
428 | 247 return dbox; |
248 } | |
249 } | |
250 | |
442 | 251 static Lisp_Object |
252 x_make_dialog_box_internal (struct frame* f, Lisp_Object type, | |
253 Lisp_Object keys) | |
428 | 254 { |
255 int dbox_id; | |
256 widget_value *data; | |
257 Widget parent, dbox; | |
258 | |
442 | 259 if (!EQ (type, Qquestion)) |
563 | 260 signal_error (Qunimplemented, "Dialog box type", type); |
442 | 261 |
262 data = dbox_descriptor_to_widget_value (keys); | |
428 | 263 |
264 parent = FRAME_X_SHELL_WIDGET (f); | |
265 | |
266 dbox_id = new_lwlib_id (); | |
267 dbox = lw_create_widget (data->name, "dialog", dbox_id, data, parent, 1, 0, | |
268 dbox_selection_callback, 0); | |
269 lw_modify_all_widgets (dbox_id, data, True); | |
270 lw_modify_all_widgets (dbox_id, data->contents, True); | |
271 free_popup_widget_value_tree (data); | |
272 | |
273 gcpro_popup_callbacks (dbox_id); | |
274 | |
275 /* Setting zmacs-region-stays is necessary here because executing a | |
276 command from a dialog is really a two-command process: the first | |
277 command (bound to the button-click) simply pops up the dialog, | |
278 and returns. This causes a sequence of magic-events (destined | |
279 for the dialog widget) to begin. Eventually, a dialog item is | |
280 selected, and a misc-user-event blip is pushed onto the end of | |
281 the input stream, which is then executed by the event loop. | |
282 | |
283 So there are two command-events, with a bunch of magic-events | |
284 between them. We don't want the *first* command event to alter | |
285 the state of the region, so that the region can be available as | |
286 an argument for the second command. */ | |
287 if (zmacs_regions) | |
288 zmacs_region_stays = 1; | |
289 | |
290 popup_up_p++; | |
291 lw_pop_up_all_widgets (dbox_id); | |
442 | 292 |
293 /* #### this could (theoretically) cause problems if we are up for | |
294 a REALLY REALLY long time -- too big to fit into lisp integer. */ | |
295 return make_int (dbox_id); | |
428 | 296 } |
297 | |
298 void | |
299 syms_of_dialog_x (void) | |
300 { | |
301 } | |
302 | |
303 void | |
304 console_type_create_dialog_x (void) | |
305 { | |
442 | 306 CONSOLE_HAS_METHOD (x, make_dialog_box_internal); |
428 | 307 } |
308 | |
309 void | |
310 vars_of_dialog_x (void) | |
311 { | |
312 #if defined (LWLIB_DIALOGS_LUCID) | |
313 Fprovide (intern ("lucid-dialogs")); | |
314 #elif defined (LWLIB_DIALOGS_MOTIF) | |
315 Fprovide (intern ("motif-dialogs")); | |
316 #elif defined (LWLIB_DIALOGS_ATHENA) | |
317 Fprovide (intern ("athena-dialogs")); | |
318 #endif | |
319 } |