changing order of c->border restorage

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 3470287..66645b3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <errno.h>
 #include <locale.h>
@@ -18,7 +17,7 @@
 /* extern */
 
 char stext[256];
-int screen, sw, sh, wax, way, waw, wah;
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
 unsigned int bh, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool *seltag;
@@ -181,6 +180,7 @@ setup(void) {
        dc.sel[ColFG] = initcolor(SELFGCOLOR);
        initfont(FONT);
        /* geometry */
+       sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        initlayouts();
@@ -189,21 +189,23 @@ setup(void) {
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask | ExposureMask;
-       barwin = XCreateWindow(dpy, root, 0, (TOPBAR ? 0 : sh - bh), sw, bh, 0,
+       barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XMapRaised(dpy, barwin);
        strcpy(stext, "dwm-"VERSION);
        /* windowarea */
-       wax = 0;
-       way = (TOPBAR ? bh : 0);
+       wax = sx;
+       way = sy + (TOPBAR ? bh : 0);
        wah = sh - bh;
        waw = sw;
        /* pixmap for everything */
        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       if(!dc.font.set)
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        /* multihead support */
        selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }
@@ -221,21 +223,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 /* extern */
 
 void
-sendevent(Window w, Atom a, long value) {
-       XEvent e;
-
-       e.type = ClientMessage;
-       e.xclient.window = w;
-       e.xclient.message_type = a;
-       e.xclient.format = 32;
-       e.xclient.data.l[0] = value;
-       e.xclient.data.l[1] = CurrentTime;
-       XSendEvent(dpy, w, False, NoEventMask, &e);
-       XSync(dpy, False);
-}
-
-void
-quit(Arg *arg) {
+quit(const char *arg) {
        readin = running = False;
 }
 
@@ -267,7 +255,7 @@ main(int argc, char *argv[]) {
        XEvent ev;
 
        if(argc == 2 && !strncmp("-v", argv[1], 3))
-               eprint("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+               eprint("dwm-"VERSION", © 2004-2007 Anselm R. Garbe, Sander van Dijk\n");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
        setlocale(LC_CTYPE, "");
@@ -324,12 +312,11 @@ main(int argc, char *argv[]) {
                        }
                        drawstatus();
                }
-               if(FD_ISSET(xfd, &rd))
-                       while(XPending(dpy)) {
-                               XNextEvent(dpy, &ev);
-                               if(handler[ev.type])
-                                       (handler[ev.type])(&ev); /* call handler */
-                       }
+               while(XPending(dpy)) {
+                       XNextEvent(dpy, &ev);
+                       if(handler[ev.type])
+                               (handler[ev.type])(&ev); /* call handler */
+               }
        }
        cleanup();
        XCloseDisplay(dpy);