aboutsummaryrefslogtreecommitdiffstats
path: root/wm.c
diff options
context:
space:
mode:
authorAnselm R. Garbe <garbeam@wmii.de>2006-07-11 11:50:18 +0200
committerAnselm R. Garbe <garbeam@wmii.de>2006-07-11 11:50:18 +0200
commit366d81e313e6dd4e9e6c61ed8dfca4b4b40ccde6 (patch)
tree78ac7ac7de2fb2b4373dc5d6f67a70e2642ed347 /wm.c
parent8a8b7956b6de80decbfd3bff6d2ad6e5bb69b2bd (diff)
downloaddwm-366d81e313e6dd4e9e6c61ed8dfca4b4b40ccde6.tar.gz
added key handling
Diffstat (limited to 'wm.c')
-rw-r--r--wm.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/wm.c b/wm.c
index a4caf64..038e6b9 100644
--- a/wm.c
+++ b/wm.c
@@ -24,7 +24,6 @@ Client *client = NULL;
char *bartext, tag[256];
int screen, sel_screen;
-unsigned int lock_mask, numlock_mask;
/* draw structs */
Brush brush = {0};
@@ -144,32 +143,6 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
}
static void
-init_lock_keys()
-{
- XModifierKeymap *modmap;
- KeyCode numlock;
- int i;
- static int masks[] = {
- ShiftMask, LockMask, ControlMask, Mod1Mask,
- Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
- };
-
- numlock_mask = 0;
- modmap = XGetModifierMapping(dpy);
- numlock = XKeysymToKeycode(dpy, XStringToKeysym("Num_Lock"));
-
- if(modmap && modmap->max_keypermod > 0) {
- int max = (sizeof(masks) / sizeof(int)) * modmap->max_keypermod;
- for(i = 0; i < max; i++)
- if(numlock && (modmap->modifiermap[i] == numlock))
- numlock_mask = masks[i / modmap->max_keypermod];
- }
- XFreeModifiermap(modmap);
-
- lock_mask = 255 & ~(numlock_mask | LockMask);
-}
-
-static void
cleanup()
{
/*
@@ -243,7 +216,7 @@ main(int argc, char *argv[])
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
- init_lock_keys();
+ update_keys();
brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
DefaultDepth(dpy, screen));