X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=29c7b6408b1462840ec6119f57b8649c1b8ebc3b;hb=21cd59a6307ae041ed91098e06d49b3e9036cbea;hp=9779654881e815bc7493d9f70b79f3755e22d18e;hpb=176408afa895adf133a437038466ddc74e326a0c;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 9779654..29c7b64 100644
--- a/dwm.c
+++ b/dwm.c
@@ -125,7 +125,7 @@ struct Monitor {
 	int screen_number;
 	float mfact;
 	int by, btx;          /* bar geometry */
-	int my, mh;           /* vertical screen size*/
+	int mx, my, mw, mh;           /* screen size */
 	int wx, wy, ww, wh;   /* window area  */
 	unsigned int seltags;
 	unsigned int sellt;
@@ -176,8 +176,9 @@ static void focusin(XEvent *e);
 static void focusstack(const Arg *arg);
 static Client *getclient(Window w);
 static unsigned long getcolor(const char *colstr);
-static Monitor *getmonitor(Window w);
-static Monitor *getmonitorxy(int x, int y);
+static Monitor *getmon(Window w);
+static Monitor *getmonn(unsigned int n);
+static Monitor *getmonxy(int x, int y);
 static Bool getrootpointer(int *x, int *y);
 static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
@@ -401,7 +402,7 @@ buttonpress(XEvent *e) {
 
 	click = ClkRootWin;
 	/* focus monitor if necessary */
-	if((m = getmonitor(ev->window)) && m != selmon) {
+	if((m = getmon(ev->window)) && m != selmon) {
 		unfocus(selmon->sel);
 		selmon = m;
 		focus(NULL);
@@ -541,6 +542,7 @@ configurenotify(XEvent *e) {
 void
 configurerequest(XEvent *e) {
 	Client *c;
+	Monitor *m;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
@@ -548,18 +550,19 @@ configurerequest(XEvent *e) {
 		if(ev->value_mask & CWBorderWidth)
 			c->bw = ev->border_width;
 		else if(c->isfloating || !lt[selmon->sellt]->arrange) {
+			m = c->mon;
 			if(ev->value_mask & CWX)
-				c->x = sx + ev->x;
+				c->x = m->mx + ev->x;
 			if(ev->value_mask & CWY)
-				c->y = sy + ev->y;
+				c->y = m->my + ev->y;
 			if(ev->value_mask & CWWidth)
 				c->w = ev->width;
 			if(ev->value_mask & CWHeight)
 				c->h = ev->height;
-			if((c->x - sx + c->w) > sw && c->isfloating)
-				c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
-			if((c->y - sy + c->h) > sh && c->isfloating)
-				c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
+			if((c->x - m->mx + c->w) > m->mw && c->isfloating)
+				c->x = m->mx + (m->mw / 2 - c->w / 2); /* center in x direction */
+			if((c->y - m->my + c->h) > m->mh && c->isfloating)
+				c->y = m->my + (m->mh / 2 - c->h / 2); /* center in y direction */
 			if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
 			if(ISVISIBLE(c))
@@ -747,7 +750,7 @@ enternotify(XEvent *e) {
 
 	if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
 		return;
-	if((m = getmonitor(ev->window)) && m != selmon) {
+	if((m = getmon(ev->window)) && m != selmon) {
 		unfocus(selmon->sel);
 		selmon = m;
 	}
@@ -762,7 +765,7 @@ expose(XEvent *e) {
 	Monitor *m;
 	XExposeEvent *ev = &e->xexpose;
 
-	if(ev->count == 0 && (m = getmonitor(ev->window)))
+	if(ev->count == 0 && (m = getmon(ev->window)))
 		drawbar(m);
 }
 
@@ -800,18 +803,13 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 #ifdef XINERAMA
 void
 focusmon(const Arg *arg) {
-	unsigned int i;
-	Monitor *m; 
-
-	for(i = 0, m = mons; m; m = m->next, i++)
-		if(i == arg->ui) {
-			if(m == selmon)
-				return;
-			unfocus(selmon->sel);
-			selmon = m;
-			focus(NULL);
-			break;
-		}
+	Monitor *m;
+
+	if(!(m = getmonn(arg->ui)) || m == selmon)
+		return;
+	unfocus(selmon->sel);
+	selmon = m;
+	focus(NULL);
 }
 #endif /* XINERAMA */
 
@@ -864,29 +862,38 @@ getcolor(const char *colstr) {
 }
 
 Monitor *
-getmonitor(Window w) {
+getmon(Window w) {
 	int x, y;
 	Client *c;
 	Monitor *m;
 
 	if(w == root && getrootpointer(&x, &y))
-		return getmonitorxy(x, y);
+		return getmonxy(x, y);
 	for(m = mons; m; m = m->next)
 		if(w == m->barwin)
 			return m;
 	if((c = getclient(w)))
 		return c->mon;
-	return NULL;
+	return mons;
 }
 
 Monitor *
-getmonitorxy(int x, int y) {
+getmonn(unsigned int n) {
+	unsigned int i;
+	Monitor *m;
+
+	for(m = mons, i = 0; m && i != n; m = m->next, i++);
+	return m;
+}
+
+Monitor *
+getmonxy(int x, int y) {
 	Monitor *m;
 
 	for(m = mons; m; m = m->next)
 		if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
 			return m;
-	return NULL;
+	return mons;
 }
 
 Bool
@@ -1078,25 +1085,25 @@ manage(Window w, XWindowAttributes *wa) {
 	c->mon = selmon;
 
 	/* geometry */
-	c->x = wa->x;
-	c->y = wa->y;
+	c->x = wa->x + selmon->wx;
+	c->y = wa->y + selmon->wy;
 	c->w = wa->width;
 	c->h = wa->height;
 	c->oldbw = wa->border_width;
-	if(c->w == sw && c->h == sh) {
-		c->x = sx;
-		c->y = sy;
+	if(c->w == selmon->mw && c->h == selmon->mh) {
+		c->x = selmon->mx;
+		c->y = selmon->my;
 		c->bw = 0;
 	}
 	else {
-		if(c->x + WIDTH(c) > sx + sw)
-			c->x = sx + sw - WIDTH(c);
-		if(c->y + HEIGHT(c) > sy + sh)
-			c->y = sy + sh - HEIGHT(c);
-		c->x = MAX(c->x, sx);
+		if(c->x + WIDTH(c) > selmon->mx + selmon->mw)
+			c->x = selmon->mx + selmon->mw - WIDTH(c);
+		if(c->y + HEIGHT(c) > selmon->my + selmon->mh)
+			c->y = selmon->my + selmon->mh - HEIGHT(c);
+		c->x = MAX(c->x, selmon->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->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : sy);
+		           && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : selmon->my);
 		c->bw = borderpx;
 	}
 
@@ -1205,8 +1212,11 @@ movemouse(const Arg *arg) {
 	}
 	while(ev.type != ButtonRelease);
 	XUngrabPointer(dpy, CurrentTime);
-	if((m = getmonitorxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon)
+	if((m = getmonxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
 		sendmon(c, m);
+		selmon = m;
+		focus(NULL);
+	}
 }
 
 Client *
@@ -1314,8 +1324,11 @@ resizemouse(const Arg *arg) {
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
 	XUngrabPointer(dpy, CurrentTime);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-	if((m = getmonitorxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon)
+	if((m = getmonxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
 		sendmon(c, m);
+		selmon = m;
+		focus(NULL);
+	}
 }
 
 void
@@ -1542,17 +1555,11 @@ tag(const Arg *arg) {
 #ifdef XINERAMA
 void
 tagmon(const Arg *arg) {
-	unsigned int i;
-	Client *c;
 	Monitor *m;
 
-	if(!(c = selmon->sel))
+	if(!selmon->sel || !(m = getmonn(arg->ui)))
 		return;
-	for(i = 0, m = mons; m; m = m->next, i++)
-		if(i == arg->ui) {
-			sendmon(c, m);
-			break;
-		}
+	sendmon(selmon->sel, m);
 }
 #endif /* XINERAMA */
 
@@ -1762,9 +1769,9 @@ updategeom(void) {
 	if(XineramaIsActive(dpy)) {
 		for(i = 0, m = newmons; m; m = m->next, i++) {
 			m->screen_number = info[i].screen_number;
-			m->wx = info[i].x_org;
+			m->mx = m->wx = info[i].x_org;
 			m->my = m->wy = info[i].y_org;
-			m->ww = info[i].width;
+			m->mw = m->ww = info[i].width;
 			m->mh = m->wh = info[i].height;
 		}
 		XFree(info);
@@ -1809,7 +1816,7 @@ updategeom(void) {
 	/* select focused monitor */
 	cleanupmons();
 	mons = newmons;
-	selmon = getmonitor(root);
+	selmon = getmon(root);
 }
 
 void