Mercurial > hg > xemacs-beta
annotate src/menubar.h @ 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 | cd0abfdb9e9d |
rev | line source |
---|---|
428 | 1 /* Define generic menubar support. |
2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: Not in FSF. */ | |
22 | |
442 | 23 /* #### Still needs some device-abstraction work. */ |
428 | 24 |
440 | 25 #ifndef INCLUDED_menubar_h_ |
26 #define INCLUDED_menubar_h_ | |
428 | 27 |
28 #ifdef HAVE_MENUBARS | |
29 #include "gui.h" | |
30 void update_frame_menubars (struct frame *f); | |
31 void free_frame_menubars (struct frame *f); | |
32 Lisp_Object menu_parse_submenu_keywords (Lisp_Object desc, | |
33 Lisp_Object gui_item); | |
872 | 34 Lisp_Object current_frame_menubar (const struct frame *f); |
428 | 35 |
36 EXFUN (Fmenu_find_real_submenu, 2); | |
37 | |
442 | 38 extern Lisp_Object Vmenu_accelerator_prefix; |
39 extern Lisp_Object Vmenu_accelerator_modifiers; | |
40 extern Lisp_Object Vmenu_accelerator_enabled; | |
41 extern Lisp_Object Vmenu_accelerator_map; | |
42 | |
43 extern Lisp_Object Qmenu_force; | |
44 extern Lisp_Object Qmenu_fallback; | |
45 | |
46 extern Lisp_Object Qmenu_quit; | |
47 extern Lisp_Object Qmenu_up; | |
48 extern Lisp_Object Qmenu_down; | |
49 extern Lisp_Object Qmenu_left; | |
50 extern Lisp_Object Qmenu_right; | |
51 extern Lisp_Object Qmenu_select; | |
52 extern Lisp_Object Qmenu_escape; | |
53 | |
54 | |
55 /* #### kluuuuuuuuuuuuuuuuuuuuuuuuuuuudge! | |
56 The author of the accelerator code didn't know what the hell he was doing. | |
57 Someone needs to abstract this properly. */ | |
872 | 58 #if defined (HAVE_X_WINDOWS) && defined (LWLIB_MENUBARS_LUCID) |
442 | 59 extern int x_kludge_lw_menu_active (void); |
60 struct command_builder; | |
61 Lisp_Object command_builder_find_menu_accelerator (struct command_builder | |
62 *builder); | |
63 Lisp_Object command_builder_operate_menu_accelerator (struct command_builder | |
64 *builder); | |
65 #endif | |
66 | |
872 | 67 extern int popup_menu_up_p; |
68 extern int menubar_show_keybindings; | |
69 extern int popup_menu_titles; | |
70 | |
428 | 71 #endif /* HAVE_MENUBARS */ |
72 | |
440 | 73 #endif /* INCLUDED_menubar_h_ */ |