Mercurial > hg > xemacs-beta
comparison src/gutter.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 | 2b676dc88c66 |
children | 79c6ff3eef26 |
comparison
equal
deleted
inserted
replaced
852:d83885ef293b | 853:2b6fa2618f76 |
---|---|
688 void | 688 void |
689 redraw_exposed_gutters (struct frame *f, int x, int y, int width, | 689 redraw_exposed_gutters (struct frame *f, int x, int y, int width, |
690 int height) | 690 int height) |
691 { | 691 { |
692 enum gutter_pos pos; | 692 enum gutter_pos pos; |
693 int depth; | |
693 | 694 |
694 /* We have to be "in display" when we output the gutter - make it | 695 /* We have to be "in display" when we output the gutter - make it |
695 so. */ | 696 so. */ |
696 hold_frame_size_changes (); | 697 depth = enter_redisplay_critical_section (); |
697 GUTTER_POS_LOOP (pos) | 698 GUTTER_POS_LOOP (pos) |
698 { | 699 { |
699 if (FRAME_GUTTER_VISIBLE (f, pos)) | 700 if (FRAME_GUTTER_VISIBLE (f, pos)) |
700 redraw_exposed_gutter (f, pos, x, y, width, height); | 701 redraw_exposed_gutter (f, pos, x, y, width, height); |
701 } | 702 } |
702 unhold_one_frame_size_changes (f); | 703 exit_redisplay_critical_section (depth); |
703 } | 704 } |
704 | 705 |
705 void | 706 void |
706 free_frame_gutters (struct frame *f) | 707 free_frame_gutters (struct frame *f) |
707 { | 708 { |
743 enum gutter_pos cur = decode_gutter_position (Vdefault_gutter_position); | 744 enum gutter_pos cur = decode_gutter_position (Vdefault_gutter_position); |
744 enum gutter_pos new = decode_gutter_position (position); | 745 enum gutter_pos new = decode_gutter_position (position); |
745 | 746 |
746 if (cur != new) | 747 if (cur != new) |
747 { | 748 { |
749 int depth; | |
750 | |
748 /* The following calls will automatically cause the dirty | 751 /* The following calls will automatically cause the dirty |
749 flags to be set; we delay frame size changes to avoid | 752 flags to be set; we delay frame size changes to avoid |
750 lots of frame flickering. */ | 753 lots of frame flickering. */ |
751 /* #### I think this should be GC protected. -sb */ | 754 /* #### I think this should be GC protected. -sb */ |
752 hold_frame_size_changes (); | 755 depth = enter_redisplay_critical_section (); |
753 set_specifier_fallback (Vgutter[cur], list1 (Fcons (Qnil, Qnil))); | 756 set_specifier_fallback (Vgutter[cur], list1 (Fcons (Qnil, Qnil))); |
754 set_specifier_fallback (Vgutter[new], Vdefault_gutter); | 757 set_specifier_fallback (Vgutter[new], Vdefault_gutter); |
755 set_specifier_fallback (Vgutter_size[cur], list1 (Fcons (Qnil, Qzero))); | 758 set_specifier_fallback (Vgutter_size[cur], list1 (Fcons (Qnil, Qzero))); |
756 set_specifier_fallback (Vgutter_size[new], | 759 set_specifier_fallback (Vgutter_size[new], |
757 new == TOP_GUTTER || new == BOTTOM_GUTTER | 760 new == TOP_GUTTER || new == BOTTOM_GUTTER |
763 Vdefault_gutter_border_width); | 766 Vdefault_gutter_border_width); |
764 set_specifier_fallback (Vgutter_visible_p[cur], list1 (Fcons (Qnil, Qt))); | 767 set_specifier_fallback (Vgutter_visible_p[cur], list1 (Fcons (Qnil, Qt))); |
765 set_specifier_fallback (Vgutter_visible_p[new], Vdefault_gutter_visible_p); | 768 set_specifier_fallback (Vgutter_visible_p[new], Vdefault_gutter_visible_p); |
766 | 769 |
767 Vdefault_gutter_position = position; | 770 Vdefault_gutter_position = position; |
768 unhold_frame_size_changes (); | 771 exit_redisplay_critical_section (depth); |
769 } | 772 } |
770 | 773 |
771 run_hook (Qdefault_gutter_position_changed_hook); | 774 run_hook (Qdefault_gutter_position_changed_hook); |
772 | 775 |
773 return position; | 776 return position; |
1077 | 1080 |
1078 if (f->windows_structure_changed) | 1081 if (f->windows_structure_changed) |
1079 redisplay_frame (f, 1); | 1082 redisplay_frame (f, 1); |
1080 else if (FRAME_REPAINT_P (f)) | 1083 else if (FRAME_REPAINT_P (f)) |
1081 { | 1084 { |
1085 int depth; | |
1086 | |
1082 /* We have to be "in display" when we output the gutter | 1087 /* We have to be "in display" when we output the gutter |
1083 - make it so. */ | 1088 - make it so. */ |
1084 hold_frame_size_changes (); | 1089 depth = enter_redisplay_critical_section (); |
1085 update_frame_gutters (f); | 1090 update_frame_gutters (f); |
1086 unhold_one_frame_size_changes (f); | 1091 exit_redisplay_critical_section (depth); |
1087 } | 1092 } |
1088 | 1093 |
1089 MAYBE_DEVMETH (d, frame_output_end, (f)); | 1094 MAYBE_DEVMETH (d, frame_output_end, (f)); |
1090 } | 1095 } |
1091 | 1096 |