comparison src/event-Xt.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 e7ee5f8bde58
children 42375619fa45
comparison
equal deleted inserted replaced
852:d83885ef293b 853:2b6fa2618f76
843 MappingNotify is automatically handled by Xt, so it isn't passed 843 MappingNotify is automatically handled by Xt, so it isn't passed
844 to event handlers and you don't need to worry about it. 844 to event handlers and you don't need to worry about it.
845 845
846 Of course, we DO worry about it, so we need a special translation. */ 846 Of course, we DO worry about it, so we need a special translation. */
847 void 847 void
848 emacs_Xt_mapping_action (Widget w, XEvent* event) 848 emacs_Xt_mapping_action (Widget w, XEvent *event)
849 { 849 {
850 struct device *d = get_device_from_display (event->xany.display); 850 struct device *d = get_device_from_display (event->xany.display);
851 851
852 if (DEVICE_X_BEING_DELETED (d)) 852 if (DEVICE_X_BEING_DELETED (d))
853 return; 853 return;
1600 well just get deleted next andthen we have lost the focus until the 1600 well just get deleted next andthen we have lost the focus until the
1601 user does something. So handle_focus_event_1 records the widget 1601 user does something. So handle_focus_event_1 records the widget
1602 with keyboard focus when FocusOut is processed, and then, when a 1602 with keyboard focus when FocusOut is processed, and then, when a
1603 widget gets unmapped, it calls this function to restore focus if 1603 widget gets unmapped, it calls this function to restore focus if
1604 appropriate. */ 1604 appropriate. */
1605 void emacs_Xt_handle_widget_losing_focus (struct frame* f, Widget losing_widget); 1605 void emacs_Xt_handle_widget_losing_focus (struct frame *f, Widget losing_widget);
1606 void 1606 void
1607 emacs_Xt_handle_widget_losing_focus (struct frame* f, Widget losing_widget) 1607 emacs_Xt_handle_widget_losing_focus (struct frame *f, Widget losing_widget)
1608 { 1608 {
1609 if (losing_widget == widget_with_focus) 1609 if (losing_widget == widget_with_focus)
1610 { 1610 {
1611 handle_focus_event_1 (f, 1); 1611 handle_focus_event_1 (f, 1);
1612 } 1612 }
1843 mouse. This seems to indicate that dispatch-non-command-events is 1843 mouse. This seems to indicate that dispatch-non-command-events is
1844 blocking. It may be that in a SIGIO world forcing SIGIO processing 1844 blocking. It may be that in a SIGIO world forcing SIGIO processing
1845 does the wrong thing. 1845 does the wrong thing.
1846 */ 1846 */
1847 static void 1847 static void
1848 emacs_Xt_force_event_pending (struct frame* f) 1848 emacs_Xt_force_event_pending (struct frame *f)
1849 { 1849 {
1850 XEvent event; 1850 XEvent event;
1851 1851
1852 Display* dpy = DEVICE_X_DISPLAY (XDEVICE (FRAME_DEVICE (f))); 1852 Display *dpy = DEVICE_X_DISPLAY (XDEVICE (FRAME_DEVICE (f)));
1853 event.xclient.type = ClientMessage; 1853 event.xclient.type = ClientMessage;
1854 event.xclient.display = dpy; 1854 event.xclient.display = dpy;
1855 event.xclient.message_type = XInternAtom (dpy, "BumpQueue", False); 1855 event.xclient.message_type = XInternAtom (dpy, "BumpQueue", False);
1856 event.xclient.format = 32; 1856 event.xclient.format = 32;
1857 event.xclient.window = 0; 1857 event.xclient.window = 0;
2307 xfree (closure); 2307 xfree (closure);
2308 filedesc_to_what_closure[fd] = 0; 2308 filedesc_to_what_closure[fd] = 0;
2309 } 2309 }
2310 2310
2311 static void 2311 static void
2312 emacs_Xt_select_process (Lisp_Process *p) 2312 emacs_Xt_select_process (Lisp_Process *process, int doin, int doerr)
2313 { 2313 {
2314 Lisp_Object process; 2314 Lisp_Object proc;
2315 int infd = event_stream_unixoid_select_process (p); 2315 int infd, errfd;
2316 2316
2317 process = wrap_process (p); 2317 event_stream_unixoid_select_process (process, doin, doerr, &infd, &errfd);
2318 select_filedesc (infd, process); 2318
2319 } 2319 proc = wrap_process (process);
2320 2320 if (doin)
2321 static void 2321 select_filedesc (infd, proc);
2322 emacs_Xt_unselect_process (Lisp_Process *p) 2322 if (doerr)
2323 { 2323 select_filedesc (errfd, proc);
2324 int infd = event_stream_unixoid_unselect_process (p); 2324 }
2325 2325
2326 unselect_filedesc (infd); 2326 static void
2327 } 2327 emacs_Xt_unselect_process (Lisp_Process *process, int doin, int doerr)
2328 2328 {
2329 static USID 2329 int infd, errfd;
2330 emacs_Xt_create_stream_pair (void* inhandle, void* outhandle, 2330
2331 Lisp_Object* instream, Lisp_Object* outstream, int flags) 2331 event_stream_unixoid_unselect_process (process, doin, doerr, &infd, &errfd);
2332 { 2332
2333 USID u = event_stream_unixoid_create_stream_pair 2333 if (doin)
2334 (inhandle, outhandle, instream, outstream, flags); 2334 unselect_filedesc (infd);
2335 if (u != USID_ERROR) 2335 if (doerr)
2336 u = USID_DONTHASH; 2336 unselect_filedesc (errfd);
2337 return u; 2337 }
2338 } 2338
2339 2339 static void
2340 static USID 2340 emacs_Xt_create_io_streams (void *inhandle, void *outhandle,
2341 emacs_Xt_delete_stream_pair (Lisp_Object instream, Lisp_Object outstream) 2341 void *errhandle, Lisp_Object *instream,
2342 { 2342 Lisp_Object *outstream,
2343 event_stream_unixoid_delete_stream_pair (instream, outstream); 2343 Lisp_Object *errstream,
2344 return USID_DONTHASH; 2344 USID *in_usid,
2345 USID *err_usid,
2346 int flags)
2347 {
2348 event_stream_unixoid_create_io_streams
2349 (inhandle, outhandle, errhandle, instream, outstream,
2350 errstream, in_usid, err_usid, flags);
2351 if (*in_usid != USID_ERROR)
2352 *in_usid = USID_DONTHASH;
2353 if (*err_usid != USID_ERROR)
2354 *err_usid = USID_DONTHASH;
2355 }
2356
2357 static void
2358 emacs_Xt_delete_io_streams (Lisp_Object instream,
2359 Lisp_Object outstream,
2360 Lisp_Object errstream,
2361 USID *in_usid,
2362 USID *err_usid)
2363 {
2364 event_stream_unixoid_delete_io_streams
2365 (instream, outstream, errstream, in_usid, err_usid);
2366 *in_usid = USID_DONTHASH;
2367 *err_usid = USID_DONTHASH;
2345 } 2368 }
2346 2369
2347 /* This is called from GC when a process object is about to be freed. 2370 /* This is called from GC when a process object is about to be freed.
2348 If we've still got pointers to it in this file, we're gonna lose hard. 2371 If we've still got pointers to it in this file, we're gonna lose hard.
2349 */ 2372 */
2350 void 2373 void
2351 debug_process_finalization (Lisp_Process *p) 2374 debug_process_finalization (Lisp_Process *p)
2352 { 2375 {
2353 #if 0 /* #### */ 2376 #if 0 /* #### */
2354 int i; 2377 int i;
2355 Lisp_Object instr, outstr; 2378 Lisp_Object instr, outstr, errstr;
2356 2379
2357 get_process_streams (p, &instr, &outstr); 2380 get_process_streams (p, &instr, &outstr, &errstr);
2358 /* if it still has fds, then it hasn't been killed yet. */ 2381 /* if it still has fds, then it hasn't been killed yet. */
2359 assert (NILP(instr)); 2382 assert (NILP(instr));
2360 assert (NILP(outstr)); 2383 assert (NILP(outstr));
2384 assert (NILP(errstr));
2361 /* Better not still be in the "with input" table; we know it's got no fds. */ 2385 /* Better not still be in the "with input" table; we know it's got no fds. */
2362 for (i = 0; i < MAXDESC; i++) 2386 for (i = 0; i < MAXDESC; i++)
2363 { 2387 {
2364 Lisp_Object process = filedesc_fds_with_input [i]; 2388 Lisp_Object process = filedesc_fds_with_input [i];
2365 assert (!PROCESSP (process) || XPROCESS (process) != p); 2389 assert (!PROCESSP (process) || XPROCESS (process) != p);
3271 emacs_Xt_event_widget_focus_in (Widget w, 3295 emacs_Xt_event_widget_focus_in (Widget w,
3272 XEvent *event, 3296 XEvent *event,
3273 String *params, 3297 String *params,
3274 Cardinal *num_params) 3298 Cardinal *num_params)
3275 { 3299 {
3276 struct frame* f = 3300 struct frame *f =
3277 x_any_widget_or_parent_to_frame (get_device_from_display (event->xany.display), w); 3301 x_any_widget_or_parent_to_frame (get_device_from_display (event->xany.display), w);
3278 3302
3279 XtSetKeyboardFocus (FRAME_X_SHELL_WIDGET (f), w); 3303 XtSetKeyboardFocus (FRAME_X_SHELL_WIDGET (f), w);
3280 } 3304 }
3281 3305
3328 Xt_event_stream->select_console_cb = emacs_Xt_select_console; 3352 Xt_event_stream->select_console_cb = emacs_Xt_select_console;
3329 Xt_event_stream->unselect_console_cb = emacs_Xt_unselect_console; 3353 Xt_event_stream->unselect_console_cb = emacs_Xt_unselect_console;
3330 Xt_event_stream->select_process_cb = emacs_Xt_select_process; 3354 Xt_event_stream->select_process_cb = emacs_Xt_select_process;
3331 Xt_event_stream->unselect_process_cb = emacs_Xt_unselect_process; 3355 Xt_event_stream->unselect_process_cb = emacs_Xt_unselect_process;
3332 Xt_event_stream->quit_p_cb = emacs_Xt_quit_p; 3356 Xt_event_stream->quit_p_cb = emacs_Xt_quit_p;
3333 Xt_event_stream->create_stream_pair_cb = emacs_Xt_create_stream_pair; 3357 Xt_event_stream->create_io_streams_cb = emacs_Xt_create_io_streams;
3334 Xt_event_stream->delete_stream_pair_cb = emacs_Xt_delete_stream_pair; 3358 Xt_event_stream->delete_io_streams_cb = emacs_Xt_delete_io_streams;
3335 Xt_event_stream->current_event_timestamp_cb = 3359 Xt_event_stream->current_event_timestamp_cb =
3336 emacs_Xt_current_event_timestamp; 3360 emacs_Xt_current_event_timestamp;
3337 3361
3338 the_Xt_timeout_blocktype = Blocktype_new (struct Xt_timeout_blocktype); 3362 the_Xt_timeout_blocktype = Blocktype_new (struct Xt_timeout_blocktype);
3339 3363