Mercurial > hg > xemacs-beta
view src/frame-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 | 79c6ff3eef26 |
children | 04bc9d2f42c7 |
line wrap: on
line source
/* TTY frame functions. Copyright (C) 1995, 1997 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 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. */ /* Written by Ben Wing. Multi-frame support added by Hrvoje Niksic. */ #include <config.h> #include "lisp.h" #include "device-impl.h" #include "events.h" #include "frame-impl.h" #include "console-tty-impl.h" /* Default properties to use when creating frames. */ Lisp_Object Vdefault_tty_frame_plist; Lisp_Object Qframe_number; static void tty_raise_frame (struct frame *); static void tty_init_frame_1 (struct frame *f, Lisp_Object props, int frame_name_is_defaulted) { struct device *d = XDEVICE (FRAME_DEVICE (f)); struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); ++CONSOLE_TTY_DATA (c)->frame_count; f->order_count = CONSOLE_TTY_DATA (c)->frame_count; f->height = CONSOLE_TTY_DATA (c)->height; f->width = CONSOLE_TTY_DATA (c)->width; if (frame_name_is_defaulted) f->name = emacs_sprintf_string ("F%d", f->order_count); } static void tty_init_frame_3 (struct frame *f) { tty_raise_frame (f); } static void tty_select_frame_if_unhidden (Lisp_Object frame) { if (FRAME_REPAINT_P (XFRAME (frame))) select_frame_1 (frame); } static void tty_schedule_frame_select (struct frame *f) { Lisp_Object frame = wrap_frame (f); enqueue_magic_eval_event (tty_select_frame_if_unhidden, frame); } static void tty_after_init_frame (struct frame *f, int first_on_device, int first_on_console) { if (first_on_console) call1 (Qinit_post_tty_win, FRAME_CONSOLE (f)); } /* Change from withdrawn state to mapped state. */ static void tty_make_frame_visible (struct frame *f) { if (!FRAME_VISIBLE_P (f)) { f->visible = -1; } } /* Change from mapped state to withdrawn state. */ static void tty_make_frame_invisible (struct frame *f) { f->visible = 0; } static void tty_make_frame_hidden (struct frame *f) { f->visible = -1; } static void tty_make_frame_unhidden (struct frame *f) { if (!FRAME_REPAINT_P (f)) { SET_FRAME_CLEAR (f); f->visible = 1; } } static int tty_frame_visible_p (struct frame *f) { return FRAME_VISIBLE_P (f); } static void tty_raise_frame_no_select (struct frame *f) { LIST_LOOP_2 (frame, DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f)))) { struct frame *o = XFRAME (frame); if (o != f && FRAME_REPAINT_P (o)) { tty_make_frame_hidden (o); break; } } tty_make_frame_unhidden (f); } static void tty_raise_frame (struct frame *f) { tty_raise_frame_no_select (f); tty_schedule_frame_select (f); } static void tty_lower_frame (struct frame *f) { Lisp_Object frame_list = DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f))); Lisp_Object tail, new; if (!FRAME_REPAINT_P (f)) return; LIST_LOOP (tail, frame_list) { if (f == XFRAME (XCAR (tail))) break; } /* To lower this frame, another frame has to be raised. Return if there is no other frame. */ if (NILP (tail) && EQ (frame_list, tail)) return; tty_make_frame_hidden (f); if (CONSP (XCDR (tail))) new = XCAR (XCDR (tail)); else new = XCAR (frame_list); tty_make_frame_unhidden (XFRAME (new)); tty_schedule_frame_select (XFRAME (new)); } static void tty_delete_frame (struct frame *f) { struct device *d = XDEVICE (FRAME_DEVICE (f)); if (!NILP (DEVICE_SELECTED_FRAME (d))) tty_raise_frame (XFRAME (DEVICE_SELECTED_FRAME (d))); } static Lisp_Object tty_frame_property (struct frame *f, Lisp_Object property) { if (EQ (Qframe_number, property)) return make_int (f->order_count); return Qunbound; } static int tty_internal_frame_property_p (struct frame *f, Lisp_Object property) { return EQ (property, Qframe_number); } static Lisp_Object tty_frame_properties (struct frame *f) { Lisp_Object props = Qnil; props = cons3 (Qframe_number, make_int (f->order_count), props); return props; } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_frame_tty (void) { CONSOLE_HAS_METHOD (tty, init_frame_1); CONSOLE_HAS_METHOD (tty, init_frame_3); CONSOLE_HAS_METHOD (tty, after_init_frame); CONSOLE_HAS_METHOD (tty, make_frame_visible); CONSOLE_HAS_METHOD (tty, make_frame_invisible); CONSOLE_HAS_METHOD (tty, frame_visible_p); CONSOLE_HAS_METHOD (tty, raise_frame); CONSOLE_HAS_METHOD (tty, lower_frame); CONSOLE_HAS_METHOD (tty, delete_frame); CONSOLE_HAS_METHOD (tty, frame_property); CONSOLE_HAS_METHOD (tty, internal_frame_property_p); CONSOLE_HAS_METHOD (tty, frame_properties); } void syms_of_frame_tty (void) { DEFSYMBOL (Qframe_number); } void vars_of_frame_tty (void) { DEFVAR_LISP ("default-tty-frame-plist", &Vdefault_tty_frame_plist /* Plist of default frame-creation properties for tty frames. These are in addition to and override what is specified in `default-frame-plist', but are overridden by the arguments to the particular call to `make-frame'. */ ); Vdefault_tty_frame_plist = Qnil; tty_console_methods->device_specific_frame_props = &Vdefault_tty_frame_plist; /* Tty frames are now supported. Advertise a feature to indicate this. */ Fprovide (intern ("tty-frames")); }