Added tag 5.1 for changeset ce355cea9bb8

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index f8a6ed5..5f3b9c9 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -904,7 +904,7 @@ manage(Window w, XWindowAttributes *wa) {
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;
        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)
        }
        else {
                if(c->x + c->w + 2 * c->bw > sx + sw)


@@ -1558,28 +1558,24 @@ updatebar(void) {
 void
 updategeom(void) {
 #ifdef XINERAMA
 void
 updategeom(void) {
 #ifdef XINERAMA

-       int n;
-       unsigned int xidx = 0;
+       int n, i = 0;

        XineramaScreenInfo *info = NULL;
 
        /* window area geometry */
        XineramaScreenInfo *info = NULL;
 
        /* window area geometry */

-       if(XineramaIsActive(dpy)) {
-               info = XineramaQueryScreens(dpy, &n);
+       if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { 

                if(n > 1) {
                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++)
                        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;
                                                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
                XFree(info);
        }
        else