Chewing_Bever
/
dwm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed grabkeys, removed initmodmap

master
Anselm R Garbe 2008-08-23 09:31:28 +01:00
parent 2b4157eccd
commit 85da537856
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dwm.c
View File

@ -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,6 +751,17 @@ grabbuttons(Client *c, Bool focused) {
void void
grabkeys(void) { grabkeys(void) {
unsigned int i, j; unsigned int i, j;
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 */
unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
KeyCode code; KeyCode code;
@ -762,6 +772,7 @@ grabkeys(void) {
XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True, XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
} }
}
} }
void void
@ -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();
} }