added draw.c again (except getcolor and setfont which are helpers in main.c)

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 77ce0df..1015017 100644 (file)
--- a/main.c
+++ b/main.c
@@ -18,8 +18,8 @@
 /* extern */
 
 char stext[256];
-int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int ntags, numlockmask;
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
+unsigned int bh, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool *seltag;
@@ -61,74 +61,6 @@ cleanup(void) {
        free(seltag);
 }
 
-static unsigned int
-textnw(const char *text, unsigned int len) {
-       XRectangle r;
-
-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
-       }
-       return XTextWidth(dc.font.xfont, text, len);
-}
-
-static void
-drawtext(const char *text, unsigned long col[ColLast], Bool filledsquare, Bool emptysquare) {
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
-       XGCValues gcv;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
-
-       XSetForeground(dpy, dc.gc, col[ColBG]);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       if(!text)
-               return;
-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
-       memcpy(buf, text, len);
-       buf[len] = 0;
-       h = dc.font.ascent + dc.font.descent;
-       y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
-       x = dc.x + (h / 2);
-       /* shorten text if necessary */
-       while(len && (w = textnw(buf, len)) > dc.w - h)
-               buf[--len] = 0;
-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
-       }
-       if(w > dc.w)
-               return; /* too long */
-       gcv.foreground = col[ColFG];
-       if(dc.font.set) {
-               XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-       }
-       else {
-               gcv.font = dc.font.xfont->fid;
-               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
-               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
-       }
-       x = (h + 2) / 4;
-       r.x = dc.x + 1;
-       r.y = dc.y + 1;
-       if(filledsquare) {
-               r.width = r.height = x + 1;
-               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       }
-       else if(emptysquare) {
-               r.width = r.height = x;
-               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       }
-}
-
 static unsigned long
 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
@@ -139,16 +71,6 @@ getcolor(const char *colstr) {
        return color.pixel;
 }
 
-static Bool
-isoccupied(unsigned int t) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->tags[t])
-                       return True;
-       return False;
-}
-
 static void
 scan(void) {
        unsigned int i, num;
@@ -246,7 +168,7 @@ setup(void) {
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
        grabkeys();
-       compileregexps();
+       compileregs();
        for(ntags = 0; tags[ntags]; ntags++);
        seltag = emallocz(sizeof(Bool) * ntags);
        seltag[0] = True;
@@ -262,7 +184,7 @@ setup(void) {
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
-       bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
+       initlayouts();
        /* bar */
        dc.h = bh = dc.font.height + 2;
        wa.override_redirect = 1;
@@ -300,37 +222,6 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 /* extern */
 
 void
-drawstatus(void) {
-       int i, x;
-
-       dc.x = dc.y = 0;
-       for(i = 0; i < ntags; i++) {
-               dc.w = textw(tags[i]);
-               if(seltag[i])
-                       drawtext(tags[i], dc.sel, sel && sel->tags[i], isoccupied(i));
-               else
-                       drawtext(tags[i], dc.norm, sel && sel->tags[i], isoccupied(i));
-               dc.x += dc.w;
-       }
-       dc.w = bmw;
-       drawtext(arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, dc.norm, False, False);
-       x = dc.x + dc.w;
-       dc.w = textw(stext);
-       dc.x = sw - dc.w;
-       if(dc.x < x) {
-               dc.x = x;
-               dc.w = sw - x;
-       }
-       drawtext(stext, dc.norm, False, False);
-       if((dc.w = dc.x - x) > bh) {
-               dc.x = x;
-               drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm, False, False);
-       }
-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
-       XSync(dpy, False);
-}
-
-void
 sendevent(Window w, Atom a, long value) {
        XEvent e;
 
@@ -344,11 +235,6 @@ sendevent(Window w, Atom a, long value) {
        XSync(dpy, False);
 }
 
-unsigned int
-textw(const char *text) {
-       return textnw(text, strlen(text)) + dc.font.height;
-}
-
 void
 quit(Arg *arg) {
        readin = running = False;
@@ -379,16 +265,14 @@ main(int argc, char *argv[]) {
        char *p;
        int r, xfd;
        fd_set rd;
+       XEvent ev;
 
-       if(argc == 2 && !strncmp("-v", argv[1], 3)) {
-               fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
-               exit(EXIT_SUCCESS);
-       }
+       if(argc == 2 && !strncmp("-v", argv[1], 3))
+               eprint("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
        setlocale(LC_CTYPE, "");
-       dpy = XOpenDisplay(0);
-       if(!dpy)
+       if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");
        xfd = ConnectionNumber(dpy);
        screen = DefaultScreen(dpy);
@@ -411,7 +295,6 @@ main(int argc, char *argv[]) {
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
-       procevent();
        readin = True;
        while(running) {
                FD_ZERO(&rd);
@@ -443,7 +326,11 @@ main(int argc, char *argv[]) {
                        drawstatus();
                }
                if(FD_ISSET(xfd, &rd))
-                       procevent();
+                       while(XPending(dpy)) {
+                               XNextEvent(dpy, &ev);
+                               if(handler[ev.type])
+                                       (handler[ev.type])(&ev); /* call handler */
+                       }
        }
        cleanup();
        XCloseDisplay(dpy);