annotate netinstall/msg.cc @ 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 685b588e92d8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* The purpose of this file is to centralize all the message
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 functions. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include <stdio.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <stdarg.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include "dialog.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #include "log.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 msg (char *fmt, ...)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 char buf[1000];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 va_list args;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 va_start (args, fmt);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 vsprintf (buf, fmt, args);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 OutputDebugString (buf);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 static int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 mbox (char *name, int type, int id, va_list args)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 char buf[1000], fmt[1000];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 if (LoadString (hinstance, id, fmt, sizeof (fmt)) <= 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 ExitProcess (0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 vsprintf (buf, fmt, args);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 log (0, "mbox %s: %s", name, buf);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 return MessageBox (0, buf, "XEmacs Setup", type | MB_TOPMOST);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 note (int id, ...)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 va_list args;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 va_start (args, id);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 mbox ("note", 0, id, args);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 fatal (int id, ...)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 va_list args;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 va_start (args, id);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 mbox ("fatal", 0, id, args);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 exit_setup (1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 yesno (int id, ...)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 va_list args;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 va_start (args, id);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 return mbox ("yesno", MB_YESNO, id, args);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 }