X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=2e13241363800c07172a4ab7e925947994488d51;hp=229062d9e8625dd821acef506f8021b03720e80c;hb=52bd69c2a4998294a259efbedafca961dc2781eb;hpb=1ddfc571ae90b842446b0524f2a38c74868bb326

diff --git a/dwm.c b/dwm.c
index 229062d..2e13241 100644
--- a/dwm.c
+++ b/dwm.c
@@ -124,7 +124,7 @@ struct Monitor {
 	int screen_number;
 	float mfact;
 	int by, btx;          /* bar geometry */
-	int mx, my, mw, mh;           /* screen size */
+	int mx, my, mw, mh;   /* screen size */
 	int wx, wy, ww, wh;   /* window area  */
 	unsigned int seltags;
 	unsigned int sellt;
@@ -148,7 +148,7 @@ typedef struct {
 
 /* function declarations */
 static void applyrules(Client *c);
-static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
@@ -172,6 +172,7 @@ static void enternotify(XEvent *e);
 static void expose(XEvent *e);
 static void focus(Client *c);
 static void focusin(XEvent *e);
+static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
 static unsigned long getcolor(const char *colstr);
 static Bool getrootpointer(int *x, int *y);
@@ -193,7 +194,7 @@ static Client *nexttiled(Client *c);
 static Monitor *pointertomon(int x, int y);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
-static void resize(Client *c, int x, int y, int w, int h);
+static void resize(Client *c, int x, int y, int w, int h, Bool interact);
 static void resizemouse(const Arg *arg);
 static void restack(Monitor *m);
 static void run(void);
@@ -207,6 +208,7 @@ static void showhide(Client *c);
 static void sigchld(int signal);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
+static void tagmon(const Arg *arg);
 static int textnw(const char *text, unsigned int len);
 static void tile(Monitor *);
 static void togglebar(const Arg *arg);
@@ -231,15 +233,11 @@ static int xerror(Display *dpy, XErrorEvent *ee);
 static int xerrordummy(Display *dpy, XErrorEvent *ee);
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
-#ifdef XINERAMA
-static void focusmon(const Arg *arg);
-static void tagmon(const Arg *arg);
-#endif /* XINERAMA */
 
 /* variables */
 static char stext[256];
 static int screen;
-static int sx, sy, sw, sh;   /* X display screen geometry x, y, width, height */
+static int sw, sh;   /* X display screen geometry x, y, width, height */
 static int bh, blw = 0;      /* bar geometry */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
@@ -300,21 +298,34 @@ applyrules(Client *c) {
 }
 
 Bool
-applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
 	Bool baseismin;
+	Monitor *m = c->mon;
 
 	/* set minimum possible */
 	*w = MAX(1, *w);
 	*h = MAX(1, *h);
 
-	if(*x > sx + sw)
-		*x = sw - WIDTH(c);
-	if(*y > sy + sh)
-		*y = sh - HEIGHT(c);
-	if(*x + *w + 2 * c->bw < sx)
-		*x = sx;
-	if(*y + *h + 2 * c->bw < sy)
-		*y = sy;
+	if(interact) {
+		if(*x > sw)
+			*x = sw - WIDTH(c);
+		if(*y > sh)
+			*y = sh - HEIGHT(c);
+		if(*x + *w + 2 * c->bw < 0)
+			*x = 0;
+		if(*y + *h + 2 * c->bw < 0)
+			*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(*h < bh)
 		*h = bh;
 	if(*w < bh)
@@ -600,14 +611,14 @@ detach(Client *c) {
 
 void
 detachstack(Client *c) {
-	Client **tc;
+	Client **tc, *t;
 
 	for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
 	*tc = c->snext;
 
 	if(c == c->mon->sel) {
-		for(*tc = c->mon->stack; *tc && !ISVISIBLE((*tc)); *tc = (*tc)->snext);
-		c->mon->sel = *tc;
+		for(t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
+		c->mon->sel = t;
 	}
 }
 
@@ -635,16 +646,11 @@ drawbar(Monitor *m) {
 	}
 
 	dc.x = 0;
-#ifdef XINERAMA
-	{
-		char buf[2];
-		buf[0] = m->screen_number + '0';
-		buf[1] = '\0';
-		dc.w = TEXTW(buf);
-		drawtext(buf, selmon == m ? dc.sel : dc.norm, True);
+	if(mons->next) { /* more than a single monitor */
+		dc.w = TEXTW(monsyms[m->screen_number]);
+		drawtext(monsyms[m->screen_number], selmon == m ? dc.sel : dc.norm, False);
 		dc.x += dc.w;
 	}
-#endif /* XINERAMA */
 	m->btx = dc.x;
 	for(i = 0; i < LENGTH(tags); i++) {
 		dc.w = TEXTW(tags[i]);
@@ -802,7 +808,6 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 		XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime);
 }
 
-#ifdef XINERAMA
 void
 focusmon(const Arg *arg) {
 	Monitor *m;
@@ -813,7 +818,6 @@ focusmon(const Arg *arg) {
 	selmon = m;
 	focus(NULL);
 }
-#endif /* XINERAMA */
 
 void
 focusstack(const Arg *arg) {
@@ -1046,28 +1050,38 @@ manage(Window w, XWindowAttributes *wa) {
 		die("fatal: could not malloc() %u bytes\n", sizeof(Client));
 	*c = cz;
 	c->win = w;
-	c->mon = selmon;
+
+	if(XGetTransientForHint(dpy, w, &trans))
+		t = wintoclient(trans);
+	if(t) {
+		c->mon = t->mon;
+		c->tags = t->tags;
+	}
+	else {
+		c->mon = selmon;
+		applyrules(c);
+	}
 
 	/* geometry */
-	c->x = wa->x + selmon->wx;
-	c->y = wa->y + selmon->wy;
+	c->x = wa->x + c->mon->wx;
+	c->y = wa->y + c->mon->wy;
 	c->w = wa->width;
 	c->h = wa->height;
 	c->oldbw = wa->border_width;
-	if(c->w == selmon->mw && c->h == selmon->mh) {
-		c->x = selmon->mx;
-		c->y = selmon->my;
+	if(c->w == c->mon->mw && c->h == c->mon->mh) {
+		c->x = c->mon->mx;
+		c->y = c->mon->my;
 		c->bw = 0;
 	}
 	else {
-		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);
+		if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+			c->x = c->mon->mx + c->mon->mw - WIDTH(c);
+		if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
+			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->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : selmon->my);
+		           && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
 		c->bw = borderpx;
 	}
 
@@ -1079,12 +1093,6 @@ manage(Window w, XWindowAttributes *wa) {
 	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
 	grabbuttons(c, False);
 	updatetitle(c);
-	if(XGetTransientForHint(dpy, w, &trans))
-		t = wintoclient(trans);
-	if(t)
-		c->tags = t->tags;
-	else
-		applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = trans != None || c->isfixed;
 	if(c->isfloating)
@@ -1124,7 +1132,7 @@ monocle(Monitor *m) {
 	Client *c;
 
 	for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
-		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
+		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
 }
 
 void
@@ -1170,7 +1178,7 @@ movemouse(const Arg *arg) {
 					togglefloating(NULL);
 			}
 			if(!lt[selmon->sellt]->arrange || c->isfloating)
-				resize(c, nx, ny, c->w, c->h);
+				resize(c, nx, ny, c->w, c->h, True);
 			break;
 		}
 	}
@@ -1196,7 +1204,7 @@ pointertomon(int x, int y) {
 	for(m = mons; m; m = m->next)
 		if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
 			return m;
-	return mons;
+	return selmon;
 }
 
 void
@@ -1239,10 +1247,10 @@ quit(const Arg *arg) {
 }
 
 void
-resize(Client *c, int x, int y, int w, int h) {
+resize(Client *c, int x, int y, int w, int h, Bool interact) {
 	XWindowChanges wc;
 
-	if(applysizehints(c, &x, &y, &w, &h)) {
+	if(applysizehints(c, &x, &y, &w, &h, interact)) {
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
@@ -1290,7 +1298,7 @@ resizemouse(const Arg *arg) {
 					togglefloating(NULL);
 			}
 			if(!lt[selmon->sellt]->arrange || c->isfloating)
-				resize(c, c->x, c->y, nw, nh);
+				resize(c, c->x, c->y, nw, nh, True);
 			break;
 		}
 	}
@@ -1371,6 +1379,7 @@ void
 sendmon(Client *c, Monitor *m) {
 	if(c->mon == m)
 		return;
+	unfocus(c);
 	detach(c);
 	detachstack(c);
 	c->mon = m;
@@ -1425,8 +1434,6 @@ setup(void) {
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 	initfont(font);
-	sx = 0;
-	sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	bh = dc.h = dc.font.height + 2;
@@ -1489,7 +1496,7 @@ showhide(Client *c) {
 	if(ISVISIBLE(c)) { /* show clients top down */
 		XMoveWindow(dpy, c->win, c->x, c->y);
 		if(!lt[c->mon->sellt]->arrange || c->isfloating)
-			resize(c, c->x, c->y, c->w, c->h);
+			resize(c, c->x, c->y, c->w, c->h, False);
 		showhide(c->snext);
 	}
 	else { /* hide clients bottom up */
@@ -1526,7 +1533,6 @@ tag(const Arg *arg) {
 	}
 }
 
-#ifdef XINERAMA
 void
 tagmon(const Arg *arg) {
 	Monitor *m;
@@ -1535,7 +1541,6 @@ tagmon(const Arg *arg) {
 		return;
 	sendmon(selmon->sel, m);
 }
-#endif /* XINERAMA */
 
 int
 textnw(const char *text, unsigned int len) {
@@ -1561,7 +1566,7 @@ tile(Monitor *m) {
 	/* master */
 	c = nexttiled(m->clients);
 	mw = m->mfact * m->ww;
-	resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw);
+	resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw, False);
 
 	if(--n == 0)
 		return;
@@ -1576,7 +1581,7 @@ tile(Monitor *m) {
 
 	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
 		resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
-		       ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+		       ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);
 		if(h != m->wh)
 			y = c->y + HEIGHT(c);
 	}
@@ -1596,7 +1601,8 @@ togglefloating(const Arg *arg) {
 		return;
 	selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
 	if(selmon->sel->isfloating)
-		resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h);
+		resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+		       selmon->sel->w, selmon->sel->h, False);
 	arrange();
 }
 
@@ -1731,9 +1737,9 @@ updategeom(void) {
 	/* default monitor setup */
 	{
 		m->screen_number = 0;
-		m->wx = sx;
-		m->my = m->wy = sy;
-		m->ww = sw;
+		m->mx = m->wx = 0;
+		m->my = m->wy = 0;
+		m->mw = m->ww = sw;
 		m->mh = m->wh = sh;
 	}
 
@@ -1762,7 +1768,7 @@ updategeom(void) {
 
 	/* select focused monitor */
 	cleanupmons();
-	mons = newmons;
+	selmon = mons = newmons;
 	selmon = wintomon(root);
 }
 
@@ -1895,7 +1901,7 @@ wintomon(Window w) {
 			return m;
 	if((c = wintoclient(w)))
 		return c->mon;
-	return mons;
+	return selmon;
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are