added key handling

[dwm.git] / wm.c

diff --git a/wm.c b/wm.c
index c8bb0a4..038e6b9 100644 (file)
--- a/wm.c
+++ b/wm.c
@@ -15,15 +15,15 @@
 
 /* X structs */
 Display *dpy;
-Window root;
-XRectangle rect;
-Pixmap pmap;
-Atom wm_atom[WMLast];
-Atom net_atom[NetLast];
+Window root, barwin;
+Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
+XRectangle rect, barrect;
+Bool running = True;
+Client *client = NULL;
 
+char *bartext, tag[256];
 int screen, sel_screen;
-unsigned int kmask, numlock_mask;
 
 /* draw structs */
 Brush brush = {0};
@@ -56,7 +56,7 @@ scan_wins()
                        if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
                                continue;
                        if(wa.map_state == IsViewable)
-                               /*manage*/;
+                               manage(create_client(wins[i], &wa));
                }
        }
        if(wins)
@@ -74,12 +74,11 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
        status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
                        &res, &extra, prop);
 
-       if(status != Success || *prop == 0) {
+       if(status != Success || *prop == NULL) {
                return 0;
        }
-       if(res == 0) {
+       if(res == 0)
                free((void *) *prop);
-       }
        return res;
 }
 
@@ -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);
-
-       kmask = 255 & ~(numlock_mask | LockMask);
-}
-
-static void
 cleanup()
 {
        /*
@@ -187,6 +160,7 @@ main(int argc, char *argv[])
        XSetWindowAttributes wa;
        unsigned int mask;
        Window w;
+       XEvent ev;
 
        /* command line args */
        for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
@@ -242,21 +216,44 @@ main(int argc, char *argv[])
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-       init_lock_keys();
+       update_keys();
 
-       pmap = XCreatePixmap(dpy, root, rect.width, rect.height,
+       brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
                        DefaultDepth(dpy, screen));
-
-       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
-       wa.cursor = cursor[CurNormal];
-       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+       brush.gc = XCreateGC(dpy, root, 0, 0);
 
        /* style */
        loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
        loadfont(dpy, &brush.font, FONT);
 
+       wa.override_redirect = 1;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ExposureMask;
+
+       barrect = rect;
+       barrect.height = labelheight(&brush.font);
+       barrect.y = rect.height - barrect.height;
+       barwin = XCreateWindow(dpy, root, barrect.x, barrect.y,
+                       barrect.width, barrect.height, 0, DefaultDepth(dpy, screen),
+                       CopyFromParent, DefaultVisual(dpy, screen),
+                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+       bartext = NULL;
+       XDefineCursor(dpy, barwin, cursor[CurNormal]);
+       XMapRaised(dpy, barwin);
+       draw_bar();
+
+       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
+       wa.cursor = cursor[CurNormal];
+       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+
        scan_wins();
 
+       while(running) {
+               XNextEvent(dpy, &ev);
+               if(handler[ev.type])
+                       (handler[ev.type]) (&ev); /* call handler */
+       }
+
        cleanup();
        XCloseDisplay(dpy);