commit 7ecadcee39697807c7b29221af49c67bb19ac055 from: Anselm R Garbe date: Wed Jul 16 17:39:48 2008 UTC local use of xidx is useless, got rid of it, falling back to screen 0 if pointer query fails for whatever reason commit - c86ed46a1bbba0635a76d05ebeb839c7fec7f7fc commit + 7ecadcee39697807c7b29221af49c67bb19ac055 blob - f8a6ed5b975f48c5d1da80e17190566846aeec90 blob + 34bcd99cd2127831a3445a0429d0154c12aa6ce4 --- dwm.c +++ dwm.c @@ -1558,28 +1558,25 @@ 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(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