comparison src/frame.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 42375619fa45
comparison
equal deleted inserted replaced
852:d83885ef293b 853:2b6fa2618f76
218 f->subwindow_exposures = 0; 218 f->subwindow_exposures = 0;
219 f->subwindow_exposures_tail = 0; 219 f->subwindow_exposures_tail = 0;
220 220
221 FRAME_SET_PAGENUMBER (f, 1); 221 FRAME_SET_PAGENUMBER (f, 1);
222 222
223 note_object_created (root_window);
224
223 /* Choose a buffer for the frame's root window. */ 225 /* Choose a buffer for the frame's root window. */
224 XWINDOW (root_window)->buffer = Qt; 226 XWINDOW (root_window)->buffer = Qt;
225 { 227 {
226 Lisp_Object buf; 228 Lisp_Object buf;
227 229
248 XWINDOW (mini_window)->prev = f->root_window; 250 XWINDOW (mini_window)->prev = f->root_window;
249 XWINDOW (mini_window)->mini_p = Qt; 251 XWINDOW (mini_window)->mini_p = Qt;
250 XWINDOW (mini_window)->frame = frame; 252 XWINDOW (mini_window)->frame = frame;
251 f->minibuffer_window = mini_window; 253 f->minibuffer_window = mini_window;
252 f->has_minibuffer = 1; 254 f->has_minibuffer = 1;
255
256 note_object_created (mini_window);
253 257
254 XWINDOW (mini_window)->buffer = Qt; 258 XWINDOW (mini_window)->buffer = Qt;
255 Fset_window_buffer (mini_window, Vminibuffer_zero, Qt); 259 Fset_window_buffer (mini_window, Vminibuffer_zero, Qt);
256 } 260 }
257 261
471 DEVICE_FRAME_LIST (d) = nconc2 (DEVICE_FRAME_LIST (d), Fcons (frame, Qnil)); 475 DEVICE_FRAME_LIST (d) = nconc2 (DEVICE_FRAME_LIST (d), Fcons (frame, Qnil));
472 #endif 476 #endif
473 DEVICE_FRAME_LIST (d) = Fcons (frame, DEVICE_FRAME_LIST (d)); 477 DEVICE_FRAME_LIST (d) = Fcons (frame, DEVICE_FRAME_LIST (d));
474 RESET_CHANGED_SET_FLAGS; 478 RESET_CHANGED_SET_FLAGS;
475 479
480 note_object_created (frame);
481
476 /* Now make sure that the initial cached values are set correctly. 482 /* Now make sure that the initial cached values are set correctly.
477 Do this after the init_frame method is called because that may 483 Do this after the init_frame method is called because that may
478 do things (e.g. create widgets) that are necessary for the 484 do things (e.g. create widgets) that are necessary for the
479 specifier value-changed methods to work OK. */ 485 specifier value-changed methods to work OK. */
480 recompute_all_cached_specifiers_in_frame (f); 486 recompute_all_cached_specifiers_in_frame (f);
596 cdf = DEVICE_SELECTED_FRAME (decode_device (cdf)); 602 cdf = DEVICE_SELECTED_FRAME (decode_device (cdf));
597 return decode_frame (cdf); 603 return decode_frame (cdf);
598 } 604 }
599 605
600 606
607 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
608
609 static Lisp_Object
610 commit_ritual_suicide (Lisp_Object ceci_nest_pas_une_pipe)
611 {
612 assert (!in_display);
613 return Qnil;
614 }
615
616 #endif
617
601 /* 618 /*
602 * window size changes are held up during critical regions. Afterwards, 619 * window size changes are held up during critical regions. Afterwards,
603 * we want to deal with any delayed changes. 620 * we want to deal with any delayed changes.
604 */ 621 */
622 int
623 enter_redisplay_critical_section (void)
624 {
625 int depth = specpdl_depth ();
626
627 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
628 /* force every call to QUIT to check for in_displayness */
629 something_happened++;
630 record_unwind_protect (commit_ritual_suicide, Qnil);
631 #endif
632 in_display = 1;
633
634 return depth;
635 }
636
605 void 637 void
606 hold_frame_size_changes (void) 638 exit_redisplay_critical_section (int depth)
607 { 639 {
608 in_display = 1; 640 Lisp_Object frmcons, devcons, concons;
609 } 641
610
611 void
612 unhold_one_frame_size_changes (struct frame *f)
613 {
614 in_display = 0; 642 in_display = 0;
615 643
616 if (f->size_change_pending) 644 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
617 change_frame_size (f, f->new_height, f->new_width, 0); 645 unbind_to (depth);
618 } 646 something_happened--;
619 647 #endif
620 void 648
621 unhold_frame_size_changes (void) 649 /* we used to have a function to do this for only one frame, and
622 { 650 it was typical to call it at the end of a critical section
623 Lisp_Object frmcons, devcons, concons; 651 (which occurs once per frame); but what then happens if multiple
624 652 frames have frame changes held up?
653
654 this means we are O(N^2) over frames. i seriously doubt it matters.
655 --ben */
625 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) 656 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
626 unhold_one_frame_size_changes (XFRAME (XCAR (frmcons))); 657 {
658 struct frame *f = XFRAME (XCAR (frmcons));
659 if (f->size_change_pending)
660 change_frame_size (f, f->new_height, f->new_width, 0);
661 }
627 } 662 }
628 663
629 void 664 void
630 invalidate_vertical_divider_cache_in_frame (struct frame *f) 665 invalidate_vertical_divider_cache_in_frame (struct frame *f)
631 { 666 {
668 keep_char_size = 1; 703 keep_char_size = 1;
669 else if (EQ (Vadjust_frame_function, Qt)) 704 else if (EQ (Vadjust_frame_function, Qt))
670 keep_char_size = 0; 705 keep_char_size = 0;
671 else 706 else
672 keep_char_size = 707 keep_char_size =
673 NILP (call1_trapping_errors ("Error in adjust-frame-function", 708 NILP (call1_trapping_problems ("Error in adjust-frame-function",
674 Vadjust_frame_function, frame)); 709 Vadjust_frame_function, frame,
710 0));
675 711
676 if (keep_char_size) 712 if (keep_char_size)
677 Fset_frame_size (frame, make_int (FRAME_CHARWIDTH(f)), 713 Fset_frame_size (frame, make_int (FRAME_CHARWIDTH(f)),
678 make_int (FRAME_CHARHEIGHT(f)), Qnil); 714 make_int (FRAME_CHARHEIGHT(f)), Qnil);
679 } 715 }
1315 Lisp_Object device; 1351 Lisp_Object device;
1316 Lisp_Object console; 1352 Lisp_Object console;
1317 struct gcpro gcpro1; 1353 struct gcpro gcpro1;
1318 1354
1319 /* OK to delete an already deleted frame. */ 1355 /* OK to delete an already deleted frame. */
1320 if (! FRAME_LIVE_P (f)) 1356 if (!FRAME_LIVE_P (f))
1321 return; 1357 return;
1322 1358
1323 frame = wrap_frame (f); 1359 frame = wrap_frame (f);
1360
1361 if (!force)
1362 check_allowed_operation (OPERATION_DELETE_OBJECT, frame, Qnil);
1363
1324 GCPRO1 (frame); 1364 GCPRO1 (frame);
1325 1365
1326 device = FRAME_DEVICE (f); 1366 device = FRAME_DEVICE (f);
1327 d = XDEVICE (device); 1367 d = XDEVICE (device);
1328 console = DEVICE_CONSOLE (d); 1368 console = DEVICE_CONSOLE (d);
1573 RESET_CHANGED_SET_FLAGS; 1613 RESET_CHANGED_SET_FLAGS;
1574 1614
1575 f->visible = 0; 1615 f->visible = 0;
1576 1616
1577 free_window_mirror (XWINDOW_MIRROR (f->root_mirror)); 1617 free_window_mirror (XWINDOW_MIRROR (f->root_mirror));
1618
1578 /* free_line_insertion_deletion_costs (f); */ 1619 /* free_line_insertion_deletion_costs (f); */
1579 1620
1580 /* If we've deleted the last non-minibuf frame, then try to find 1621 /* If we've deleted the last non-minibuf frame, then try to find
1581 another one. */ 1622 another one. */
1582 if (EQ (frame, CONSOLE_LAST_NONMINIBUF_FRAME (con))) 1623 if (EQ (frame, CONSOLE_LAST_NONMINIBUF_FRAME (con)))
1667 other structs in case someone tries to access something through 1708 other structs in case someone tries to access something through
1668 them. */ 1709 them. */
1669 1710
1670 nuke_all_frame_slots (f); 1711 nuke_all_frame_slots (f);
1671 f->framemeths = dead_console_methods; 1712 f->framemeths = dead_console_methods;
1713
1714 note_object_deleted (frame);
1672 1715
1673 UNGCPRO; 1716 UNGCPRO;
1674 } 1717 }
1675 1718
1676 void 1719 void