Mercurial > hg > xemacs-beta
view src/event-unixoid.c @ 1268:fffe735e63ee
[xemacs-hg @ 2003-02-07 11:50:50 by ben]
fixes for menu crashes + better preemption behavior
This contains two related changes:
(1) Fix problems with reentrant calling of lwlib and associated
crashes when selecting menu items.
(2) Improve redisplay handling of preemption. Turn on lazy lock
and hold down page-down or page-up and you'll see what I mean.
They are related because they both touch on the code that retrieves
events and handles the internal queues.
console-msw.h, event-msw.c, event-stream.c, events.h, menubar-msw.c, menubar-x.c, menubar.h: mswindows_protect_modal_loop() has been generalized to
event_stream_protect_modal_loop(), and moved to event-stream.c.
mswindows_in_modal_loop ->in_modal_loop likewise. Changes in
event-msw.c and menubar-msw.c for the new names and calling format
(use structures instead of static variables in menubar-msw.c).
Delete former in_menu_callback and use in_modal_loop in its place.
Remove emacs_mswindows_quit_check_disallowed_p(), superseded by
in_modal_loop. Use event_stream_protect_modal_loop() in
pre_activate_callback() so that we get no lwlib reentrancy.
Rearrange some of the code in event-msw.c to be grouped better.
Make mswindows_drain_windows_queue() respect in_modal_loop and
do nothing if so.
cmdloop.c, event-stream.c: Don't conditionalize on LWLIB_MENUBARS_LUCID when giving error when
in_modal_loop, and give better error.
event-Xt.c, event-gtk.c: If in_modal_loop, only retrieve process and timeout events.
Don't retrieve any X events because processing them can lead
to reentrancy in lwlib -> death.
event-stream.c: Remove unused parameter to check_event_stream_ok() and change
all callers.
lisp.h, event-stream.c: Rearrange some functions for increased clarity -- in particular,
group all the input-pending/QUIT-related stuff together, and
put right next to next-event stuff, to which it's related.
Add the concept of "HOW_MANY" -- when asking whether user input
is pending, you can ask if at least HOW_MANY events are pending,
not just if any are. Add parameter to detect_input_pending()
for this. Change recursive_sit_for from a Lisp_Object (which
could only be Qt or Qnil) to an int, like it should be.
event-Xt.c, event-gtk.c, event-xlike-inc.c: New file.
Abstract out similar code in event_{Xt/gtk}_pending_p() and write
only once, using include-file tricks. Rewrite this function to
implement HOW_MANY and only process events when not in_modal_loop.
event-msw.c: Implement HOW_MANY and only process events when not in_modal_loop.
event-tty.c: Implement HOW_MANY.
redisplay.c: Add var `max-preempts' to control maximum number of preempts.
(#### perhaps not useful) Rewrite preemption check so that,
rather than preempting when any user events are available, only
preempt when a certain number (currently 4) of them are backed up.
This effectively allows redisplay to proceed to completion in the
presence of a fast auto-repeat (usually the auto-repeating is
generated dynamically as necessary), and you get much better
display behavior with lazy-lock active.
event-unixoid.c: Comment changes.
event-stream.c: Rewrite discard-input much more simply and safely using the
drain-queue functions. I think the old version might loop
forever if called when in_modal_loop.
SEMI-UNRELATED CHANGES:
-----------------------
event-stream.c: Turn QUIT-checking back on when running the pre-idle hook so it
can be quit out of.
indent.c: Document exact functioning of `vertical-motion' better, and its
differences from GNU Emacs.
author | ben |
---|---|
date | Fri, 07 Feb 2003 11:50:54 +0000 |
parents | e22b0213b713 |
children | 0cc7794d231e |
line wrap: on
line source
/* Code shared between all event loops that use select() and have a different input descriptor for each device. Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 1996, 2001, 2002, 2003 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file has been Mule-ized. */ #include <config.h> #include "lisp.h" #include "console-stream-impl.h" #include "console-tty-impl.h" #include "device-impl.h" #include "events.h" #include "lstream.h" #include "process.h" #include "sysdep.h" #include "sysfile.h" #include "sysproc.h" /* select stuff */ #include "systime.h" /* Mask of bits indicating the descriptors that we wait for input on. These work as follows: In event-tty.c we call select() directly on this to retrieve an event. In event-Xt.c we use XtAppAddInput() and the call to select() is down in the guts of Xt, but we still use the masks when checking for pending input, even in event-Xt.c. (We can't use XtAppPending() because of the presence of the signal event pipe.) input_wait_mask == mask of all file descriptors we select() on, including TTY/stream console descriptors, process descriptors, and the signal event pipe. non_fake_input_wait_mask == same as input_wait_mask but minus the signal event pipe. Also only used in event-tty.c. process_only_mask == only the process descriptors. tty_only_mask == only the TTY/stream console descriptors. */ SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; SELECT_TYPE process_only_mask, tty_only_mask; /* This is used to terminate the select(), when an event came in through a signal (e.g. window-change or C-g on controlling TTY). */ int signal_event_pipe[2]; int signal_event_pipe_initialized; int fake_event_occurred; struct console * find_tty_or_stream_console_from_fd (int fd) { Lisp_Object concons; CONSOLE_LOOP (concons) { struct console *c; c = XCONSOLE (XCAR (concons)); if ((CONSOLE_TTY_P (c) && CONSOLE_TTY_DATA (c)->infd == fd) || (CONSOLE_STREAM_P (c) && fileno (CONSOLE_STREAM_DATA (c)->in) == fd)) return c; } return 0; } int read_event_from_tty_or_stream_desc (Lisp_Event *event, struct console *con) { Ichar ch; Lisp_Object console = wrap_console (con); if (CONSOLE_TTY_P (con)) ch = Lstream_get_ichar (XLSTREAM (CONSOLE_TTY_DATA (con)->instream)); else { /* #### Definitely something strange here. We should be setting the stdio handle unbuffered and reading from it instead of mixing stdio and raw io calls. */ int nread = retry_read (fileno (CONSOLE_STREAM_DATA (con)->in), &ch, 1); if (nread <= 0) ch = -1; } if (ch < 0) { /* deleting the console might not be safe right now ... */ enqueue_magic_eval_event (io_error_delete_console, console); /* but we definitely need to unselect it to avoid infinite loops reading EOF's */ Fconsole_disable_input (console); } else { /* Here we really do want to set the use_console_meta_flag because the char is from the TTY. */ character_to_event (ch, event, con, 1, 1); event->channel = console; return 1; } return 0; } void signal_fake_event (void) { char byte = 0; /* We do the write always. Formerly I tried to "optimize" this by setting a flag indicating whether we're blocking and only doing the write in that case, but there is a race condition if the signal occurs after we've checked for the signal occurrence (which could occur in many places throughout an iteration of the command loop, e.g. in status_notify()), but before we set the blocking flag. This should be OK as long as write() is reentrant, which I'm fairly sure it is since it's a system call. */ if (signal_event_pipe_initialized) /* In case a signal comes through while we're dumping */ { int old_errno = errno; retry_write (signal_event_pipe[1], &byte, 1); errno = old_errno; } } void drain_signal_event_pipe (void) { char chars[128]; /* The input end of the pipe has been set to non-blocking. */ while (retry_read (signal_event_pipe[0], chars, sizeof (chars)) > 0) ; } void drain_tty_devices (void) { Lisp_Object devcons, concons; CONSOLE_LOOP (concons) { struct console *con = XCONSOLE (XCAR (concons)); if (!con->input_enabled) continue; CONSOLE_DEVICE_LOOP (devcons, con) { struct device *d = XDEVICE (XCAR (devcons)); if (DEVICE_TTY_P (d)) { SELECT_TYPE temp_mask; int infd = DEVICE_INFD (d); FD_ZERO (&temp_mask); FD_SET (infd, &temp_mask); while (1) { Lisp_Object event; if (!poll_fds_for_input (temp_mask)) break; event = Fmake_event (Qnil, Qnil); if (!read_event_from_tty_or_stream_desc (XEVENT (event), con)) /* EOF, or something ... */ break; /* queue the read event to be read for real later. */ enqueue_dispatch_event (event); } } } } } int event_stream_unixoid_select_console (struct console *con) { int infd; if (CONSOLE_STREAM_P (con)) infd = fileno (CONSOLE_STREAM_DATA (con)->in); else { assert (CONSOLE_TTY_P (con)); infd = CONSOLE_TTY_DATA (con)->infd; } assert (infd >= 0); FD_SET (infd, &input_wait_mask); FD_SET (infd, &non_fake_input_wait_mask); FD_SET (infd, &tty_only_mask); return infd; } int event_stream_unixoid_unselect_console (struct console *con) { int infd; if (CONSOLE_STREAM_P (con)) infd = fileno (CONSOLE_STREAM_DATA (con)->in); else { assert (CONSOLE_TTY_P (con)); infd = CONSOLE_TTY_DATA (con)->infd; } assert (infd >= 0); FD_CLR (infd, &input_wait_mask); FD_CLR (infd, &non_fake_input_wait_mask); FD_CLR (infd, &tty_only_mask); return infd; } static int get_process_infd (Lisp_Process *p) { Lisp_Object instr, outstr, errstr; get_process_streams (p, &instr, &outstr, &errstr); assert (!NILP (instr)); return filedesc_stream_fd (XLSTREAM (instr)); } static int get_process_errfd (Lisp_Process *p) { Lisp_Object instr, outstr, errstr; get_process_streams (p, &instr, &outstr, &errstr); if (!NILP (errstr)) return filedesc_stream_fd (XLSTREAM (errstr)); else return -1; } void event_stream_unixoid_select_process (Lisp_Process *proc, int doin, int doerr, int *infd, int *errfd) { if (doin) { *infd = get_process_infd (proc); FD_SET (*infd, &input_wait_mask); FD_SET (*infd, &non_fake_input_wait_mask); FD_SET (*infd, &process_only_mask); } if (doerr) { *errfd = get_process_errfd (proc); if (*errfd >= 0) { FD_SET (*errfd, &input_wait_mask); FD_SET (*errfd, &non_fake_input_wait_mask); FD_SET (*errfd, &process_only_mask); } } } void event_stream_unixoid_unselect_process (Lisp_Process *proc, int doin, int doerr, int *infd, int *errfd) { if (doin) { *infd = get_process_infd (proc); FD_CLR (*infd, &input_wait_mask); FD_CLR (*infd, &non_fake_input_wait_mask); FD_CLR (*infd, &process_only_mask); } if (doerr) { *errfd = get_process_errfd (proc); if (*errfd >= 0) { FD_CLR (*errfd, &input_wait_mask); FD_CLR (*errfd, &non_fake_input_wait_mask); FD_CLR (*errfd, &process_only_mask); } } } int poll_fds_for_input (SELECT_TYPE mask) { EMACS_TIME sometime; EMACS_SELECT_TIME select_time; SELECT_TYPE temp_mask; int retval; while (1) { EMACS_SET_SECS_USECS (sometime, 0, 0); EMACS_TIME_TO_SELECT_TIME (sometime, select_time); temp_mask = mask; /* To effect a poll, tell select() to block for zero seconds. */ retval = select (MAXDESC, &temp_mask, 0, 0, &select_time); if (retval >= 0) return retval; if (errno != EINTR) { /* Something went seriously wrong; don't abort since maybe the TTY just died at the wrong time. */ stderr_out ("xemacs: select failed: errno = %d\n", errno); return 0; } /* else, we got interrupted by a signal, so try again. */ } RETURN_NOT_REACHED (0); } /****************************************************************************/ /* Unixoid (file descriptors based) process I/O streams routines */ /****************************************************************************/ void event_stream_unixoid_create_io_streams (void* inhandle, void* outhandle, void *errhandle, Lisp_Object* instream, Lisp_Object* outstream, Lisp_Object* errstream, USID* in_usid, USID* err_usid, int flags) { int infd, outfd, errfd; /* Decode inhandle and outhandle. Their meaning depends on the process implementation being used. */ /* We are passed plain old file descs */ infd = (int) inhandle; outfd = (int) outhandle; errfd = (int) errhandle; *instream = (infd >= 0 ? make_filedesc_input_stream (infd, 0, -1, 0) : Qnil); *outstream = (outfd >= 0 ? make_filedesc_output_stream (outfd, 0, -1, LSTR_BLOCKED_OK) : Qnil); *errstream = (errfd >= 0 ? make_filedesc_input_stream (errfd, 0, -1, 0) : Qnil); /* FLAGS is process->pty_flag for UNIX_PROCESSES */ if ((flags & STREAM_PTY_FLUSHING) && outfd >= 0) { Ibyte eof_char = get_eof_char (outfd); int pty_max_bytes = get_pty_max_bytes (outfd); filedesc_stream_set_pty_flushing (XLSTREAM (*outstream), pty_max_bytes, eof_char); } *in_usid = FD_TO_USID (infd); *err_usid = FD_TO_USID (errfd); } void event_stream_unixoid_delete_io_streams (Lisp_Object instream, Lisp_Object outstream, Lisp_Object errstream, USID *in_usid, USID *err_usid) { int in = (NILP (instream) ? -1 : filedesc_stream_fd (XLSTREAM (instream))); int out = (NILP (outstream) ? -1 : filedesc_stream_fd (XLSTREAM (outstream))); int err = (NILP (errstream) ? -1 : filedesc_stream_fd (XLSTREAM (errstream))); if (in >= 0) retry_close (in); if (out != in && out >= 0) retry_close (out); if (err != in && err != out && err >= 0) retry_close (err); *in_usid = FD_TO_USID (in); *err_usid = FD_TO_USID (err); } void init_event_unixoid (void) { /* Do this first; the init_event_*_late() functions pay attention to it. */ if (pipe (signal_event_pipe) < 0) { perror ("XEmacs: can't open pipe"); exit (-1); } signal_event_pipe_initialized = 1; /* Set it non-blocking so we can drain its output. */ set_descriptor_non_blocking (signal_event_pipe[0]); /* Also set the write descriptor non-blocking so we don't hang in case a long time passes between times when we drain the pipe. */ set_descriptor_non_blocking (signal_event_pipe[1]); /* WARNING: In order for the signal-event pipe to work correctly and not cause lockups, the following need to be followed: 1) event_pending_p() must ignore input on the signal-event pipe. 2) As soon as next_event() notices input on the signal-event pipe, it must drain it. */ FD_ZERO (&input_wait_mask); FD_ZERO (&non_fake_input_wait_mask); FD_ZERO (&process_only_mask); FD_ZERO (&tty_only_mask); FD_SET (signal_event_pipe[0], &input_wait_mask); }