Mercurial > hg > xemacs-beta
annotate src/toolbar-x.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 | c15f25529e61 |
children | 04bc9d2f42c7 |
rev | line source |
---|---|
428 | 1 /* toolbar implementation -- X interface. |
2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
3 Copyright (C) 1995 Sun Microsystems, Inc. | |
4 Copyright (C) 1995, 1996 Ben Wing. | |
5 Copyright (C) 1996 Chuck Thompson. | |
6 | |
7 This file is part of XEmacs. | |
8 | |
9 XEmacs is free software; you can redistribute it and/or modify it | |
10 under the terms of the GNU General Public License as published by the | |
11 Free Software Foundation; either version 2, or (at your option) any | |
12 later version. | |
13 | |
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
17 for more details. | |
18 | |
19 You should have received a copy of the GNU General Public License | |
20 along with XEmacs; see the file COPYING. If not, write to | |
21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 Boston, MA 02111-1307, USA. */ | |
23 | |
24 /* Synched up with: Not in FSF. */ | |
25 | |
442 | 26 /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-8-00. */ |
27 | |
428 | 28 #include <config.h> |
29 #include "lisp.h" | |
30 | |
31 #include "faces.h" | |
872 | 32 #include "frame-impl.h" |
428 | 33 #include "toolbar.h" |
34 #include "window.h" | |
35 | |
744 | 36 #include "toolbar-common.h" |
428 | 37 |
872 | 38 #include "console-x-impl.h" |
39 #include "glyphs-x.h" | |
40 #include "objects-x.h" | |
41 | |
42 #include "EmacsFrame.h" | |
43 #include "EmacsFrameP.h" | |
44 | |
744 | 45 /* We should really create a 'common' console type and fill it with |
46 ** all the shared code. We would then just use | |
47 ** CONSOLE_INHERITS_METHOD(x,common,blah) | |
48 */ | |
49 #define x_output_frame_toolbars common_output_frame_toolbars | |
50 #define x_output_toolbar_button common_output_toolbar_button | |
51 #define x_redraw_exposed_toolbars common_redraw_exposed_toolbars | |
52 #define x_redraw_frame_toolbars common_redraw_frame_toolbars | |
905 | 53 #define x_clear_frame_toolbars common_clear_frame_toolbars |
428 | 54 |
55 static void | |
56 x_initialize_frame_toolbars (struct frame *f) | |
57 { | |
58 EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); | |
59 | |
60 if (ef->emacs_frame.toolbar_shadow_thickness < MINIMUM_SHADOW_THICKNESS) | |
61 Xt_SET_VALUE (FRAME_X_TEXT_WIDGET (f), | |
62 XtNtoolBarShadowThickness, MINIMUM_SHADOW_THICKNESS); | |
63 } | |
64 | |
65 /* This only calls one function but we go ahead and create this in | |
66 case we ever do decide that we need to do more work. */ | |
67 static void | |
68 x_free_frame_toolbars (struct frame *f) | |
69 { | |
70 } | |
71 | |
72 | |
73 /************************************************************************/ | |
74 /* initialization */ | |
75 /************************************************************************/ | |
76 | |
77 void | |
78 console_type_create_toolbar_x (void) | |
79 { | |
80 CONSOLE_HAS_METHOD (x, output_frame_toolbars); | |
905 | 81 CONSOLE_HAS_METHOD (x, clear_frame_toolbars); |
428 | 82 CONSOLE_HAS_METHOD (x, initialize_frame_toolbars); |
83 CONSOLE_HAS_METHOD (x, free_frame_toolbars); | |
84 CONSOLE_HAS_METHOD (x, output_toolbar_button); | |
85 CONSOLE_HAS_METHOD (x, redraw_exposed_toolbars); | |
86 CONSOLE_HAS_METHOD (x, redraw_frame_toolbars); | |
87 } |