diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-05-26 22:47:07 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-05-26 22:47:07 +0000 |
| commit | c25ee48b24aec3cfc6a4b5a88d5b39b369dc2226 (patch) | |
| tree | 6c3fdc5f2a442f79f56bc351f0003def5704ccc8 /src/xmenu.c | |
| parent | 0272f8a41c58e017d1715d87c68bc93a225db034 (diff) | |
| download | emacs-c25ee48b24aec3cfc6a4b5a88d5b39b369dc2226.tar.gz | |
(popup_get_selection): Force deactivation if key pressed.
New arg `id'.
(xdialog_show, xmenu_show): Pass new arg to popup_get_selection.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index c403438e99c..b29dd64b0a7 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1042,13 +1042,14 @@ on the left of the dialog box and all following items on the right.\n\ /* Loop in Xt until the menu pulldown or dialog popup has been popped down (deactivated). - NOTE: All calls to popup_get_selection() should be protected + NOTE: All calls to popup_get_selection should be protected with BLOCK_INPUT, UNBLOCK_INPUT wrappers. */ void -popup_get_selection (initial_event, dpyinfo) +popup_get_selection (initial_event, dpyinfo, id) XEvent *initial_event; struct x_display_info *dpyinfo; + LWLIB_ID id; { XEvent event; @@ -1077,6 +1078,15 @@ popup_get_selection (initial_event, dpyinfo) else if (event.type == ButtonRelease && dpyinfo->display == event.xbutton.display) dpyinfo->grabbed &= ~(1 << event.xbutton.button); + /* If the user presses a key, deactivate the menu. + The user is likely to do that if we get wedged. */ + else if (event.type == KeyPress + && dpyinfo->display == event.xbutton.display) + { + lw_destroy_all_widgets (id); + popup_activated_flag = 0; + break; + } /* Queue all events not for this popup, except for Expose, which we've already handled. @@ -1847,7 +1857,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) popup_activated_flag = 1; /* Process events that apply to the menu. */ - popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f)); + popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id); #if 0 /* fp turned off the following statement and wrote a comment @@ -2065,7 +2075,7 @@ xdialog_show (f, keymaps, title, error) popup_activated_flag = 1; /* Process events that apply to the menu. */ - popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f)); + popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), dialog_id); /* Find the selected item, and its pane, to return the proper value. */ |