diff options
author | okan <okan> | 2016-09-30 18:28:06 +0000 |
---|---|---|
committer | okan <okan> | 2016-09-30 18:28:06 +0000 |
commit | 2d8f621b8d285b1cf8e29feb383fa2268e57ee5a (patch) | |
tree | 411cf317c0c58cf39c2503d99c89913d6ee3c11d /xutil.c | |
parent | 8b26a43bf17b3834de3127408e7274e8effc9beb (diff) | |
download | cwm-2d8f621b8d285b1cf8e29feb383fa2268e57ee5a.tar.gz cwm-2d8f621b8d285b1cf8e29feb383fa2268e57ee5a.tar.xz cwm-2d8f621b8d285b1cf8e29feb383fa2268e57ee5a.zip |
Use instinsic X11 functions for key/btn/ptr grab/ungrab/regrab requests;
the one line wrappers provided no value and limited altering calls where needed; additionally, most of them had but one caller.
Diffstat (limited to 'xutil.c')
-rw-r--r-- | xutil.c | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/xutil.c b/xutil.c index 39639ef..cd7dfb9 100644 --- a/xutil.c +++ b/xutil.c @@ -31,68 +31,6 @@ #include "calmwm.h" -static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask }; - -void -xu_btn_grab(Window win, int mask, unsigned int btn) -{ - unsigned int i; - - for (i = 0; i < nitems(ign_mods); i++) - XGrabButton(X_Dpy, btn, (mask | ign_mods[i]), win, - False, BUTTONMASK, GrabModeAsync, - GrabModeSync, None, None); -} - -void -xu_btn_ungrab(Window win) -{ - XUngrabButton(X_Dpy, AnyButton, AnyModifier, win); -} - -void -xu_key_grab(Window win, unsigned int mask, KeySym keysym) -{ - KeyCode code; - unsigned int i; - - code = XKeysymToKeycode(X_Dpy, keysym); - if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) && - (XkbKeycodeToKeysym(X_Dpy, code, 0, 1) == keysym)) - mask |= ShiftMask; - - for (i = 0; i < nitems(ign_mods); i++) - XGrabKey(X_Dpy, code, (mask | ign_mods[i]), win, - True, GrabModeAsync, GrabModeAsync); -} - -void -xu_key_ungrab(Window win) -{ - XUngrabKey(X_Dpy, AnyKey, AnyModifier, win); -} - -int -xu_ptr_grab(Window win, unsigned int mask, Cursor curs) -{ - return(XGrabPointer(X_Dpy, win, False, mask, - GrabModeAsync, GrabModeAsync, - None, curs, CurrentTime) == GrabSuccess ? 0 : -1); -} - -int -xu_ptr_regrab(unsigned int mask, Cursor curs) -{ - return(XChangeActivePointerGrab(X_Dpy, mask, - curs, CurrentTime) == GrabSuccess ? 0 : -1); -} - -void -xu_ptr_ungrab(void) -{ - XUngrabPointer(X_Dpy, CurrentTime); -} - void xu_ptr_getpos(Window win, int *x, int *y) { |