Mercurial > hg > xemacs-beta
comparison src/device-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 | e7ee5f8bde58 |
children | 804517e16990 |
comparison
equal
deleted
inserted
replaced
852:d83885ef293b | 853:2b6fa2618f76 |
---|---|
136 # define FALLBACK_RESOURCE_NAME "xemacs" | 136 # define FALLBACK_RESOURCE_NAME "xemacs" |
137 # else | 137 # else |
138 # define FALLBACK_RESOURCE_NAME "infodock" | 138 # define FALLBACK_RESOURCE_NAME "infodock" |
139 #endif | 139 #endif |
140 | 140 |
141 if (!d) { | 141 if (!d) |
142 /* This isn't one of our displays. Let's crash? */ | 142 { |
143 stderr_out | 143 /* This isn't one of our displays. Let's crash? */ |
144 ("\n%s: Fatal X Condition. Asked about display we don't own: \"%s\"\n", | 144 stderr_out |
145 (STRINGP (Vinvocation_name) ? | 145 ("\n%s: Fatal X Condition. Asked about display we don't own: \"%s\"\n", |
146 (char *) XSTRING_DATA (Vinvocation_name) : FALLBACK_RESOURCE_NAME), | 146 (STRINGP (Vinvocation_name) ? |
147 DisplayString (dpy) ? DisplayString (dpy) : "???"); | 147 (char *) XSTRING_DATA (Vinvocation_name) : FALLBACK_RESOURCE_NAME), |
148 abort(); | 148 DisplayString (dpy) ? DisplayString (dpy) : "???"); |
149 } | 149 abort(); |
150 } | |
150 | 151 |
151 #undef FALLBACK_RESOURCE_NAME | 152 #undef FALLBACK_RESOURCE_NAME |
152 | 153 |
153 return d; | 154 return d; |
154 } | 155 } |
1046 error_occurred = 1; | 1047 error_occurred = 1; |
1047 last_error = *event; | 1048 last_error = *event; |
1048 } | 1049 } |
1049 else | 1050 else |
1050 { | 1051 { |
1052 int depth; | |
1053 | |
1051 #ifdef EXTERNAL_WIDGET | 1054 #ifdef EXTERNAL_WIDGET |
1052 struct frame *f; | 1055 struct frame *f; |
1053 struct device *d = get_device_from_display (disp); | 1056 struct device *d = get_device_from_display (disp); |
1054 | 1057 |
1055 if ((event->error_code == BadWindow || | 1058 if ((event->error_code == BadWindow || |
1081 } | 1084 } |
1082 return 0; | 1085 return 0; |
1083 } | 1086 } |
1084 #endif /* EXTERNAL_WIDGET */ | 1087 #endif /* EXTERNAL_WIDGET */ |
1085 | 1088 |
1089 /* #### this should issue a warning instead of outputting to stderr */ | |
1090 depth = begin_dont_check_for_quit (); | |
1086 stderr_out ("\n%s: ", | 1091 stderr_out ("\n%s: ", |
1087 (STRINGP (Vinvocation_name) | 1092 (STRINGP (Vinvocation_name) |
1088 ? (char *) XSTRING_DATA (Vinvocation_name) | 1093 ? (char *) XSTRING_DATA (Vinvocation_name) |
1089 : "xemacs")); | 1094 : "xemacs")); |
1090 XmuPrintDefaultErrorMessage (disp, event, stderr); | 1095 XmuPrintDefaultErrorMessage (disp, event, stderr); |
1096 unbind_to (depth); | |
1091 } | 1097 } |
1092 return 0; | 1098 return 0; |
1093 } | 1099 } |
1094 | 1100 |
1095 void | 1101 void |
1154 assert (d != NULL); | 1160 assert (d != NULL); |
1155 dev = wrap_device (d); | 1161 dev = wrap_device (d); |
1156 | 1162 |
1157 if (NILP (find_nonminibuffer_frame_not_on_device (dev))) | 1163 if (NILP (find_nonminibuffer_frame_not_on_device (dev))) |
1158 { | 1164 { |
1165 int depth = begin_dont_check_for_quit (); | |
1159 /* We're going down. */ | 1166 /* We're going down. */ |
1160 Intbyte *errmess; | 1167 Intbyte *errmess; |
1161 GET_STRERROR (errmess, errno); | 1168 GET_STRERROR (errmess, errno); |
1162 stderr_out ("\n%s: Fatal I/O Error %d (%s) on display " | 1169 stderr_out ("\n%s: Fatal I/O Error %d (%s) on display " |
1163 "connection \"%s\"\n", | 1170 "connection \"%s\"\n", |
1167 stderr_out (" after %lu requests (%lu known processed) with %d " | 1174 stderr_out (" after %lu requests (%lu known processed) with %d " |
1168 "events remaining.\n", | 1175 "events remaining.\n", |
1169 NextRequest (disp) - 1, LastKnownRequestProcessed (disp), | 1176 NextRequest (disp) - 1, LastKnownRequestProcessed (disp), |
1170 QLength (disp)); | 1177 QLength (disp)); |
1171 /* assert (!_Xdebug); */ | 1178 /* assert (!_Xdebug); */ |
1179 unbind_to (depth); | |
1172 } | 1180 } |
1173 else | 1181 else |
1174 { | 1182 { |
1175 Intbyte *errmess; | 1183 Intbyte *errmess; |
1176 GET_STRERROR (errmess, errno); | 1184 GET_STRERROR (errmess, errno); |