testing Brians multiscreen issue fix e5a1e773
anselm@garbe.us · 2011-11-04 20:02 1 file(s) · +9 −9
dwm.c +9 −9
340 340 
			*y = 0;
341 341 
	}
342 342 
	else {
343 - 
		if(*x > m->mx + m->mw)
344 - 
			*x = m->mx + m->mw - WIDTH(c);
345 - 
		if(*y > m->my + m->mh)
346 - 
			*y = m->my + m->mh - HEIGHT(c);
347 - 
		if(*x + *w + 2 * c->bw < m->mx)
348 - 
			*x = m->mx;
349 - 
		if(*y + *h + 2 * c->bw < m->my)
350 - 
			*y = m->my;
343 + 
		if(*x >= m->wx + m->ww)
344 + 
			*x = m->wx + m->ww - WIDTH(c);
345 + 
		if(*y >= m->wy + m->wh)
346 + 
			*y = m->wy + m->wh - HEIGHT(c);
347 + 
		if(*x + *w + 2 * c->bw <= m->wx)
348 + 
			*x = m->wx;
349 + 
		if(*y + *h + 2 * c->bw <= m->wy)
350 + 
			*y = m->wy;
351 351 
	}
352 352 
	if(*h < bh)
353 353 
		*h = bh;
1146 1146 
			c->y = c->mon->my + c->mon->mh - HEIGHT(c);
1147 1147 
		c->x = MAX(c->x, c->mon->mx);
1148 1148 
		/* only fix client y-offset, if the client center might cover the bar */
1149 - 
		c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx)
1149 + 
		c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx)
1150 1150 
		           && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
1151 1151 
		c->bw = borderpx;
1152 1152 
	}