[hackers] [dwm] testing Brians multiscreen issue fix || anselm

From: <hg_AT_suckless.org>
Date: Fri, 4 Nov 2011 20:02:35 +0100 (CET)

changeset: 1585:183cedbebe52
tag: tip
user: anselm_AT_garbe.us
date: Fri Nov 04 20:02:35 2011 +0100
files: dwm.c
description:
testing Brians multiscreen issue fix


diff -r 1228e3d45d25 -r 183cedbebe52 dwm.c
--- a/dwm.c Wed Nov 02 12:01:28 2011 +0000
+++ b/dwm.c Fri Nov 04 20:02:35 2011 +0100
_AT_@ -340,14 +340,14 @@
                         *y = 0;
         }
         else {
- if(*x > m->mx + m->mw)
- *x = m->mx + m->mw - WIDTH(c);
- if(*y > m->my + m->mh)
- *y = m->my + m->mh - HEIGHT(c);
- if(*x + *w + 2 * c->bw < m->mx)
- *x = m->mx;
- if(*y + *h + 2 * c->bw < m->my)
- *y = m->my;
+ if(*x >= m->wx + m->ww)
+ *x = m->wx + m->ww - WIDTH(c);
+ if(*y >= m->wy + m->wh)
+ *y = m->wy + m->wh - HEIGHT(c);
+ if(*x + *w + 2 * c->bw <= m->wx)
+ *x = m->wx;
+ if(*y + *h + 2 * c->bw <= m->wy)
+ *y = m->wy;
         }
         if(*h < bh)
                 *h = bh;
_AT_@ -1146,7 +1146,7 @@
                         c->y = c->mon->my + c->mon->mh - HEIGHT(c);
                 c->x = MAX(c->x, c->mon->mx);
                 /* only fix client y-offset, if the client center might cover the bar */
- c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx)
+ c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx)
                            && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
                 c->bw = borderpx;
         }
Received on Fri Nov 04 2011 - 20:02:35 CET