Mercurial > hg > xemacs-beta
comparison src/event-gtk.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 | 804517e16990 |
comparison
equal
deleted
inserted
replaced
852:d83885ef293b | 853:2b6fa2618f76 |
---|---|
494 /* timeout events */ | 494 /* timeout events */ |
495 /************************************************************************/ | 495 /************************************************************************/ |
496 | 496 |
497 static int timeout_id_tick; | 497 static int timeout_id_tick; |
498 | 498 |
499 struct GTK_timeout { | 499 struct GTK_timeout |
500 int id; | 500 { |
501 guint timeout_id; | 501 int id; |
502 struct GTK_timeout *next; | 502 guint timeout_id; |
503 struct GTK_timeout *next; | |
503 } *pending_timeouts, *completed_timeouts; | 504 } *pending_timeouts, *completed_timeouts; |
504 | 505 |
505 struct GTK_timeout_blocktype | 506 struct GTK_timeout_blocktype |
506 { | 507 { |
507 Blocktype_declare (struct GTK_timeout); | 508 Blocktype_declare (struct GTK_timeout); |
524 t2->next = t2->next->next; | 525 t2->next = t2->next->next; |
525 } | 526 } |
526 /* Add this one to the list of completed timeouts */ | 527 /* Add this one to the list of completed timeouts */ |
527 timeout->next = completed_timeouts; | 528 timeout->next = completed_timeouts; |
528 completed_timeouts = timeout; | 529 completed_timeouts = timeout; |
529 return(FALSE); | 530 return FALSE; |
530 } | 531 } |
531 | 532 |
532 static int | 533 static int |
533 emacs_gtk_add_timeout (EMACS_TIME thyme) | 534 emacs_gtk_add_timeout (EMACS_TIME thyme) |
534 { | 535 { |
683 #endif | 684 #endif |
684 return; | 685 return; |
685 } | 686 } |
686 filedesc_with_input[closure->fd] = closure->what; | 687 filedesc_with_input[closure->fd] = closure->what; |
687 if (PROCESSP (closure->what)) | 688 if (PROCESSP (closure->what)) |
688 { | 689 /* Don't increment this if the current process is already marked |
689 /* Don't increment this if the current process is already marked | 690 * as having input. */ |
690 * as having input. */ | 691 process_events_occurred++; |
691 process_events_occurred++; | |
692 } | |
693 else | 692 else |
694 { | 693 tty_events_occurred++; |
695 tty_events_occurred++; | |
696 } | |
697 } | 694 } |
698 } | 695 } |
699 | 696 |
700 static void | 697 static void |
701 gtk_what_callback (gpointer closure, gint source, GdkInputCondition why) | 698 gtk_what_callback (gpointer closure, gint source, GdkInputCondition why) |
776 xfree (closure); | 773 xfree (closure); |
777 filedesc_to_what_closure[fd] = 0; | 774 filedesc_to_what_closure[fd] = 0; |
778 } | 775 } |
779 | 776 |
780 static void | 777 static void |
781 emacs_gtk_select_process (struct Lisp_Process *p) | 778 emacs_gtk_select_process (Lisp_Process *process, int doin, int doerr) |
782 { | 779 { |
783 Lisp_Object process; | 780 Lisp_Object proc; |
784 int infd = event_stream_unixoid_select_process (p); | 781 int infd, errfd; |
785 | 782 |
786 process = wrap_process (p); | 783 event_stream_unixoid_select_process (process, doin, doerr, &infd, &errfd); |
787 select_filedesc (infd, process); | 784 |
788 } | 785 proc = wrap_process (process); |
789 | 786 if (doin) |
790 static void | 787 select_filedesc (infd, proc); |
791 emacs_gtk_unselect_process (struct Lisp_Process *p) | 788 if (doerr) |
792 { | 789 select_filedesc (errfd, proc); |
793 int infd = event_stream_unixoid_unselect_process (p); | 790 } |
794 | 791 |
795 unselect_filedesc (infd); | 792 static void |
796 } | 793 emacs_gtk_unselect_process (Lisp_Process *process, int doin, int doerr) |
797 | 794 { |
798 static USID | 795 int infd, errfd; |
799 emacs_gtk_create_stream_pair (void* inhandle, void* outhandle, | 796 |
800 Lisp_Object* instream, Lisp_Object* outstream, int flags) | 797 event_stream_unixoid_unselect_process (process, doin, doerr, &infd, &errfd); |
801 { | 798 |
802 USID u = event_stream_unixoid_create_stream_pair | 799 if (doin) |
803 (inhandle, outhandle, instream, outstream, flags); | 800 unselect_filedesc (infd); |
804 if (u != USID_ERROR) | 801 if (doerr) |
805 u = USID_DONTHASH; | 802 unselect_filedesc (errfd); |
806 return u; | 803 } |
807 } | 804 |
808 | 805 static void |
809 static USID | 806 emacs_gtk_create_io_streams (void *inhandle, void *outhandle, |
810 emacs_gtk_delete_stream_pair (Lisp_Object instream, Lisp_Object outstream) | 807 void *errhandle, Lisp_Object *instream, |
811 { | 808 Lisp_Object *outstream, |
812 event_stream_unixoid_delete_stream_pair (instream, outstream); | 809 Lisp_Object *errstream, |
813 return USID_DONTHASH; | 810 USID *in_usid, |
811 USID *err_usid, | |
812 int flags) | |
813 { | |
814 event_stream_unixoid_create_io_streams | |
815 (inhandle, outhandle, errhandle, instream, outstream, | |
816 errstream, in_usid, err_usid, flags); | |
817 if (*in_usid != USID_ERROR) | |
818 *in_usid = USID_DONTHASH; | |
819 if (*err_usid != USID_ERROR) | |
820 *err_usid = USID_DONTHASH; | |
821 } | |
822 | |
823 static void | |
824 emacs_gtk_delete_io_streams (Lisp_Object instream, | |
825 Lisp_Object outstream, | |
826 Lisp_Object errstream, | |
827 USID *in_usid, | |
828 USID *err_usid) | |
829 { | |
830 event_stream_unixoid_delete_io_streams | |
831 (instream, outstream, errstream, in_usid, err_usid); | |
832 *in_usid = USID_DONTHASH; | |
833 *err_usid = USID_DONTHASH; | |
814 } | 834 } |
815 | 835 |
816 /* This is called from GC when a process object is about to be freed. | 836 /* This is called from GC when a process object is about to be freed. |
817 If we've still got pointers to it in this file, we're gonna lose hard. | 837 If we've still got pointers to it in this file, we're gonna lose hard. |
818 */ | 838 */ |