Commit d35cf493 authored by Paul Reilly's avatar Paul Reilly
Browse files

*** empty log message ***

parent 3beeedfe
...@@ -30,6 +30,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -30,6 +30,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <X11/bitmaps/gray> #include <X11/bitmaps/gray>
#include "xlwmenuP.h" #include "xlwmenuP.h"
static int disable_add_grab, disable_grab_pointer;
static int pointer_grabbed; static int pointer_grabbed;
static XEvent menu_post_event; static XEvent menu_post_event;
...@@ -1446,7 +1448,8 @@ pop_up_menu (mw, event) ...@@ -1446,7 +1448,8 @@ pop_up_menu (mw, event)
{ {
XEvent *ev = (XEvent *) event; XEvent *ev = (XEvent *) event;
XtAddGrab ((Widget) mw, True, True); if (!disable_add_grab)
XtAddGrab ((Widget) mw, True, True);
/* notes the absolute position of the menubar window */ /* notes the absolute position of the menubar window */
mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x; mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x;
...@@ -1456,12 +1459,18 @@ pop_up_menu (mw, event) ...@@ -1456,12 +1459,18 @@ pop_up_menu (mw, event)
#ifdef emacs #ifdef emacs
x_catch_errors (); x_catch_errors ();
#endif #endif
XtGrabPointer ((Widget)mw, False, if (!disable_grab_pointer)
(PointerMotionMask | PointerMotionHintMask | ButtonReleaseMask {
| ButtonPressMask), XtGrabPointer ((Widget)mw, False,
GrabModeAsync, GrabModeAsync, None, mw->menu.cursor_shape, (PointerMotionMask
event->time); | PointerMotionHintMask
pointer_grabbed = 1; | ButtonReleaseMask
| ButtonPressMask),
GrabModeAsync, GrabModeAsync, None,
mw->menu.cursor_shape,
event->time);
pointer_grabbed = 1;
}
#ifdef emacs #ifdef emacs
if (x_had_errors_p ()) if (x_had_errors_p ())
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment