made readin a config.h variable

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index f8a6ed5..279f831 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -224,7 +224,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
-static Bool otherwm, readin;
+static Bool otherwm;
 static Bool running = True;
 static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
 static Client *clients = NULL;
@@ -904,7 +904,7 @@ manage(Window w, XWindowAttributes *wa) {
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;
-               c->bw = wa->border_width;
+               c->bw = 0;
        }
        else {
                if(c->x + c->w + 2 * c->bw > sx + sw)
@@ -1219,7 +1219,6 @@ run(void) {
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
        xfd = ConnectionNumber(dpy);
-       readin = True;
        offset = 0;
        len = sizeof stext - 1;
        sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
@@ -1558,28 +1557,24 @@ updatebar(void) {
 void
 updategeom(void) {
 #ifdef XINERAMA
-       int n;
-       unsigned int xidx = 0;
+       int n, i = 0;
        XineramaScreenInfo *info = NULL;
 
        /* window area geometry */
-       if(XineramaIsActive(dpy)) {
-               info = XineramaQueryScreens(dpy, &n);
+       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { 
                if(n > 1) {
-                       int di, i, x, y;
+                       int di, x, y;
                        unsigned int dui;
                        Window dummy;
                        if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
                                for(i = 0; i < n; i++)
-                                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) {
-                                               xidx = i;
+                                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))
                                                break;
-                                       }
                }
-               wx = info[xidx].x_org;
-               wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
-               ww = info[xidx].width;
-               wh = showbar ? info[xidx].height - bh : info[xidx].height;
+               wx = info[i].x_org;
+               wy = showbar && topbar ?  info[i].y_org + bh : info[i].y_org;
+               ww = info[i].width;
+               wh = showbar ? info[i].height - bh : info[i].height;
                XFree(info);
        }
        else