Mercurial > hg > xemacs-beta
annotate netinstall/source.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 | a307f9a2021d |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 673 | 14 * Sync'ed with cinstall 2001-10-16 |
| 448 | 15 */ |
| 16 | |
| 17 /* The purpose of this file is to manage the dialog box that lets the | |
| 18 user choose the source of the install - from the net, from the | |
| 19 current directory, or to just download files. */ | |
| 20 | |
| 21 #include "win32.h" | |
| 22 #include <stdio.h> | |
| 23 #include "dialog.h" | |
| 24 #include "resource.h" | |
| 25 #include "state.h" | |
| 26 #include "msg.h" | |
| 27 #include "log.h" | |
| 28 | |
| 673 | 29 static int rb[] = { IDC_SOURCE_NETINST, IDC_SOURCE_DOWNLOAD, IDC_SOURCE_CWD, 0 }; |
| 448 | 30 |
| 31 static void | |
| 32 load_dialog (HWND h) | |
| 33 { | |
| 34 rbset (h, rb, source); | |
| 35 } | |
| 36 | |
| 37 static void | |
| 38 save_dialog (HWND h) | |
| 39 { | |
| 40 source = rbget (h, rb); | |
| 41 } | |
| 42 | |
| 43 static BOOL | |
| 44 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 45 { | |
| 46 switch (id) | |
| 47 { | |
| 48 | |
| 49 case IDC_SOURCE_DOWNLOAD: | |
| 50 case IDC_SOURCE_NETINST: | |
| 51 case IDC_SOURCE_CWD: | |
| 52 save_dialog (h); | |
| 53 break; | |
| 54 | |
| 55 case IDOK: | |
| 56 save_dialog (h); | |
| 57 NEXT (IDD_LOCAL_DIR); | |
| 58 break; | |
| 59 | |
| 60 case IDC_BACK: | |
| 61 save_dialog (h); | |
| 62 NEXT (0); | |
| 63 break; | |
| 64 | |
| 65 case IDCANCEL: | |
| 66 NEXT (0); | |
| 67 break; | |
| 673 | 68 |
| 69 default: | |
| 70 break; | |
| 448 | 71 } |
| 72 } | |
| 73 | |
| 74 static BOOL CALLBACK | |
| 75 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 76 { | |
| 77 switch (message) | |
| 78 { | |
| 79 case WM_INITDIALOG: | |
| 80 load_dialog (h); | |
| 673 | 81 // Check to see if any radio buttons are selected. If not, select a default. |
| 82 if ((!SendMessage(GetDlgItem (h, IDC_SOURCE_DOWNLOAD), BM_GETCHECK, 0, 0) == BST_CHECKED) | |
| 83 && (!SendMessage(GetDlgItem (h, IDC_SOURCE_CWD), BM_GETCHECK, 0, 0) == BST_CHECKED)) | |
| 84 { | |
| 85 SendMessage(GetDlgItem (h, IDC_SOURCE_NETINST), BM_SETCHECK, BST_CHECKED, 0); | |
| 86 } | |
| 448 | 87 return FALSE; |
| 88 case WM_COMMAND: | |
| 89 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 90 } | |
| 91 return FALSE; | |
| 92 } | |
| 93 | |
| 94 void | |
| 95 do_source (HINSTANCE h) | |
| 96 { | |
| 97 int rv = 0; | |
| 673 | 98 /* source = IDC_SOURCE_CWD;*/ |
| 99 source = IDC_SOURCE_NETINST; | |
| 448 | 100 rv = DialogBox (h, MAKEINTRESOURCE (IDD_SOURCE), 0, dialog_proc); |
| 101 if (rv == -1) | |
| 102 fatal (IDS_DIALOG_FAILED); | |
| 103 | |
| 104 log (0, "source: %s", | |
| 105 (source == IDC_SOURCE_DOWNLOAD) ? "download" : | |
| 106 (source == IDC_SOURCE_NETINST) ? "network install" : "from cwd"); | |
| 107 } | |
| 108 |
