Mercurial > hg > xemacs-beta
comparison src/menubar-msw.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 |
---|---|
712 | 712 |
713 /*------------------------------------------------------------------------*/ | 713 /*------------------------------------------------------------------------*/ |
714 /* Message handling proxies */ | 714 /* Message handling proxies */ |
715 /*------------------------------------------------------------------------*/ | 715 /*------------------------------------------------------------------------*/ |
716 | 716 |
717 static HMENU wm_initmenu_menu; | 717 struct handle_wm_initmenu |
718 static struct frame *wm_initmenu_frame; | 718 { |
719 HMENU menu; | |
720 struct frame *frame; | |
721 }; | |
719 | 722 |
720 static Lisp_Object | 723 static Lisp_Object |
721 unsafe_handle_wm_initmenupopup (Lisp_Object u_n_u_s_e_d) | 724 unsafe_handle_wm_initmenupopup (void *arg) |
722 { | 725 { |
723 return unsafe_handle_wm_initmenupopup_1 (wm_initmenu_menu, wm_initmenu_frame); | 726 struct handle_wm_initmenu *z = (struct handle_wm_initmenu *) arg; |
727 return unsafe_handle_wm_initmenupopup_1 (z->menu, z->frame); | |
724 } | 728 } |
725 | 729 |
726 static Lisp_Object | 730 static Lisp_Object |
727 unsafe_handle_wm_initmenu (Lisp_Object u_n_u_s_e_d) | 731 unsafe_handle_wm_initmenu (void *arg) |
728 { | 732 { |
729 return unsafe_handle_wm_initmenu_1 (wm_initmenu_frame); | 733 struct handle_wm_initmenu *z = (struct handle_wm_initmenu *) arg; |
734 return unsafe_handle_wm_initmenu_1 (z->frame); | |
730 } | 735 } |
731 | 736 |
732 Lisp_Object | 737 Lisp_Object |
733 mswindows_handle_wm_initmenupopup (HMENU hmenu, struct frame *frm) | 738 mswindows_handle_wm_initmenupopup (HMENU hmenu, struct frame *frm) |
734 { | 739 { |
735 /* We cannot pass hmenu as a lisp object. Use static var */ | 740 struct handle_wm_initmenu z; |
736 wm_initmenu_menu = hmenu; | 741 |
737 wm_initmenu_frame = frm; | 742 z.menu = hmenu; |
738 /* Allow runaway filter code, e.g. custom, to be aborted. We are | 743 z.frame = frm; |
744 | |
745 /* [[ Allow runaway filter code, e.g. custom, to be aborted. We are | |
739 usually called from next_event_internal(), which has turned off | 746 usually called from next_event_internal(), which has turned off |
740 quit checking to read the C-g as an event. */ | 747 quit checking to read the C-g as an event.]] |
741 return mswindows_protect_modal_loop ("Error during menu handling", | 748 |
742 unsafe_handle_wm_initmenupopup, Qnil, | 749 #### This is bogus because by the very act of calling |
743 UNINHIBIT_QUIT); | 750 event_stream_protect_modal_loop(), we disable event retrieval! */ |
751 return event_stream_protect_modal_loop ("Error during menu handling", | |
752 unsafe_handle_wm_initmenupopup, &z, | |
753 UNINHIBIT_QUIT); | |
744 } | 754 } |
745 | 755 |
746 Lisp_Object | 756 Lisp_Object |
747 mswindows_handle_wm_initmenu (HMENU hmenu, struct frame *f) | 757 mswindows_handle_wm_initmenu (HMENU hmenu, struct frame *f) |
748 { | 758 { |
749 /* Handle only frame menubar, ignore if from popup or system menu */ | 759 /* Handle only frame menubar, ignore if from popup or system menu */ |
750 if (GetMenu (FRAME_MSWINDOWS_HANDLE (f)) == hmenu) | 760 if (GetMenu (FRAME_MSWINDOWS_HANDLE (f)) == hmenu) |
751 { | 761 { |
752 wm_initmenu_frame = f; | 762 struct handle_wm_initmenu z; |
753 return mswindows_protect_modal_loop ("Error during menu handling", | 763 |
754 unsafe_handle_wm_initmenu, Qnil, | 764 z.frame = f; |
755 UNINHIBIT_QUIT); | 765 return event_stream_protect_modal_loop ("Error during menu handling", |
766 unsafe_handle_wm_initmenu, &z, | |
767 UNINHIBIT_QUIT); | |
756 } | 768 } |
757 return Qt; | 769 return Qt; |
758 } | 770 } |
759 | 771 |
760 | 772 |