Mercurial > hg > xemacs-beta
annotate src/extw-Xt.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 | 74fd4e045ea6 |
children | 697ef44129c6 4f4c898836ab |
rev | line source |
---|---|
0 | 1 /* Common code between client and shell widgets -- Xt only. |
2 Copyright (C) 1993, 1994 Sun Microsystems, Inc. | |
3 | |
4 This library is free software; you can redistribute it and/or | |
5 modify it under the terms of the GNU Library General Public | |
6 License as published by the Free Software Foundation; either | |
7 version 2 of the License, or (at your option) any later version. | |
8 | |
9 This library is distributed in the hope that it will be useful, | |
10 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
12 Library General Public License for more details. | |
13 | |
14 You should have received a copy of the GNU Library General Public | |
15 License along with this library; if not, write to | |
16 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
17 Boston, MA 02111-1307, USA. */ | |
18 | |
19 /* Synched up with: Not in FSF. */ | |
20 | |
21 /* Written by Ben Wing, September 1993. */ | |
22 | |
23 #ifdef emacs | |
24 | |
25 #include <config.h> | |
26 | |
27 #ifndef EXTERNAL_WIDGET | |
28 ERROR! This ought not be getting compiled if EXTERNAL_WIDGET is undefined | |
29 #endif | |
30 | |
398 | 31 void fatal (const char *fmt, ...); |
0 | 32 #else /* not emacs */ |
33 static void fatal (char *msg); | |
34 #endif | |
35 | |
36 #include <X11/Intrinsic.h> | |
37 #include <X11/IntrinsicP.h> | |
38 #include <stdlib.h> | |
39 #include <stdio.h> | |
40 #include "extw-Xt.h" | |
41 | |
42 /* Yeah, that's portable! | |
43 | |
44 Why the hell didn't the Xt people just export this function | |
45 for real? */ | |
46 | |
47 #if (XT_REVISION > 5) | |
48 int _XtWaitForSomething( | |
49 XtAppContext app, | |
50 _XtBoolean ignoreEvents, | |
51 _XtBoolean ignoreTimers, | |
52 _XtBoolean ignoreInputs, | |
53 _XtBoolean ignoreSignals, | |
54 _XtBoolean block, | |
55 #ifdef XTHREADS | |
56 _XtBoolean drop_lock, | |
57 #endif | |
58 unsigned long *howlong); | |
59 | |
60 # ifndef XTHREADS | |
61 # define _XtwaitForSomething(timers,inputs,events,block,howlong,appCtx) \ | |
62 _XtWaitForSomething(appCtx,events,timers,inputs,0,block,howlong) | |
63 # else | |
64 # define _XtwaitForSomething(timers,inputs,events,block,howlong,appCtx) \ | |
65 _XtWaitForSomething(appCtx,events,timers,inputs,0,block,1,howlong) | |
66 # endif | |
67 #else | |
68 int _XtwaitForSomething( | |
69 Boolean ignoreTimers, | |
70 Boolean ignoreInputs, | |
71 Boolean ignoreEvents, | |
72 Boolean block, | |
73 unsigned long *howlong, | |
74 XtAppContext app | |
75 ); | |
76 #endif | |
77 | |
78 #ifdef DEBUG_WIDGET | |
79 | |
80 static int geom_masks[] = { | |
81 CWX, CWY, CWWidth, CWHeight, CWBorderWidth, CWSibling, CWStackMode, | |
82 XtCWQueryOnly }; | |
83 static char *geom_mask_strings[] = { | |
84 "CWX", "CWY", "CWWidth", "CWHeight", "CWBorderWidth", | |
85 "CWSibling", "CWStackMode", "XtCWQueryOnly" }; | |
86 static int stack_modes[] = { | |
87 Below, TopIf, BottomIf, Opposite, XtSMDontChange }; | |
88 static char *stack_mode_strings[] = { | |
89 "Below", "TopIf", "BottomIf", "Opposite", "XtSMDontChange" }; | |
90 | |
91 static void | |
92 print_geometry_structure(XtWidgetGeometry *xwg) | |
93 { | |
94 int num = sizeof(geom_masks)/sizeof(int); | |
95 int i; | |
96 | |
97 printf (" masks:"); | |
98 for (i=0; i<num; i++) | |
99 if (xwg->request_mode & geom_masks[i]) | |
100 printf (" %s", geom_mask_strings[i]); | |
101 printf ("\n"); | |
102 printf (" x:%d y:%d\n", xwg->x, xwg->y); | |
103 printf (" width:%d height:%d border_width:%d\n", xwg->width, | |
104 xwg->height, xwg->border_width); | |
105 printf (" sibling: %x\n", xwg->sibling); | |
106 printf (" stack_mode: "); | |
107 for (i=0, num=sizeof(stack_modes)/sizeof(int); i<num; i++) | |
108 if (xwg->stack_mode == stack_modes[i]) { | |
109 printf ("%s", stack_mode_strings[i]); | |
110 break; | |
111 } | |
112 printf ("\n"); | |
113 } | |
114 | |
115 static void | |
116 print_geometry_result (XtGeometryResult res) | |
117 { | |
118 printf ("result: %s\n", | |
119 res == XtGeometryYes ? "XtGeometryYes" : | |
120 res == XtGeometryNo ? "XtGeometryNo" : | |
121 res == XtGeometryAlmost ? "XtGeometryAlmost" : | |
122 res == XtGeometryDone ? "XtGeometryDone" : | |
123 "unknown"); | |
124 } | |
125 | |
126 #endif | |
127 | |
128 #ifndef emacs | |
129 | |
130 static void | |
131 fatal (char *msg) | |
132 { | |
133 fprintf (stderr, "%s", msg); | |
134 exit (1); | |
135 } | |
136 | |
137 #endif | |
138 | |
139 /* put a geometry specification in the specified property on the window | |
140 of the specified widget, and send a notification message to tell the | |
141 client-side widget about this. */ | |
142 | |
143 void | |
144 extw_send_geometry_value(Display *display, Window win, Atom property, | |
145 en_extw_notify type, XtWidgetGeometry *xwg, | |
146 long data0) | |
147 { | |
148 if (xwg != NULL) | |
149 XChangeProperty(display, win, property, | |
150 a_EXTW_WIDGET_GEOMETRY, 32, PropModeReplace, | |
151 (unsigned char *) xwg, sizeof(*xwg)/sizeof(int)); | |
152 extw_send_notify_3(display, win, type, data0, 0, 0); | |
153 } | |
154 | |
155 /* get the geometry specification stored in the specified property of the | |
156 specified widget's window. */ | |
157 | |
158 void | |
159 extw_get_geometry_value(Display *display, Window win, Atom property, | |
160 XtWidgetGeometry *xwg) | |
161 { | |
162 Atom dummy; | |
163 int format; | |
164 unsigned long nitems, bytes_after; | |
165 unsigned char *prop; | |
166 | |
167 if (XGetWindowProperty(display, win, property, 0, | |
168 sizeof(*xwg)/4, False, a_EXTW_WIDGET_GEOMETRY, | |
169 &dummy, &format, &nitems, &bytes_after, | |
170 &prop) != Success) | |
171 goto error; | |
172 if (format != 8*sizeof(int) || bytes_after) { | |
173 XFree((char *) prop); | |
174 goto error; | |
175 } | |
176 *xwg = * (XtWidgetGeometry *) prop; | |
177 return; | |
178 | |
179 error: | |
180 fatal("Unable to retrieve property for widget-geometry"); | |
181 #if 0 | |
182 XtAppErrorMsg(XtWidgetToApplicationContext((Widget)w), | |
183 "invalidProperty","get_geometry_value",XtCXtToolkitError, | |
184 "Unable to retrieve property for widget-geometry", | |
185 (String *)NULL, (Cardinal *)NULL); | |
186 #endif | |
187 } | |
188 | |
189 typedef struct { | |
190 Widget w; | |
191 unsigned long request_num; | |
192 en_extw_notify type; | |
193 } QueryStruct; | |
194 | |
195 /* check if an event is of the sort we're looking for */ | |
196 | |
197 static Bool | |
198 isMine(Display *dpy, XEvent *event, char *arg) | |
199 { | |
200 QueryStruct *q = (QueryStruct *) arg; | |
201 Widget w = q->w; | |
202 | |
203 if ( (dpy != XtDisplay(w)) || (event->xany.window != XtWindow(w)) ) { | |
204 return FALSE; | |
205 } | |
206 if (event->xany.serial >= q->request_num) { | |
207 if (event->type == ClientMessage && | |
208 event->xclient.message_type == a_EXTW_NOTIFY && | |
209 event->xclient.data.l[0] == 1 - extw_which_side && | |
210 event->xclient.data.l[1] == q->type) | |
211 return TRUE; | |
212 } | |
213 return FALSE; | |
214 } | |
215 | |
216 /* wait for a ClientMessage of the specified type from the other widget, or | |
217 time-out. isMine() determines whether an event matches. Culled from | |
218 Shell.c. */ | |
219 | |
220 Bool | |
221 extw_wait_for_response(Widget w, XEvent *event, unsigned long request_num, | |
222 en_extw_notify type, unsigned long timeout) | |
223 { | |
224 XtAppContext app = XtWidgetToApplicationContext(w); | |
225 QueryStruct q; | |
226 | |
227 XFlush(XtDisplay(w)); | |
228 q.w = w; | |
229 q.request_num = request_num; | |
230 q.type = type; | |
231 | |
232 for(;;) { | |
233 /* | |
234 * look for match event | |
235 */ | |
236 if (XCheckIfEvent( XtDisplay(w), event, isMine, (char*)&q)) | |
237 return TRUE; | |
238 if (_XtwaitForSomething(TRUE, TRUE, FALSE, TRUE, &timeout, app) | |
239 != -1) continue; | |
240 if (timeout == 0) | |
241 return FALSE; | |
242 } | |
243 } |