Mercurial > hg > xemacs-beta
comparison src/cmdloop.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 | f561c3904bb3 |
comparison
equal
deleted
inserted
replaced
1267:c57f32e44416 | 1268:fffe735e63ee |
---|---|
236 | 236 |
237 /* Avoid confusing the compiler. A helper function for command_loop_2 */ | 237 /* Avoid confusing the compiler. A helper function for command_loop_2 */ |
238 static DOESNT_RETURN | 238 static DOESNT_RETURN |
239 command_loop_3 (void) | 239 command_loop_3 (void) |
240 { | 240 { |
241 #ifdef LWLIB_MENUBARS_LUCID | |
242 extern int in_menu_callback; /* defined in menubar-x.c */ | |
243 #endif /* LWLIB_MENUBARS_LUCID */ | |
244 | |
245 #ifdef LWLIB_MENUBARS_LUCID | |
246 /* | 241 /* |
247 * #### Fix the menu code so this isn't necessary. | 242 * If we are inside of a menu callback we cannot reenter the command loop |
248 * | 243 * because we will deadlock, as no input is allowed. |
249 * We cannot allow the lwmenu code to be reentered, because the | |
250 * code is not written to be reentrant and will crash. Therefore | |
251 * paths from the menu callbacks back into the menu code have to | |
252 * be blocked. Fnext_event is the normal path into the menu code, | |
253 * but waiting to signal an error there is too late in case where | |
254 * a new command loop has been started. The error will be caught | |
255 * and Fnext_event will be called again, looping forever. So we | |
256 * signal an error here to avoid the loop. | |
257 */ | 244 */ |
258 if (in_menu_callback) | 245 if (in_modal_loop) |
259 invalid_operation ("Attempt to enter command_loop_3 inside menu callback", Qunbound); | 246 invalid_operation ("Attempt to enter command loop inside menu callback", |
260 #endif /* LWLIB_MENUBARS_LUCID */ | 247 Qunbound); |
261 /* This function can GC */ | 248 /* This function can GC */ |
262 for (;;) | 249 for (;;) |
263 { | 250 { |
264 condition_case_1 (Qerror, command_loop_1, Qnil, cmd_error, Qnil); | 251 condition_case_1 (Qerror, command_loop_1, Qnil, cmd_error, Qnil); |
265 /* #### wrong with selected-console? */ | 252 /* #### wrong with selected-console? */ |