Mercurial > hg > xemacs-beta
view src/console-tty.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 | a8d8f419b459 |
line wrap: on
line source
/* TTY console functions. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1996, 2001, 2002 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. */ /* Authors: Ben Wing and Chuck Thompson. */ #include <config.h> #include "lisp.h" #include "console-tty-impl.h" #include "console-stream.h" #include "faces.h" #include "file-coding.h" #include "frame.h" #include "glyphs.h" #include "lstream.h" #include "process.h" #include "sysdep.h" #include "sysfile.h" DEFINE_CONSOLE_TYPE (tty); DECLARE_IMAGE_INSTANTIATOR_FORMAT (nothing); DECLARE_IMAGE_INSTANTIATOR_FORMAT (string); DECLARE_IMAGE_INSTANTIATOR_FORMAT (formatted_string); DECLARE_IMAGE_INSTANTIATOR_FORMAT (inherit); Lisp_Object Qterminal_type; Lisp_Object Qcontrolling_process; static const struct memory_description tty_console_data_description_1 [] = { { XD_LISP_OBJECT, offsetof (struct tty_console, terminal_type) }, { XD_LISP_OBJECT, offsetof (struct tty_console, instream) }, { XD_LISP_OBJECT, offsetof (struct tty_console, outstream) }, { XD_END } }; const struct sized_memory_description tty_console_data_description = { sizeof (struct tty_console), tty_console_data_description_1 }; static void allocate_tty_console_struct (struct console *con) { /* zero out all slots except the lisp ones ... */ CONSOLE_TTY_DATA (con) = xnew_and_zero (struct tty_console); CONSOLE_TTY_DATA (con)->terminal_type = Qnil; CONSOLE_TTY_DATA (con)->instream = Qnil; CONSOLE_TTY_DATA (con)->outstream = Qnil; } static void tty_init_console (struct console *con, Lisp_Object props) { Lisp_Object tty = CONSOLE_CONNECTION (con); Lisp_Object terminal_type = Qnil; Lisp_Object controlling_process = Qnil; struct tty_console *tty_con; struct gcpro gcpro1, gcpro2; GCPRO2 (terminal_type, controlling_process); terminal_type = Fplist_get (props, Qterminal_type, Qnil); controlling_process = Fplist_get (props, Qcontrolling_process, Qnil); /* Determine the terminal type */ if (!NILP (terminal_type)) CHECK_STRING (terminal_type); else { Ibyte *temp_type = egetenv ("TERM"); if (!temp_type) { invalid_state ("Cannot determine terminal type", Qunbound); } else terminal_type = build_intstring (temp_type); } /* Determine the controlling process */ if (!NILP (controlling_process)) CHECK_INT (controlling_process); /* Open the specified console */ allocate_tty_console_struct (con); tty_con = CONSOLE_TTY_DATA (con); if (internal_equal (tty, Vstdio_str, 0)) { tty_con->infd = fileno (stdin); tty_con->outfd = fileno (stdout); tty_con->is_stdio = 1; } else { tty_con->infd = tty_con->outfd = qxe_open (XSTRING_DATA (tty), O_RDWR); if (tty_con->infd < 0) signal_error (Qio_error, "Unable to open tty", tty); tty_con->is_stdio = 0; } /* set_descriptor_non_blocking (tty_con->infd); */ tty_con->instream = make_filedesc_input_stream (tty_con->infd, 0, -1, 0); Lstream_set_buffering (XLSTREAM (tty_con->instream), LSTREAM_UNBUFFERED, 0); tty_con->instream = make_coding_input_stream (XLSTREAM (tty_con->instream), get_coding_system_for_text_file (Qkeyboard, 0), CODING_DECODE, LSTREAM_FL_READ_ONE_BYTE_AT_A_TIME); Lstream_set_buffering (XLSTREAM (tty_con->instream), LSTREAM_UNBUFFERED, 0); tty_con->outstream = make_filedesc_output_stream (tty_con->outfd, 0, -1, 0); tty_con->outstream = make_coding_output_stream (XLSTREAM (tty_con->outstream), get_coding_system_for_text_file (Qterminal, 0), CODING_ENCODE, 0); tty_con->terminal_type = terminal_type; tty_con->controlling_process = controlling_process; if (NILP (CONSOLE_NAME (con))) CONSOLE_NAME (con) = Ffile_name_nondirectory (tty); { pid_t tty_pg; pid_t controlling_tty_pg; int cfd; /* OK, the only sure-fire way I can think of to determine whether a particular TTY is our controlling TTY is to check if it has the same foreground process group as our controlling TTY. This is OK because a process group can never simultaneously be the foreground process group of two TTY's (in that case it would have two controlling TTY's, which is not allowed). */ EMACS_GET_TTY_PROCESS_GROUP (tty_con->infd, &tty_pg); cfd = qxe_open ((Ibyte *) "/dev/tty", O_RDWR, 0); EMACS_GET_TTY_PROCESS_GROUP (cfd, &controlling_tty_pg); retry_close (cfd); if (tty_pg == controlling_tty_pg) { tty_con->controlling_terminal = 1; Vcontrolling_terminal = wrap_console (con); munge_tty_process_group (); } else tty_con->controlling_terminal = 0; } UNGCPRO; } static void tty_mark_console (struct console *con) { struct tty_console *tty_con = CONSOLE_TTY_DATA (con); mark_object (tty_con->terminal_type); mark_object (tty_con->instream); mark_object (tty_con->outstream); } static int tty_initially_selected_for_input (struct console *con) { return 1; } static void free_tty_console_struct (struct console *con) { struct tty_console *tty_con = CONSOLE_TTY_DATA (con); if (tty_con) { if (tty_con->term_entry_buffer) /* allocated in term_init () */ { xfree (tty_con->term_entry_buffer); tty_con->term_entry_buffer = NULL; } xfree (tty_con); CONSOLE_TTY_DATA (con) = NULL; } } static void tty_delete_console (struct console *con) { Lstream_close (XLSTREAM (CONSOLE_TTY_DATA (con)->instream)); Lstream_close (XLSTREAM (CONSOLE_TTY_DATA (con)->outstream)); if (!CONSOLE_TTY_DATA (con)->is_stdio) retry_close (CONSOLE_TTY_DATA (con)->infd); if (CONSOLE_TTY_DATA (con)->controlling_terminal) { Vcontrolling_terminal = Qnil; unmunge_tty_process_group (); } free_tty_console_struct (con); } static struct console * decode_tty_console (Lisp_Object console) { console = wrap_console (decode_console (console)); CHECK_TTY_CONSOLE (console); return XCONSOLE (console); } DEFUN ("console-tty-terminal-type", Fconsole_tty_terminal_type, 0, 1, 0, /* Return the terminal type of TTY console CONSOLE. */ (console)) { return CONSOLE_TTY_DATA (decode_tty_console (console))->terminal_type; } DEFUN ("console-tty-controlling-process", Fconsole_tty_controlling_process, 0, 1, 0, /* Return the controlling process of tty console CONSOLE. */ (console)) { return CONSOLE_TTY_DATA (decode_tty_console (console))->controlling_process; } DEFUN ("console-tty-input-coding-system", Fconsole_tty_input_coding_system, 0, 1, 0, /* Return the input coding system of tty console CONSOLE. */ (console)) { return coding_stream_detected_coding_system (XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->instream)); } DEFUN ("set-console-tty-input-coding-system", Fset_console_tty_input_coding_system, 0, 2, 0, /* Set the input coding system of tty console CONSOLE to CODESYS. CONSOLE defaults to the selected console. CODESYS defaults to the value of `keyboard-coding-system'. */ (console, codesys)) { set_coding_stream_coding_system (XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->instream), get_coding_system_for_text_file (NILP (codesys) ? Qkeyboard : codesys, 0)); return Qnil; } DEFUN ("console-tty-output-coding-system", Fconsole_tty_output_coding_system, 0, 1, 0, /* Return TTY CONSOLE's output coding system. */ (console)) { return coding_stream_coding_system (XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->outstream)); } DEFUN ("set-console-tty-output-coding-system", Fset_console_tty_output_coding_system, 0, 2, 0, /* Set the coding system of tty output of console CONSOLE to CODESYS. CONSOLE defaults to the selected console. CODESYS defaults to the value of `terminal-coding-system'. */ (console, codesys)) { set_coding_stream_coding_system (XLSTREAM (CONSOLE_TTY_DATA (decode_tty_console (console))->outstream), get_coding_system_for_text_file (NILP (codesys) ? Qterminal : codesys, 0)); /* Redraw tty */ face_property_was_changed (Vdefault_face, Qfont, Qtty); return Qnil; } /* #### Move this function to lisp */ DEFUN ("set-console-tty-coding-system", Fset_console_tty_coding_system, 0, 2, 0, /* Set the input and output coding systems of tty console CONSOLE to CODESYS. CONSOLE defaults to the selected console. If CODESYS is nil, the values of `keyboard-coding-system' and `terminal-coding-system' will be used for the input and output coding systems of CONSOLE. */ (console, codesys)) { Fset_console_tty_input_coding_system (console, codesys); Fset_console_tty_output_coding_system (console, codesys); return Qnil; } Lisp_Object tty_semi_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) { return stream_semi_canonicalize_console_connection (connection, errb); } Lisp_Object tty_canonicalize_console_connection (Lisp_Object connection, Error_Behavior errb) { return stream_canonicalize_console_connection (connection, errb); } Lisp_Object tty_semi_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) { return stream_semi_canonicalize_console_connection (connection, errb); } Lisp_Object tty_canonicalize_device_connection (Lisp_Object connection, Error_Behavior errb) { return stream_canonicalize_console_connection (connection, errb); } /************************************************************************/ /* initialization */ /************************************************************************/ void syms_of_console_tty (void) { DEFSUBR (Fconsole_tty_terminal_type); DEFSUBR (Fconsole_tty_controlling_process); DEFSYMBOL (Qterminal_type); DEFSYMBOL (Qcontrolling_process); DEFSUBR (Fconsole_tty_output_coding_system); DEFSUBR (Fset_console_tty_output_coding_system); DEFSUBR (Fconsole_tty_input_coding_system); DEFSUBR (Fset_console_tty_input_coding_system); DEFSUBR (Fset_console_tty_coding_system); } void console_type_create_tty (void) { INITIALIZE_CONSOLE_TYPE (tty, "tty", "console-tty-p"); /* console methods */ CONSOLE_HAS_METHOD (tty, init_console); CONSOLE_HAS_METHOD (tty, mark_console); CONSOLE_HAS_METHOD (tty, initially_selected_for_input); CONSOLE_HAS_METHOD (tty, delete_console); CONSOLE_HAS_METHOD (tty, canonicalize_console_connection); CONSOLE_HAS_METHOD (tty, canonicalize_device_connection); CONSOLE_HAS_METHOD (tty, semi_canonicalize_console_connection); CONSOLE_HAS_METHOD (tty, semi_canonicalize_device_connection); } void reinit_console_type_create_tty (void) { REINITIALIZE_CONSOLE_TYPE (tty); } void image_instantiator_format_create_glyphs_tty (void) { IIFORMAT_VALID_CONSOLE (tty, nothing); IIFORMAT_VALID_CONSOLE (tty, string); IIFORMAT_VALID_CONSOLE (tty, formatted_string); IIFORMAT_VALID_CONSOLE (tty, inherit); } void vars_of_console_tty (void) { Fprovide (Qtty); }