comparison src/redisplay.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 cd0abfdb9e9d
comparison
equal deleted inserted replaced
1267:c57f32e44416 1268:fffe735e63ee
1 /* Display generation from window structure and buffer text. 1 /* Display generation from window structure and buffer text.
2 Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois. 2 Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois.
3 Copyright (C) 1995 Free Software Foundation, Inc. 3 Copyright (C) 1995 Free Software Foundation, Inc.
4 Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing. 4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing.
5 Copyright (C) 1995 Sun Microsystems, Inc. 5 Copyright (C) 1995 Sun Microsystems, Inc.
6 Copyright (C) 1996 Chuck Thompson. 6 Copyright (C) 1996 Chuck Thompson.
7 7
8 This file is part of XEmacs. 8 This file is part of XEmacs.
9 9
312 static void sledgehammer_check_redisplay_structs (void); 312 static void sledgehammer_check_redisplay_structs (void);
313 #endif /* ERROR_CHECK_DISPLAY */ 313 #endif /* ERROR_CHECK_DISPLAY */
314 314
315 /* This used to be 10 but 30 seems to give much better performance. */ 315 /* This used to be 10 but 30 seems to give much better performance. */
316 #define INIT_MAX_PREEMPTS 30 316 #define INIT_MAX_PREEMPTS 30
317 static int max_preempts; 317 static Fixnum max_preempts;
318
319 #define QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION 4
318 320
319 #define REDISPLAY_PREEMPTION_CHECK \ 321 #define REDISPLAY_PREEMPTION_CHECK \
320 ((void) \ 322 ((void) \
321 (preempted = \ 323 (preempted = \
322 (!disable_preemption && \ 324 (!disable_preemption && \
323 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \ 325 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
324 (!INTERACTIVE || detect_input_pending ())))) 326 (!INTERACTIVE || \
327 detect_input_pending (QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION)))))
325 328
326 /* 329 /*
327 * Redisplay global variables. 330 * Redisplay global variables.
328 */ 331 */
329 332
9604 void 9607 void
9605 init_redisplay (void) 9608 init_redisplay (void)
9606 { 9609 {
9607 disable_preemption = 0; 9610 disable_preemption = 0;
9608 preemption_count = 0; 9611 preemption_count = 0;
9609 max_preempts = INIT_MAX_PREEMPTS;
9610 9612
9611 #ifndef PDUMP 9613 #ifndef PDUMP
9612 if (!initialized) 9614 if (!initialized)
9613 #endif 9615 #endif
9614 { 9616 {
9732 \(Temporary) Setting this will impact the performance of the internal 9734 \(Temporary) Setting this will impact the performance of the internal
9733 line start cache. 9735 line start cache.
9734 */ ); 9736 */ );
9735 cache_adjustment = 2; 9737 cache_adjustment = 2;
9736 9738
9739 DEFVAR_INT ("maximum-preempts", &max_preempts /*
9740 Maximum number of times redisplay can be preempted by user input.
9741 */ );
9742 max_preempts = INIT_MAX_PREEMPTS;
9743
9737 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /* 9744 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
9738 Minimum pixel height for clipped bottom display line. 9745 Minimum pixel height for clipped bottom display line.
9739 A clipped line shorter than this won't be displayed. 9746 A clipped line shorter than this won't be displayed.
9740 */ , 9747 */ ,
9741 redisplay_variable_changed); 9748 redisplay_variable_changed);