Mercurial > hg > xemacs-beta
annotate src/dialog-x.c @ 853:2b6fa2618f76
[xemacs-hg @ 2002-05-28 08:44:22 by ben]
merge my stderr-proc ws
make-docfile.c: Fix places where we forget to check for EOF.
code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and
friends work both ways but Cygwin programs don't like the CRs.
code-process.el, multicast.el, process.el: Removed.
Improvements to call-process-internal:
-- allows a buffer to be specified for input and stderr output
-- use it on all systems
-- implement C-g as documented
-- clean up and comment
call-process-region uses new call-process facilities; no temp file.
remove duplicate funs in process.el.
comment exactly how coding systems work and fix various problems.
open-multicast-group now does similar coding-system frobbing to
open-network-stream.
dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time.
xemacs.mak: Add -DSTRICT.
================================================================
ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
================================================================
Standard output and standard error can be processed separately in
a process. Each can have its own buffer, its own mark in that buffer,
and its filter function. You can specify a separate buffer for stderr
in `start-process' to get things started, or use the new primitives:
set-process-stderr-buffer
process-stderr-buffer
process-stderr-mark
set-process-stderr-filter
process-stderr-filter
Also, process-send-region takes a 4th optional arg, a buffer.
Currently always uses a pipe() under Unix to read the error output.
(#### Would a PTY be better?)
sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c.
wait_for_termination() now only needed on a few really old systems.
console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for
error input. Create Lstreams for reading in the error channel.
Many process methods need change. In general the changes are
fairly clear as they involve duplicating what's used for reading
the normal stdout and changing for stderr -- although tedious,
as such changes are required throughout the entire process code.
Rewrote the code that reads process output to do two loops, one
for stdout and one for stderr.
gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr.
================================================================
NEW ERROR-TRAPPING MECHANISM
================================================================
Totally rewrite error trapping code to be unified and support more
features. Basic function is call_trapping_problems(), which lets
you specify, by means of flags, what sorts of problems you want
trapped. these can include
-- quit
-- errors
-- throws past the function
-- creation of "display objects" (e.g. buffers)
-- deletion of already-existing "display objects" (e.g. buffers)
-- modification of already-existing buffers
-- entering the debugger
-- gc
-- errors->warnings (ala suspended errors)
etc. All other error funs rewritten in terms of this one.
Various older mechanisms removed or rewritten.
window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to
note_object_created(), for use with trapping_problems mechanism.
When deleting, call check_allowed_operation() and note_object
deleted().
The trapping-problems code records the objects created since the
call-trapping-problems began. Those objects can be deleted, but
none others (i.e. previously existing ones).
bytecode.c, cmdloop.c: internal_catch takes another arg.
eval.c: Add long comments describing the "five lists" used to maintain
state (backtrace, gcpro, specbind, etc.) in the Lisp engine.
backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or
redo in terms of new one.
frame.c, gutter.c: Flush out the concept of "critical display section", defined by
the in_display() var. Use an internal_bind() to get it reset,
rather than just doing it at end, because there may be a non-local
exit.
event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on
old mechanisms.
glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay.
insdel.c: Protect hooks against deleting existing buffers.
frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers.
Otherwise we run into stickiness in redisplay because
internal_equal() can QUIT.
================================================================
SIGNAL, C-G CHANGES
================================================================
Here we change the way that C-g interacts with event reading. The
idea is that a C-g occurring while we're reading a user event
should be read as C-g, but elsewhere should be a QUIT. The former
code did all sorts of bizarreness -- requiring that no QUIT occurs
anywhere in event-reading code (impossible to enforce given the
stuff called or Lisp code invoked), and having some weird system
involving enqueue/dequeue of a C-g and interaction with Vquit_flag
-- and it didn't work.
Now, we simply enclose all code where we want C-g read as an event
with {begin/end}_dont_check_for_quit(). This completely turns off
the mechanism that checks (and may remove or alter) C-g in the
read-ahead queues, so we just get the C-g normal.
Signal.c documents this very carefully.
cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old
out-of-date comments.
event-stream.c: Fix C-g handling to actually work.
device-x.c: Disable quit checking when err out.
signal.c: Cleanup. Add large descriptive comment.
process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT.
It's not necessary to use REALLY_QUIT and just confuses the issue.
lisp.h: Comment quit handlers.
================================================================
CONS CHANGES
================================================================
free_cons() now takes a Lisp_Object not the result of XCONS().
car and cdr have been renamed so that they don't get used directly;
go through XCAR(), XCDR() instead.
alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object,
not Lisp_Cons
chartab.c: Eliminate direct use of ->car, ->cdr, should be black box.
callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
================================================================
USE INTERNAL-BIND-*
================================================================
eval.c: Cleanups of these funs.
alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object()
in place of whatever varied and cumbersome mechanisms were
formerly there.
================================================================
SPECBIND SANITY
================================================================
backtrace.h: - Improved comments
backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity
checking code each time the catchlist or specbind stack change.
Removed older prototype of same mechanism.
================================================================
MISC
================================================================
lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship.
device-msw.c: Correct bad Unicode-ization.
print.c: Be more careful when not initialized or in fatal error handling.
search.c: Eliminate running_asynch_code, an FSF holdover.
alloc.c: Added comments about gc-cons-threshold.
dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value
tree, like in menubar-x.c.
gui.c: Use Qunbound not Qnil as the default for
gethash.
lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP().
lisp.h: Use ERROR_CHECK_STRUCTURES to turn on
ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK
lisp.h: Add assert_with_message.
lisp.h: Add macros for gcproing entire arrays. (You could do this before
but it required manual twiddling the gcpro structure.)
lisp.h: Add prototypes for new functions defined elsewhere.
author | ben |
---|---|
date | Tue, 28 May 2002 08:45:36 +0000 |
parents | 6728e641994e |
children | 79c6ff3eef26 |
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 "console-x.h" | |
31 #include "EmacsFrame.h" | |
32 #include "gui-x.h" | |
33 | |
34 #include "buffer.h" | |
35 #include "commands.h" /* zmacs_regions */ | |
36 #include "events.h" | |
37 #include "frame.h" | |
38 #include "gui.h" | |
39 #include "opaque.h" | |
40 #include "window.h" | |
41 | |
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 } |