new stuff

[dwm.git] / wm.c

diff --git a/wm.c b/wm.c
index b8b3053..a4caf64 100644 (file)
--- a/wm.c
+++ b/wm.c
@@ -20,8 +20,9 @@ Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
 XRectangle rect, barrect;
 Bool running = True;
+Client *client = NULL;
 
-char *bartext, *shell;
+char *bartext, tag[256];
 int screen, sel_screen;
 unsigned int lock_mask, numlock_mask;
 
@@ -56,7 +57,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 +75,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;
 }
 
@@ -219,9 +219,6 @@ main(int argc, char *argv[])
        if(other_wm_running)
                error("gridwm: another window manager is already running\n");
 
-       if(!(shell = getenv("SHELL")))
-               shell = "/bin/sh";
-
        rect.x = rect.y = 0;
        rect.width = DisplayWidth(dpy, screen);
        rect.height = DisplayHeight(dpy, screen);
@@ -267,7 +264,7 @@ main(int argc, char *argv[])
                        barrect.width, barrect.height, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-       bartext = 0;
+       bartext = NULL;
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);
        draw_bar();