Mercurial > hg > xemacs-beta
annotate src/event-tty.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 | e38acbeb1cae |
children | 79c6ff3eef26 |
rev | line source |
---|---|
428 | 1 /* The event_stream interface for tty's. |
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
3 Copyright (C) 1995 Sun Microsystems, Inc. | |
788 | 4 Copyright (C) 1995, 2002 Ben Wing. |
428 | 5 |
6 This file is part of XEmacs. | |
7 | |
8 XEmacs is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
10 Free Software Foundation; either version 2, or (at your option) any | |
11 later version. | |
12 | |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
19 along with XEmacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
22 | |
23 /* Synched up with: Not in FSF. */ | |
24 | |
25 #include <config.h> | |
26 #include "lisp.h" | |
27 | |
28 #include "device.h" | |
29 #include "console-tty.h" | |
30 #include "events.h" | |
31 #include "frame.h" | |
32 #include "process.h" | |
33 | |
34 #include "sysproc.h" | |
35 #include "syswait.h" | |
36 #include "systime.h" | |
37 | |
38 /* Mask of bits indicating the descriptors that we wait for input on */ | |
39 extern SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; | |
40 extern SELECT_TYPE process_only_mask, tty_only_mask; | |
41 | |
42 static struct event_stream *tty_event_stream; | |
43 | |
44 | |
45 /************************************************************************/ | |
46 /* timeout events */ | |
47 /************************************************************************/ | |
48 | |
49 /* The pending timers are stored in an ordered list, where the first timer | |
50 on the list is the first one to fire. Times recorded here are | |
51 absolute. */ | |
52 static struct low_level_timeout *tty_timer_queue; | |
53 | |
54 static int | |
55 emacs_tty_add_timeout (EMACS_TIME thyme) | |
56 { | |
57 return add_low_level_timeout (&tty_timer_queue, thyme); | |
58 } | |
59 | |
60 static void | |
61 emacs_tty_remove_timeout (int id) | |
62 { | |
63 remove_low_level_timeout (&tty_timer_queue, id); | |
64 } | |
65 | |
66 static void | |
440 | 67 tty_timeout_to_emacs_event (Lisp_Event *emacs_event) |
428 | 68 { |
69 emacs_event->event_type = timeout_event; | |
70 /* timeout events have nil as channel */ | |
71 emacs_event->timestamp = 0; /* #### */ | |
72 emacs_event->event.timeout.interval_id = | |
73 pop_low_level_timeout (&tty_timer_queue, 0); | |
74 emacs_event->event.timeout.function = Qnil; | |
75 emacs_event->event.timeout.object = Qnil; | |
76 } | |
77 | |
78 | |
79 | |
80 static int | |
81 emacs_tty_event_pending_p (int user_p) | |
82 { | |
83 if (!user_p) | |
84 { | |
85 EMACS_TIME sometime; | |
86 /* see if there's a pending timeout. */ | |
87 EMACS_GET_TIME (sometime); | |
88 if (tty_timer_queue && | |
89 EMACS_TIME_EQUAL_OR_GREATER (sometime, tty_timer_queue->time)) | |
90 return 1; | |
91 } | |
92 | |
93 return poll_fds_for_input (user_p ? tty_only_mask : | |
94 non_fake_input_wait_mask); | |
95 } | |
96 | |
97 struct console * | |
98 tty_find_console_from_fd (int fd) | |
99 { | |
100 Lisp_Object concons; | |
101 | |
102 CONSOLE_LOOP (concons) | |
103 { | |
104 struct console *c; | |
105 | |
106 c = XCONSOLE (XCAR (concons)); | |
107 if (CONSOLE_TTY_P (c) && CONSOLE_TTY_DATA (c)->infd == fd) | |
108 return c; | |
109 } | |
110 | |
111 return 0; | |
112 } | |
113 | |
114 static void | |
440 | 115 emacs_tty_next_event (Lisp_Event *emacs_event) |
428 | 116 { |
117 while (1) | |
118 { | |
119 int ndesc; | |
120 int i; | |
121 SELECT_TYPE temp_mask = input_wait_mask; | |
122 EMACS_TIME time_to_block; | |
123 EMACS_SELECT_TIME select_time_to_block, *pointer_to_this; | |
124 | |
125 if (!get_low_level_timeout_interval (tty_timer_queue, &time_to_block)) | |
126 /* no timer events; block indefinitely */ | |
127 pointer_to_this = 0; | |
128 else | |
129 { | |
130 EMACS_TIME_TO_SELECT_TIME (time_to_block, select_time_to_block); | |
131 pointer_to_this = &select_time_to_block; | |
132 } | |
133 | |
134 ndesc = select (MAXDESC, &temp_mask, 0, 0, pointer_to_this); | |
135 if (ndesc > 0) | |
136 { | |
137 /* Look for a TTY event */ | |
138 for (i = 0; i < MAXDESC; i++) | |
139 { | |
140 /* To avoid race conditions (among other things, an infinite | |
141 loop when called from Fdiscard_input()), we must return | |
142 user events ahead of process events. */ | |
143 if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &tty_only_mask)) | |
144 { | |
145 struct console *c = tty_find_console_from_fd (i); | |
146 | |
147 assert (c); | |
771 | 148 if (read_event_from_tty_or_stream_desc (emacs_event, c)) |
428 | 149 return; |
150 } | |
151 } | |
152 | |
153 /* Look for a process event */ | |
154 for (i = 0; i < MAXDESC; i++) | |
155 { | |
156 if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &process_only_mask)) | |
157 { | |
158 Lisp_Object process; | |
440 | 159 Lisp_Process *p = get_process_from_usid (FD_TO_USID(i)); |
428 | 160 |
161 assert (p); | |
793 | 162 process = wrap_process (p); |
428 | 163 emacs_event->event_type = process_event; |
164 /* process events have nil as channel */ | |
165 emacs_event->timestamp = 0; /* #### */ | |
166 emacs_event->event.process.process = process; | |
167 return; | |
168 } | |
169 } | |
170 | |
171 /* We might get here when a fake event came through a signal. */ | |
172 /* Return a dummy event, so that a cycle of the command loop will | |
173 occur. */ | |
174 drain_signal_event_pipe (); | |
175 emacs_event->event_type = eval_event; | |
176 /* eval events have nil as channel */ | |
177 emacs_event->event.eval.function = Qidentity; | |
178 emacs_event->event.eval.object = Qnil; | |
179 return; | |
180 } | |
181 else if (ndesc == 0) /* timeout fired */ | |
182 { | |
183 tty_timeout_to_emacs_event (emacs_event); | |
184 return; | |
185 } | |
186 } | |
187 } | |
188 | |
189 static void | |
788 | 190 emacs_tty_format_magic_event (Lisp_Event *emacs_event, Lisp_Object pstream) |
191 { | |
192 /* Nothing to do currently */ | |
193 } | |
194 | |
195 static int | |
196 emacs_tty_compare_magic_event (Lisp_Event *e1, Lisp_Event *e2) | |
197 { | |
198 return 1; | |
199 } | |
200 | |
201 static Hashcode | |
202 emacs_tty_hash_magic_event (Lisp_Event *e) | |
203 { | |
204 return 0; | |
205 } | |
206 | |
207 static void | |
440 | 208 emacs_tty_handle_magic_event (Lisp_Event *emacs_event) |
428 | 209 { |
210 /* Nothing to do currently */ | |
211 } | |
212 | |
213 | |
214 static void | |
853 | 215 emacs_tty_select_process (Lisp_Process *process, int doin, int doerr) |
428 | 216 { |
853 | 217 int infd, errfd; |
218 | |
219 event_stream_unixoid_select_process (process, doin, doerr, &infd, &errfd); | |
428 | 220 } |
221 | |
222 static void | |
853 | 223 emacs_tty_unselect_process (Lisp_Process *process, int doin, int doerr) |
428 | 224 { |
853 | 225 int infd, errfd; |
226 | |
227 event_stream_unixoid_unselect_process (process, doin, doerr, &infd, &errfd); | |
428 | 228 } |
229 | |
230 static void | |
231 emacs_tty_select_console (struct console *con) | |
232 { | |
233 event_stream_unixoid_select_console (con); | |
234 } | |
235 | |
236 static void | |
237 emacs_tty_unselect_console (struct console *con) | |
238 { | |
239 event_stream_unixoid_unselect_console (con); | |
240 } | |
241 | |
242 static void | |
243 emacs_tty_quit_p (void) | |
244 { | |
245 /* Nothing to do currently because QUIT is handled through SIGINT. | |
246 This could change. */ | |
247 } | |
248 | |
853 | 249 static void |
250 emacs_tty_create_io_streams (void* inhandle, void* outhandle, | |
251 void *errhandle, Lisp_Object* instream, | |
252 Lisp_Object* outstream, | |
253 Lisp_Object* errstream, | |
254 USID* in_usid, | |
255 USID* err_usid, | |
256 int flags) | |
428 | 257 { |
853 | 258 event_stream_unixoid_create_io_streams |
259 (inhandle, outhandle, errhandle, instream, outstream, | |
260 errstream, in_usid, err_usid, flags); | |
428 | 261 } |
262 | |
853 | 263 static void |
264 emacs_tty_delete_io_streams (Lisp_Object instream, | |
265 Lisp_Object outstream, | |
266 Lisp_Object errstream, | |
267 USID* in_usid, | |
268 USID* err_usid) | |
428 | 269 { |
853 | 270 event_stream_unixoid_delete_io_streams |
271 (instream, outstream, errstream, in_usid, err_usid); | |
428 | 272 } |
273 | |
274 | |
275 /************************************************************************/ | |
276 /* initialization */ | |
277 /************************************************************************/ | |
278 | |
279 void | |
280 reinit_vars_of_event_tty (void) | |
281 { | |
282 tty_event_stream = xnew (struct event_stream); | |
283 | |
284 tty_event_stream->event_pending_p = emacs_tty_event_pending_p; | |
442 | 285 tty_event_stream->force_event_pending = 0; |
428 | 286 tty_event_stream->next_event_cb = emacs_tty_next_event; |
287 tty_event_stream->handle_magic_event_cb = emacs_tty_handle_magic_event; | |
788 | 288 tty_event_stream->format_magic_event_cb = emacs_tty_format_magic_event; |
289 tty_event_stream->compare_magic_event_cb= emacs_tty_compare_magic_event; | |
290 tty_event_stream->hash_magic_event_cb = emacs_tty_hash_magic_event; | |
428 | 291 tty_event_stream->add_timeout_cb = emacs_tty_add_timeout; |
292 tty_event_stream->remove_timeout_cb = emacs_tty_remove_timeout; | |
293 tty_event_stream->select_console_cb = emacs_tty_select_console; | |
294 tty_event_stream->unselect_console_cb = emacs_tty_unselect_console; | |
295 tty_event_stream->select_process_cb = emacs_tty_select_process; | |
296 tty_event_stream->unselect_process_cb = emacs_tty_unselect_process; | |
297 tty_event_stream->quit_p_cb = emacs_tty_quit_p; | |
853 | 298 tty_event_stream->create_io_streams_cb = emacs_tty_create_io_streams; |
299 tty_event_stream->delete_io_streams_cb = emacs_tty_delete_io_streams; | |
428 | 300 } |
301 | |
302 void | |
303 vars_of_event_tty (void) | |
304 { | |
305 reinit_vars_of_event_tty (); | |
306 } | |
307 | |
308 void | |
309 init_event_tty_late (void) | |
310 { | |
311 event_stream = tty_event_stream; | |
312 } |