X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=88e0b1b68c1466721706ed3d6e59b0e47112f4e1;hb=fa5ae54bbb7f890540f4700809e00497018e0239;hp=56252371e45e3685f57f57b3356f0580d62f75e4;hpb=913333f51840d942bdde891eb2fb3c7f66b83db1;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 5625237..88e0b1b 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1,3 +1,4 @@
+#define XINULATOR /* debug, simulates dual head */
 /* See LICENSE file for copyright and license details.
  *
  * dynamic window manager is designed like any other X client as well. It is
@@ -375,14 +376,14 @@ arrange(void) {
 
 void
 attach(Client *c) {
-	c->next = selmon->clients;
-	selmon->clients = c;
+	c->next = c->mon->clients;
+	c->mon->clients = c;
 }
 
 void
 attachstack(Client *c) {
-	c->snext = selmon->stack;
-	selmon->stack = c;
+	c->snext = c->mon->stack;
+	c->mon->stack = c;
 }
 
 void
@@ -1158,7 +1159,6 @@ movemouse(const Arg *arg) {
 
 Client *
 nexttiled(Client *c) {
-	// TODO: m handling
 	for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
 	return c;
 }
@@ -1475,11 +1475,20 @@ tag(const Arg *arg) {
 void
 tagmon(const Arg *arg) {
 	unsigned int i;
+	Client *c;
 	Monitor *m;
 
+	if(!(c = selmon->sel))
+		return;
 	for(i = 0, m = mons; m; m = m->next, i++)
 		if(i == arg->ui) {
-			selmon->sel->m = m;
+			detach(c);
+			detachstack(c);
+			c->mon = m;
+			attach(c);
+			attachstack(c);
+			selmon->sel = selmon->stack;
+			m->sel = c;
 			arrange();
 			break;
 		}
@@ -1584,8 +1593,10 @@ unmanage(Client *c) {
 	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
 	detach(c);
 	detachstack(c);
-	if(selmon->sel == c)
+	if(c->mon->sel == c) {
+		c->mon->sel = c->mon->stack;
 		focus(NULL);
+	}
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
 	free(c);
@@ -1642,7 +1653,9 @@ updategeom(void) {
 	Client *c;
 	Monitor *newmons = NULL, *m, *tm;
 
-#ifdef XINERAMA
+#ifdef XINULATOR
+	n = 2;
+#elif defined(XINERAMA)
 	XineramaScreenInfo *info = NULL;
 
 	if(XineramaIsActive(dpy))
@@ -1656,7 +1669,23 @@ updategeom(void) {
 	}
 
 	/* initialise monitor(s) */
-#ifdef XINERAMA
+#ifdef XINULATOR
+	if(1) {
+		m = newmons;
+		m->screen_number = 0;
+		m->wx = sx;
+		m->my = m->wy = sy;
+		m->ww = sw;
+		m->mh = m->wh = sh / 2;
+		m = newmons->next;
+		m->screen_number = 1;
+		m->wx = sx;
+		m->my = m->wy = sy + sh / 2;
+		m->ww = sw;
+		m->mh = m->wh = sh / 2;
+	}
+	else
+#elif defined(XINERAMA)
 	if(XineramaIsActive(dpy)) {
 		for(i = 0, m = newmons; m; m = m->next, i++) {
 			m->screen_number = info[i].screen_number;
@@ -1695,7 +1724,7 @@ updategeom(void) {
 		for(tm = mons; tm; tm = tm->next)
 			if(tm->screen_number == m->screen_number) {
 				m->clients = tm->clients;
-				m->stack = tm->stack;
+				m->sel = m->stack = tm->stack;
 				tm->clients = NULL;
 				tm->stack = NULL;
 				for(c = m->clients; c; c = c->next)
@@ -1705,18 +1734,12 @@ updategeom(void) {
 
 	/* reassign left over clients of disappeared monitors */
 	for(tm = mons; tm; tm = tm->next) {
-		while(tm->clients) {
-			c = tm->clients->next;
-			tm->clients->next = newmons->clients;
-			tm->clients->mon = newmons;
-			newmons->clients = tm->clients;
-			tm->clients = c;
-		}
-		while(tm->stack) {
-			c = tm->stack->snext;
-			tm->stack->snext = newmons->stack;
-			newmons->stack = tm->stack;
-			tm->stack = c;
+		while((c = tm->clients)) {
+			detach(c);
+			detachstack(c);
+			c->mon = newmons;
+			attach(c);
+			attachstack(c);
 		}
 	}