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

dwmstatus: make use of XkbKeysymToModifiers

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2016-02-11 01:46:53 +01:00
parent 694f9f29a6
commit 945f620a3c
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dwmstatus.c
View File

@ -2709,27 +2709,12 @@ g_keys[] =
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static unsigned
get_numlock_mask (struct app_context *ctx)
{
// XXX: can XKB virtual mods help this? Chapter 8. Virtual Modifiers
unsigned result = 0;
XModifierKeymap *modmap = XGetModifierMapping (ctx->dpy);
for (unsigned i = 0; i < 8; i++)
for (int j = 0; j < modmap->max_keypermod; j++)
if (modmap->modifiermap[i * modmap->max_keypermod + j] ==
XKeysymToKeycode (ctx->dpy, XK_Num_Lock))
result = (1 << i);
XFreeModifiermap(modmap);
return result;
}
static void static void
on_x_keypress (struct app_context *ctx, XEvent *e) on_x_keypress (struct app_context *ctx, XEvent *e)
{ {
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 /* XXX: current group? */, !!(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
&& g_keys[i].mod == ev->state && g_keys[i].mod == ev->state
@ -2756,7 +2741,8 @@ 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 ignored_locks = LockMask | get_numlock_mask (ctx); unsigned ignored_locks =
LockMask | XkbKeysymToModifiers (ctx->dpy, XK_Num_Lock);
hard_assert (XkbSetIgnoreLockMods hard_assert (XkbSetIgnoreLockMods
(ctx->dpy, XkbUseCoreKbd, ignored_locks, ignored_locks, 0, 0)); (ctx->dpy, XkbUseCoreKbd, ignored_locks, ignored_locks, 0, 0));