Updating branch refs/heads/master to 7c095f5fcf887ee068dd170bfb89aeb24ef23307 (commit) from b51f4b916a96860fb4e9d68c75f05ca938699036 (commit)
commit 7c095f5fcf887ee068dd170bfb89aeb24ef23307 Author: Olivier Fourdan <four...@xfce.org> Date: Mon Dec 19 20:18:18 2011 +0100 Add PointerMotionMask to event mask src/keyboard.c | 24 +++++++++++++++--------- src/moveresize.c | 1 + 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/keyboard.c b/src/keyboard.c index ab911ec..fa35265 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -58,6 +58,12 @@ unsigned int ScrollLockMask; unsigned int SuperMask; unsigned int HyperMask; +#define BUTTON_GRAB_MASK \ + ButtonPressMask | \ + ButtonReleaseMask | \ + PointerMotionMask | \ + PointerMotionHintMask + static KeyCode getKeycode (Display *dpy, const char *str) { @@ -191,7 +197,7 @@ grabButton (Display * dpy, int button, int modifier, Window w) { status |= XGrabButton (dpy, button, AnyModifier, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); } else @@ -200,42 +206,42 @@ grabButton (Display * dpy, int button, int modifier, Window w) status |= XGrabButton (dpy, button, modifier, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); status |= XGrabButton (dpy, button, modifier | ScrollLockMask, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); status |= XGrabButton (dpy, button, modifier | NumLockMask, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); status |= XGrabButton (dpy, button, modifier | LockMask, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); status |= XGrabButton (dpy, button, modifier | ScrollLockMask | NumLockMask, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); status |= XGrabButton (dpy, button, modifier | ScrollLockMask | LockMask, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); status |= XGrabButton (dpy, button, modifier | LockMask | NumLockMask, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); status |= XGrabButton (dpy, button, modifier | ScrollLockMask | LockMask | NumLockMask, w, FALSE, - ButtonPressMask|ButtonReleaseMask, GrabModeSync, GrabModeAsync, + BUTTON_GRAB_MASK, GrabModeSync, GrabModeAsync, None, None); } diff --git a/src/moveresize.c b/src/moveresize.c index 110d13e..3f69c1b 100644 --- a/src/moveresize.c +++ b/src/moveresize.c @@ -51,6 +51,7 @@ #define MOVERESIZE_EVENT_MASK \ PointerMotionMask | \ + PointerMotionHintMask | \ ButtonMotionMask | \ ButtonReleaseMask | \ LeaveWindowMask _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits