p
/
desktop-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwmstatus: make use of IgnoreLockMods

This commit is contained in:
Přemysl Eric Janouch 2016-02-11 01:01:58 +01:00
parent ccf7c7f7e1
commit 694f9f29a6
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dwmstatus.c
View File

@ -2724,19 +2724,15 @@ get_numlock_mask (struct app_context *ctx)
return result; return result;
} }
#define CLEANMASK(mask) (mask & ~(numlock_mask | LockMask))
static void static void
on_x_keypress (struct app_context *ctx, XEvent *e) on_x_keypress (struct app_context *ctx, XEvent *e)
{ {
unsigned numlock_mask = get_numlock_mask (ctx);
XKeyEvent *ev = &e->xkey; XKeyEvent *ev = &e->xkey;
KeySym keysym = XkbKeycodeToKeysym (ctx->dpy, (KeyCode) ev->keycode, KeySym keysym = XkbKeycodeToKeysym (ctx->dpy, (KeyCode) ev->keycode,
0, !!(ev->state & ShiftMask)); 0, !!(ev->state & ShiftMask));
for (size_t i = 0; i < N_ELEMENTS (g_keys); i++) for (size_t i = 0; i < N_ELEMENTS (g_keys); i++)
if (keysym == g_keys[i].keysym if (keysym == g_keys[i].keysym
&& CLEANMASK (g_keys[i].mod) == CLEANMASK (ev->state) && g_keys[i].mod == ev->state
&& g_keys[i].handler) && g_keys[i].handler)
g_keys[i].handler (ctx, g_keys[i].arg); g_keys[i].handler (ctx, g_keys[i].arg);
} }
@ -2760,16 +2756,15 @@ on_x_ready (const struct pollfd *pfd, void *user_data)
static void static void
grab_keys (struct app_context *ctx) grab_keys (struct app_context *ctx)
{ {
unsigned numlock_mask = get_numlock_mask (ctx); unsigned ignored_locks = LockMask | get_numlock_mask (ctx);
unsigned modifiers[] = hard_assert (XkbSetIgnoreLockMods
{ 0, LockMask, numlock_mask, numlock_mask | LockMask }; (ctx->dpy, XkbUseCoreKbd, ignored_locks, ignored_locks, 0, 0));
KeyCode code; KeyCode code;
Window root = DefaultRootWindow (ctx->dpy); Window root = DefaultRootWindow (ctx->dpy);
for (size_t i = 0; i < N_ELEMENTS (g_keys); i++) for (size_t i = 0; i < N_ELEMENTS (g_keys); i++)
if ((code = XKeysymToKeycode (ctx->dpy, g_keys[i].keysym))) if ((code = XKeysymToKeycode (ctx->dpy, g_keys[i].keysym)))
for (size_t j = 0; j < N_ELEMENTS (modifiers); j++) XGrabKey (ctx->dpy, code, g_keys[i].mod, root,
XGrabKey (ctx->dpy, code, g_keys[i].mod | modifiers[j], root,
False /* ? */, GrabModeAsync, GrabModeAsync); False /* ? */, GrabModeAsync, GrabModeAsync);
XSelectInput (ctx->dpy, root, KeyPressMask); XSelectInput (ctx->dpy, root, KeyPressMask);