diff options
| author | Richard M. Stallman <[email protected]> | 1994-07-07 19:24:56 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 1994-07-07 19:24:56 +0000 |
| commit | a51b963cea1190c7b05d2c11c3ebe8f5dd6377a1 (patch) | |
| tree | 60e0577e484beba51972e5685d90a4e1e3f7246c /src/xmenu.c | |
| parent | 9926ab6410cd0a4bdb54a0b51664c353b4193ccc (diff) | |
(xmenu_show) {USE_X_TOOLKIT}: ButtonPress no longer pops
down; instead it forces the next ButtonRelease to exit. Don't
dispatch on ButtonPress events.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index f5121e2bfe..12b76516e8 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1416,6 +1416,7 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error) Position root_x, root_y; int first_pane; + int next_release_must_exit = 0; *error = NULL; @@ -1655,16 +1656,27 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error) Vmouse_depressed = Qnil; } if (! (menu_item_selection == 0 + && !next_release_must_exit && (((XButtonEvent *) (&event))->time - last_event_timestamp < XINT (Vdouble_click_time)))) break; + /* Don't call XtDispatchEvent again for the same event! */ + continue; } else if (event.type == ButtonPress) { + next_release_must_exit = 1; +#if 0 + XtDispatchEvent (&event); /* Any mouse button activity that doesn't select in the menu should unpost the menu. */ if (menu_item_selection == 0) break; +#endif + /* Don't call XtDispatchEvent for the down event. + Doing so seems to give strange results + when you click on the menu bar while a menu is posted. */ + continue; } else if (event.type == KeyPress) { |