changed grabkeys, removed initmodmap
This commit is contained in:
parent
2b4157eccd
commit
85da537856
47
dwm.c
47
dwm.c
@ -158,7 +158,6 @@ static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
|||||||
static void grabbuttons(Client *c, Bool focused);
|
static void grabbuttons(Client *c, Bool focused);
|
||||||
static void grabkeys(void);
|
static void grabkeys(void);
|
||||||
static void initfont(const char *fontstr);
|
static void initfont(const char *fontstr);
|
||||||
static void initmodmap(void);
|
|
||||||
static Bool isprotodel(Client *c);
|
static Bool isprotodel(Client *c);
|
||||||
static void keypress(XEvent *e);
|
static void keypress(XEvent *e);
|
||||||
static void killclient(const Arg *arg);
|
static void killclient(const Arg *arg);
|
||||||
@ -752,15 +751,27 @@ grabbuttons(Client *c, Bool focused) {
|
|||||||
void
|
void
|
||||||
grabkeys(void) {
|
grabkeys(void) {
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
|
XModifierKeymap *modmap;
|
||||||
KeyCode code;
|
|
||||||
|
|
||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
/* update modifier map */
|
||||||
for(i = 0; i < LENGTH(keys); i++) {
|
modmap = XGetModifierMapping(dpy);
|
||||||
code = XKeysymToKeycode(dpy, keys[i].keysym);
|
for(i = 0; i < 8; i++)
|
||||||
for(j = 0; j < LENGTH(modifiers); j++)
|
for(j = 0; j < modmap->max_keypermod; j++)
|
||||||
XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
|
if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
|
||||||
GrabModeAsync, GrabModeAsync);
|
numlockmask = (1 << i);
|
||||||
|
XFreeModifiermap(modmap);
|
||||||
|
|
||||||
|
{ /* grab keys */
|
||||||
|
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
|
||||||
|
KeyCode code;
|
||||||
|
|
||||||
|
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
||||||
|
for(i = 0; i < LENGTH(keys); i++) {
|
||||||
|
code = XKeysymToKeycode(dpy, keys[i].keysym);
|
||||||
|
for(j = 0; j < LENGTH(modifiers); j++)
|
||||||
|
XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
|
||||||
|
GrabModeAsync, GrabModeAsync);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -804,19 +815,6 @@ initfont(const char *fontstr) {
|
|||||||
dc.font.height = dc.font.ascent + dc.font.descent;
|
dc.font.height = dc.font.ascent + dc.font.descent;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
initmodmap(void) {
|
|
||||||
unsigned int i, j;
|
|
||||||
XModifierKeymap *modmap;
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
Bool
|
Bool
|
||||||
isprotodel(Client *c) {
|
isprotodel(Client *c) {
|
||||||
int i, n;
|
int i, n;
|
||||||
@ -929,10 +927,8 @@ mappingnotify(XEvent *e) {
|
|||||||
XMappingEvent *ev = &e->xmapping;
|
XMappingEvent *ev = &e->xmapping;
|
||||||
|
|
||||||
XRefreshKeyboardMapping(ev);
|
XRefreshKeyboardMapping(ev);
|
||||||
if(ev->request == MappingKeyboard) {
|
if(ev->request == MappingKeyboard)
|
||||||
initmodmap();
|
|
||||||
grabkeys();
|
grabkeys();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -1379,7 +1375,6 @@ setup(void) {
|
|||||||
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
|
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
|
||||||
XSelectInput(dpy, root, wa.event_mask);
|
XSelectInput(dpy, root, wa.event_mask);
|
||||||
|
|
||||||
initmodmap();
|
|
||||||
grabkeys();
|
grabkeys();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user