ryan/cwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use instinsic X11 functions for key/btn/ptr grab/ungrab/regrab requests;

Browse Source 
the one line wrappers provided no value and limited altering calls where
needed; additionally, most of them had but one caller.
This commit is contained in:
okan
2016-09-30 18:28:06 +00:00
parent 8b26a43bf1
commit 2d8f621b8d
5 changed files with 45 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
conf.c
View File

@@ -655,28 +655,48 @@ conf_cursor(struct conf *c)
c->cursor[i] = XCreateFontCursor(X_Dpy, cursor_binds[i]);
}
static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };
void
conf_grab_mouse(Window win)
{
struct binding *mb;
unsigned int i;
xu_btn_ungrab(win);
XUngrabButton(X_Dpy, AnyButton, AnyModifier, win);
TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
if (mb->context == CWM_CONTEXT_CLIENT)
xu_btn_grab(win, mb->modmask, mb->press.button);
if (mb->context != CWM_CONTEXT_CLIENT)
continue;
for (i = 0; i < nitems(ign_mods); i++) {
XGrabButton(X_Dpy, mb->press.button,
(mb->modmask | ign_mods[i]), win, False,
BUTTONMASK, GrabModeAsync, GrabModeSync,
None, None);
}
}
}
void
conf_grab_kbd(Window win)
{
struct binding *kb;
KeyCode kc;
unsigned int i;
xu_key_ungrab(win);
XUngrabKey(X_Dpy, AnyKey, AnyModifier, win);
TAILQ_FOREACH(kb, &Conf.keybindingq, entry)
xu_key_grab(win, kb->modmask, kb->press.keysym);
TAILQ_FOREACH(kb, &Conf.keybindingq, entry) {
kc = XKeysymToKeycode(X_Dpy, kb->press.keysym);
if ((XkbKeycodeToKeysym(X_Dpy, kc, 0, 0) != kb->press.keysym) &&
(XkbKeycodeToKeysym(X_Dpy, kc, 0, 1) == kb->press.keysym))
kb->modmask |= ShiftMask;
for (i = 0; i < nitems(ign_mods); i++)
XGrabKey(X_Dpy, kc, (kb->modmask | ign_mods[i]), win,
True, GrabModeAsync, GrabModeAsync);
}
}
static char *cwmhints[] = {