grabbuttons() and grabkeys() are now independent from prior numlockmask initialization
This commit is contained in:
parent
6411aa921b
commit
288cf78b18
32
dwm.c
32
dwm.c
@ -191,6 +191,7 @@ static void unmanage(Client *c);
|
|||||||
static void unmapnotify(XEvent *e);
|
static void unmapnotify(XEvent *e);
|
||||||
static void updatebar(void);
|
static void updatebar(void);
|
||||||
static void updategeom(void);
|
static void updategeom(void);
|
||||||
|
static void updatenumlockmask(void);
|
||||||
static void updatesizehints(Client *c);
|
static void updatesizehints(Client *c);
|
||||||
static void updatetitle(Client *c);
|
static void updatetitle(Client *c);
|
||||||
static void updatewmhints(Client *c);
|
static void updatewmhints(Client *c);
|
||||||
@ -735,9 +736,10 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
|
|||||||
|
|
||||||
void
|
void
|
||||||
grabbuttons(Client *c, Bool focused) {
|
grabbuttons(Client *c, Bool focused) {
|
||||||
|
updatenumlockmask();
|
||||||
|
{
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
|
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
|
||||||
|
|
||||||
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
|
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
|
||||||
if(focused) {
|
if(focused) {
|
||||||
for(i = 0; i < LENGTH(buttons); i++)
|
for(i = 0; i < LENGTH(buttons); i++)
|
||||||
@ -747,22 +749,14 @@ grabbuttons(Client *c, Bool focused) {
|
|||||||
} else
|
} else
|
||||||
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
|
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
|
||||||
BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
|
BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
grabkeys(void) {
|
grabkeys(void) {
|
||||||
unsigned int i, j;
|
updatenumlockmask();
|
||||||
XModifierKeymap *modmap;
|
|
||||||
|
|
||||||
/* update modifier map */
|
|
||||||
modmap = XGetModifierMapping(dpy);
|
|
||||||
for(i = 0; i < 8; i++)
|
|
||||||
for(j = 0; j < modmap->max_keypermod; j++)
|
|
||||||
if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
|
|
||||||
numlockmask = (1 << i);
|
|
||||||
XFreeModifiermap(modmap);
|
|
||||||
|
|
||||||
{ /* grab keys */
|
{ /* grab keys */
|
||||||
|
unsigned int i, j;
|
||||||
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
|
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
|
||||||
KeyCode code;
|
KeyCode code;
|
||||||
|
|
||||||
@ -1575,6 +1569,20 @@ updategeom(void) {
|
|||||||
by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
|
by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
updatenumlockmask(void) {
|
||||||
|
unsigned int i, j;
|
||||||
|
XModifierKeymap *modmap;
|
||||||
|
|
||||||
|
numlockmask = 0;
|
||||||
|
modmap = XGetModifierMapping(dpy);
|
||||||
|
for(i = 0; i < 8; i++)
|
||||||
|
for(j = 0; j < modmap->max_keypermod; j++)
|
||||||
|
if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
|
||||||
|
numlockmask = (1 << i);
|
||||||
|
XFreeModifiermap(modmap);
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
updatesizehints(Client *c) {
|
updatesizehints(Client *c) {
|
||||||
long msize;
|
long msize;
|
||||||
|
Loading…
Reference in New Issue
Block a user