simplified several portions of code through replacing rect structs with x,y,h,w count...

[dwm.git] / wm.c

diff --git a/wm.c b/wm.c
index f247372..f0069d2 100644 (file)
--- a/wm.c
+++ b/wm.c
@@ -23,21 +23,26 @@ Display *dpy;
 Window root, barwin;
 Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
-XRectangle rect, barrect;
 Bool running = True;
 Bool sel_screen;
 
-char *bartext, tag[256];
-int screen;
+char statustext[1024], tag[256];
+int screen, sx, sy, sw, sh, bx, by, bw, bh;
 
 Brush brush = {0};
 Client *clients = NULL;
 Client *stack = NULL;
 
 static Bool other_wm_running;
-static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+static const char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
 static int (*x_error_handler) (Display *, XErrorEvent *);
 
+static const char *status[] = {
+       "sh", "-c", "echo -n `date '+%Y-%m-%d %H:%M'`" 
+       " `uptime | sed 's/.*://; s/,//g'`"
+       " `acpi | awk '{print $4}' | sed 's/,//'`", 0
+};
+
 static void
 usage()
 {
@@ -214,9 +219,9 @@ main(int argc, char *argv[])
        if(other_wm_running)
                error("gridwm: another window manager is already running\n");
 
-       rect.x = rect.y = 0;
-       rect.width = DisplayWidth(dpy, screen);
-       rect.height = DisplayHeight(dpy, screen);
+       sx = sy = 0;
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
        sel_screen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
        XSetErrorHandler(0);
@@ -239,10 +244,6 @@ main(int argc, char *argv[])
 
        update_keys();
 
-       brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
-                       DefaultDepth(dpy, screen));
-       brush.gc = XCreateGC(dpy, root, 0, 0);
-
        /* style */
        loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
        loadfont(dpy, &brush.font, FONT);
@@ -251,16 +252,19 @@ main(int argc, char *argv[])
        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),
+       bx = by = 0;
+       bw = sw;
+       bh = texth(&brush.font);
+       barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
                        CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-       bartext = NULL;
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);
+
+       brush.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+       brush.gc = XCreateGC(dpy, root, 0, 0);
+
+       pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);
        draw_bar();
 
        wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
@@ -282,8 +286,10 @@ main(int argc, char *argv[])
                t = timeout;
                if(select(ConnectionNumber(dpy) + 1, &fds, NULL, NULL, &t) > 0)
                        continue;
-               else if(errno != EINTR)
+               else if(errno != EINTR) {
+                       pipe_spawn(statustext, sizeof(statustext), dpy, (char **)status);
                        draw_bar();
+               }
        }
 
        cleanup();