comparison src/cmdloop.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 a5954632b187
children 79c6ff3eef26
comparison
equal deleted inserted replaced
852:d83885ef293b 853:2b6fa2618f76
1 /* Editor command loop. 1 /* Editor command loop.
2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995, 1996, 2001 Ben Wing. 3 Copyright (C) 1995, 1996, 2001, 2002 Ben Wing.
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
283 /* First deal with startup and command-line arguments. A throw 283 /* First deal with startup and command-line arguments. A throw
284 to 'top-level gets us back here directly (does this ever happen?). 284 to 'top-level gets us back here directly (does this ever happen?).
285 Otherwise, this function will return normally when all command- 285 Otherwise, this function will return normally when all command-
286 line arguments have been processed, the user's initialization 286 line arguments have been processed, the user's initialization
287 file has been read in, and the first frame has been created. */ 287 file has been read in, and the first frame has been created. */
288 internal_catch (Qtop_level, top_level_1, Qnil, 0); 288 internal_catch (Qtop_level, top_level_1, Qnil, 0, 0);
289 289
290 /* If an error occurred during startup and the initial console 290 /* If an error occurred during startup and the initial console
291 wasn't created, then die now (the error was already printed out 291 wasn't created, then die now (the error was already printed out
292 on the terminal device). */ 292 on the terminal device). */
293 if (!noninteractive && 293 if (!noninteractive &&
303 { 303 {
304 command_loop_level = 0; 304 command_loop_level = 0;
305 MARK_MODELINE_CHANGED; 305 MARK_MODELINE_CHANGED;
306 /* Now invoke the command loop. It never returns; however, a 306 /* Now invoke the command loop. It never returns; however, a
307 throw to 'top-level will place us at the end of this loop. */ 307 throw to 'top-level will place us at the end of this loop. */
308 internal_catch (Qtop_level, command_loop_2, Qnil, 0); 308 internal_catch (Qtop_level, command_loop_2, Qnil, 0, 0);
309 /* #### wrong with selected-console? */ 309 /* #### wrong with selected-console? */
310 /* We don't actually call clear_echo_area() here, partially 310 /* We don't actually call clear_echo_area() here, partially
311 at least because that runs Lisp code and it may be unsafe 311 at least because that runs Lisp code and it may be unsafe
312 to do so -- we are outside of the normal catches for 312 to do so -- we are outside of the normal catches for
313 errors and such. */ 313 errors and such. */
366 : Qnil)); 366 : Qnil));
367 367
368 specbind (Qstandard_output, Qt); 368 specbind (Qstandard_output, Qt);
369 specbind (Qstandard_input, Qt); 369 specbind (Qstandard_input, Qt);
370 370
371 val = internal_catch (Qexit, command_loop_2, Qnil, 0); 371 val = internal_catch (Qexit, command_loop_2, Qnil, 0, 0);
372 372
373 if (EQ (val, Qt)) 373 if (EQ (val, Qt))
374 /* Turn abort-recursive-edit into a quit. */ 374 /* Turn abort-recursive-edit into a quit. */
375 Fsignal (Qquit, Qnil); 375 Fsignal (Qquit, Qnil);
376 376
434 XCONSOLE (Vselected_console)->prefix_arg = Qnil; 434 XCONSOLE (Vselected_console)->prefix_arg = Qnil;
435 if (NILP (catch_errors)) 435 if (NILP (catch_errors))
436 Fcommand_loop_1 (); 436 Fcommand_loop_1 ();
437 else 437 else
438 internal_catch (Qtop_level, 438 internal_catch (Qtop_level,
439 cold_load_command_loop, Qnil, 0); 439 cold_load_command_loop, Qnil, 0, 0);
440 goto loop; 440 goto loop;
441 return Qnil; 441 return Qnil;
442 } 442 }
443 443
444 static Lisp_Object 444 static Lisp_Object
568 /* Bind dont_check_for_quit to 1 so that C-g gets read in 568 /* Bind dont_check_for_quit to 1 so that C-g gets read in
569 rather than quitting back to the minibuffer. */ 569 rather than quitting back to the minibuffer. */
570 int count = begin_dont_check_for_quit (); 570 int count = begin_dont_check_for_quit ();
571 Fsit_for (make_int (2), Qnil); 571 Fsit_for (make_int (2), Qnil);
572 clear_echo_area (selected_frame (), Qnil, 0); 572 clear_echo_area (selected_frame (), Qnil, 0);
573 Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */
573 unbind_to (count); 574 unbind_to (count);
574 } 575 }
575 576
576 Fnext_event (event, Qnil); 577 Fnext_event (event, Qnil);
577 /* If ^G was typed while emacs was reading input from the user, then
578 Fnext_event() will have read it as a normal event and
579 next_event_internal() will have set Vquit_flag. We reset this
580 so that the ^G is treated as just another key. This is strange,
581 but it is what emacs 18 did.
582
583 Do not call check_quit() here. */
584 Vquit_flag = Qnil;
585 Fdispatch_event (event); 578 Fdispatch_event (event);
586 579
587 if (!was_locked) 580 if (!was_locked)
588 any_console_state (); 581 any_console_state ();
589 #if (defined (_MSC_VER) \ 582 #if (defined (_MSC_VER) \