X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=b54ccd4f30e9c068be1453b62fb4caf9e45075cc;hp=7e4e177f742c4e68b7a2eb745c2e47ad66a11b01;hb=ab06f7444bf558d4a58e6ca617b1b4f55c6b00c7;hpb=d53ceee68266b0910d632b1978d8fd6371ff52b3

diff --git a/dwm.c b/dwm.c
index 7e4e177..b54ccd4 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
@@ -44,7 +45,7 @@
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
-#define ISVISIBLE(M, C)         ((M) == (C->m) && (C->tags & M->tagset[M->seltags]))
+#define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 #define MAX(A, B)               ((A) > (B) ? (A) : (B))
 #define MIN(A, B)               ((A) < (B) ? (A) : (B))
@@ -89,7 +90,7 @@ struct Client {
 	Bool isfixed, isfloating, isurgent;
 	Client *next;
 	Client *snext;
-	Monitor *m;
+	Monitor *mon;
 	Window win;
 };
 
@@ -124,14 +125,18 @@ struct Monitor {
 	int screen_number;
 	float mfact;
 	int by, btx;          /* bar geometry */
+	int my, mh;           /* vertical screen size*/
 	int wx, wy, ww, wh;   /* window area  */
 	unsigned int seltags;
 	unsigned int sellt;
 	unsigned int tagset[2];
 	Bool showbar;
 	Bool topbar;
-	Window barwin;
+	Client *clients;
+	Client *sel;
+	Client *stack;
 	Monitor *next;
+	Window barwin;
 };
 
 typedef struct {
@@ -184,7 +189,7 @@ static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void movemouse(const Arg *arg);
-static Client *nexttiled(Monitor *m, Client *c);
+static Client *nexttiled(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static void resize(Client *c, int x, int y, int w, int h);
@@ -206,9 +211,11 @@ static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
+static void unfocus(Client *c);
 static void unmanage(Client *c);
 static void unmapnotify(XEvent *e);
 static void updategeom(void);
+static void updatebarpos(Monitor *m);
 static void updatebars(void);
 static void updatenumlockmask(void);
 static void updatesizehints(Client *c);
@@ -249,9 +256,6 @@ static void (*handler[LASTEvent]) (XEvent *) = {
 static Atom wmatom[WMLast], netatom[NetLast];
 static Bool otherwm;
 static Bool running = True;
-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc;
@@ -288,7 +292,7 @@ applyrules(Client *c) {
 		if(ch.res_name)
 			XFree(ch.res_name);
 	}
-	c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->m->tagset[c->m->seltags];
+	c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
 }
 
 Bool
@@ -360,7 +364,9 @@ void
 arrange(void) {
 	Monitor *m;
 
-	showhide(stack);
+	/* optimise two loops into one, check focus(NULL) */
+	for(m = mons; m; m = m->next)
+		showhide(m->stack);
 	focus(NULL);
 	for(m = mons; m; m = m->next) {
 		if(lt[m->sellt]->arrange)
@@ -371,14 +377,14 @@ arrange(void) {
 
 void
 attach(Client *c) {
-	c->next = clients;
-	clients = c;
+	c->next = c->mon->clients;
+	c->mon->clients = c;
 }
 
 void
 attachstack(Client *c) {
-	c->snext = stack;
-	stack = c;
+	c->snext = c->mon->stack;
+	c->mon->stack = c;
 }
 
 void
@@ -386,10 +392,21 @@ buttonpress(XEvent *e) {
 	unsigned int i, x, click;
 	Arg arg = {0};
 	Client *c;
+	Monitor *m;
 	XButtonPressedEvent *ev = &e->xbutton;
 
 	click = ClkRootWin;
-	if(ev->window == selmon->barwin) {
+	/* focus monitor if necessary */
+	for(m = mons; m; m = m->next)
+		if(ev->window == m->barwin) {
+			if(m != selmon) {
+				unfocus(selmon->stack);
+				selmon = m;
+				focus(NULL);
+			}
+			break;
+		}
+	if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
 		i = 0;
 		x = selmon->btx;
 		do
@@ -435,11 +452,15 @@ void
 cleanup(void) {
 	Arg a = {.ui = ~0};
 	Layout foo = { "", NULL };
+	Monitor *m;
 
 	view(&a);
 	lt[selmon->sellt] = &foo;
-	while(stack)
-		unmanage(stack);
+
+	/* TODO: consider simplifying cleanup code of the stack, perhaps do that in cleanmons() ? */
+	for(m = mons; m; m = m->next)
+		while(m->stack)
+			unmanage(m->stack);
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	else
@@ -541,7 +562,7 @@ configurerequest(XEvent *e) {
 				c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
 			if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
-			if(ISVISIBLE((c->m), c))
+			if(ISVISIBLE(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -573,7 +594,7 @@ void
 detach(Client *c) {
 	Client **tc;
 
-	for(tc = &clients; *tc && *tc != c; tc = &(*tc)->next);
+	for(tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
 	*tc = c->next;
 }
 
@@ -581,7 +602,7 @@ void
 detachstack(Client *c) {
 	Client **tc;
 
-	for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
+	for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
 	*tc = c->snext;
 }
 
@@ -602,22 +623,21 @@ drawbar(Monitor *m) {
 	unsigned long *col;
 	Client *c;
 
-	for(c = clients; c; c = c->next) {
-		if(m == c->m) {
-			occ |= c->tags;
-			if(c->isurgent)
-				urg |= c->tags;
-		}
+	for(c = m->clients; c; c = c->next) {
+		occ |= c->tags;
+		if(c->isurgent)
+			urg |= c->tags;
 	}
 
 	dc.x = 0;
 #ifdef XINERAMA
 	{
-		/*
-		dc.w = TEXTW(m->symbol);
-		drawtext(NULL, selmon == m ? dc.sel : dc.norm, False);
+		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);
 		dc.x += dc.w;
-		*/
 	}
 #endif /* XINERAMA */
 	m->btx = dc.x;
@@ -625,7 +645,7 @@ drawbar(Monitor *m) {
 		dc.w = TEXTW(tags[i]);
 		col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
 		drawtext(tags[i], col, urg & 1 << i);
-		drawsquare(m == selmon && sel && sel->tags & 1 << i,
+		drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
 		           occ & 1 << i, urg & 1 << i, col);
 		dc.x += dc.w;
 	}
@@ -636,7 +656,7 @@ drawbar(Monitor *m) {
 	}
 	else
 		x = dc.x;
-	if(m == selmon) {
+	if(m == selmon) { /* status is only drawn on selected monitor */
 		dc.w = TEXTW(stext);
 		dc.x = m->ww - dc.w;
 		if(dc.x < x) {
@@ -644,20 +664,19 @@ drawbar(Monitor *m) {
 			dc.w = m->ww - x;
 		}
 		drawtext(stext, dc.norm, False);
-		if((dc.w = dc.x - x) > bh) {
-			dc.x = x;
-			if(sel) {
-				drawtext(sel->name, dc.sel, False);
-				drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
-			}
-			else
-				drawtext(NULL, dc.norm, False);
-		}
 	}
 	else {
+		dc.x = m->ww;
+	}
+	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
-		dc.w = m->ww - x;
-		drawtext(NULL, dc.norm, False);
+		if(m->sel) {
+			col = m == selmon ? dc.sel : dc.norm;
+			drawtext(m->sel->name, col, False);
+			drawsquare(m->sel->isfixed, m->sel->isfloating, False, col);
+		}
+		else
+			drawtext(NULL, dc.norm, False);
 	}
 	XCopyArea(dpy, dc.drawable, m->barwin, dc.gc, 0, 0, m->ww, bh, 0, 0);
 	XSync(dpy, False);
@@ -748,13 +767,13 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-	if(!c || !ISVISIBLE((c->m), c))
-		for(c = stack; c && !ISVISIBLE(selmon, c); c = c->snext);
-	if(sel && sel != c) {
-		grabbuttons(sel, False);
-		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
-	}
+	if(!c || !ISVISIBLE(c))
+		for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+	if(selmon->sel)
+		unfocus(selmon->sel);
 	if(c) {
+		if(c->mon != selmon)
+			selmon = c->mon;
 		if(c->isurgent)
 			clearurgent(c);
 		detachstack(c);
@@ -765,7 +784,7 @@ focus(Client *c) {
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-	sel = c;
+	selmon->sel = c;
 	drawbars();
 }
 
@@ -773,8 +792,8 @@ void
 focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 	XFocusChangeEvent *ev = &e->xfocus;
 
-	if(sel && ev->window != sel->win)
-		XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
+	if(selmon->sel && ev->window != selmon->sel->win)
+		XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime);
 }
 
 #ifdef XINERAMA
@@ -785,8 +804,13 @@ focusmon(const Arg *arg) {
 
 	for(i = 0, m = mons; m; m = m->next, i++)
 		if(i == arg->ui) {
-			selmon = m;
-			focus(NULL);
+			if(m->stack)
+				focus(m->stack);
+			else {
+				unfocus(selmon->stack);
+				selmon = m;
+				focus(NULL);
+			}
 			drawbars();
 			break;
 		}
@@ -797,20 +821,20 @@ void
 focusstack(const Arg *arg) {
 	Client *c = NULL, *i;
 
-	if(!sel)
+	if(!selmon->sel)
 		return;
 	if(arg->i > 0) {
-		for(c = sel->next; c && !ISVISIBLE(selmon, c); c = c->next);
+		for(c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
 		if(!c)
-			for(c = clients; c && !ISVISIBLE(selmon, c); c = c->next);
+			for(c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
 	}
 	else {
-		for(i = clients; i != sel; i = i->next)
-			if(ISVISIBLE(selmon, i))
+		for(i = selmon->clients; i != selmon->sel; i = i->next)
+			if(ISVISIBLE(i))
 				c = i;
 		if(!c)
 			for(; i; i = i->next)
-				if(ISVISIBLE(selmon, i))
+				if(ISVISIBLE(i))
 					c = i;
 	}
 	if(c) {
@@ -822,9 +846,13 @@ focusstack(const Arg *arg) {
 Client *
 getclient(Window w) {
 	Client *c;
+	Monitor *m;
 
-	for(c = clients; c && c->win != w; c = c->next);
-	return c;
+	for(m = mons; m; m = m->next)
+		for(c = m->clients; c; c = c->next)
+			if(c->win == w)
+				return c;
+	return NULL;
 }
 
 unsigned long
@@ -989,19 +1017,19 @@ void
 killclient(const Arg *arg) {
 	XEvent ev;
 
-	if(!sel)
+	if(!selmon->sel)
 		return;
-	if(isprotodel(sel)) {
+	if(isprotodel(selmon->sel)) {
 		ev.type = ClientMessage;
-		ev.xclient.window = sel->win;
+		ev.xclient.window = selmon->sel->win;
 		ev.xclient.message_type = wmatom[WMProtocols];
 		ev.xclient.format = 32;
 		ev.xclient.data.l[0] = wmatom[WMDelete];
 		ev.xclient.data.l[1] = CurrentTime;
-		XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
+		XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
 	}
 	else
-		XKillClient(dpy, sel->win);
+		XKillClient(dpy, selmon->sel->win);
 }
 
 void
@@ -1015,7 +1043,7 @@ manage(Window w, XWindowAttributes *wa) {
 		die("fatal: could not malloc() %u bytes\n", sizeof(Client));
 	*c = cz;
 	c->win = w;
-	c->m = selmon;
+	c->mon = selmon;
 
 	/* geometry */
 	c->x = wa->x;
@@ -1035,8 +1063,8 @@ manage(Window w, XWindowAttributes *wa) {
 			c->y = sy + sh - HEIGHT(c);
 		c->x = MAX(c->x, sx);
 		/* only fix client y-offset, if the client center might cover the bar */
-		c->y = MAX(c->y, ((selmon->by == 0) && (c->x + (c->w / 2) >= selmon->wx)
-		           && (c->x + (c->w / 2) < selmon->wx + selmon->ww)) ? bh : sy);
+		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->bw = borderpx;
 	}
 
@@ -1092,7 +1120,7 @@ void
 monocle(Monitor *m) {
 	Client *c;
 
-	for(c = nexttiled(m, clients); c; c = nexttiled(m, c->next))
+	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);
 }
 
@@ -1104,7 +1132,7 @@ movemouse(const Arg *arg) {
 	Window dummy;
 	XEvent ev;
 
-	if(!(c = sel))
+	if(!(c = selmon->sel))
 		return;
 	restack(selmon);
 	ocx = c->x;
@@ -1148,9 +1176,8 @@ movemouse(const Arg *arg) {
 }
 
 Client *
-nexttiled(Monitor *m, Client *c) {
-	// TODO: m handling
-	for(; c && (c->isfloating || !ISVISIBLE(m, c)); c = c->next);
+nexttiled(Client *c) {
+	for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
 	return c;
 }
 
@@ -1182,7 +1209,7 @@ propertynotify(XEvent *e) {
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
-			if(c == sel)
+			if(c == selmon->sel)
 				drawbars();
 		}
 	}
@@ -1203,8 +1230,7 @@ resize(Client *c, int x, int y, int w, int h) {
 		c->w = wc.width = w;
 		c->h = wc.height = h;
 		wc.border_width = c->bw;
-		XConfigureWindow(dpy, c->win,
-				CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+		XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
 		configure(c);
 		XSync(dpy, False);
 	}
@@ -1217,7 +1243,7 @@ resizemouse(const Arg *arg) {
 	Client *c;
 	XEvent ev;
 
-	if(!(c = sel))
+	if(!(c = selmon->sel))
 		return;
 	restack(selmon);
 	ocx = c->x;
@@ -1262,15 +1288,15 @@ restack(Monitor *m) {
 	XWindowChanges wc;
 
 	drawbars();
-	if(!sel)
+	if(!m->sel)
 		return;
-	if(m == selmon && (sel->isfloating || !lt[m->sellt]->arrange))
-		XRaiseWindow(dpy, sel->win);
+	if(m->sel->isfloating || !lt[m->sellt]->arrange)
+		XRaiseWindow(dpy, m->sel->win);
 	if(lt[m->sellt]->arrange) {
 		wc.stack_mode = Below;
 		wc.sibling = m->barwin;
-		for(c = stack; c; c = c->snext)
-			if(!c->isfloating && ISVISIBLE(m, c)) {
+		for(c = m->stack; c; c = c->snext)
+			if(!c->isfloating && ISVISIBLE(c)) {
 				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
 				wc.sibling = c->win;
 			}
@@ -1331,7 +1357,7 @@ setlayout(const Arg *arg) {
 		selmon->sellt ^= 1;
 	if(arg && arg->v)
 		lt[selmon->sellt] = (Layout *)arg->v;
-	if(sel)
+	if(selmon->sel)
 		arrange();
 	else
 		drawbars();
@@ -1422,9 +1448,9 @@ void
 showhide(Client *c) {
 	if(!c)
 		return;
-	if(ISVISIBLE((c->m), c)) { /* show clients top down */
+	if(ISVISIBLE(c)) { /* show clients top down */
 		XMoveWindow(dpy, c->win, c->x, c->y);
-		if(!lt[c->m->sellt]->arrange || c->isfloating)
+		if(!lt[c->mon->sellt]->arrange || c->isfloating)
 			resize(c, c->x, c->y, c->w, c->h);
 		showhide(c->snext);
 	}
@@ -1456,8 +1482,8 @@ spawn(const Arg *arg) {
 
 void
 tag(const Arg *arg) {
-	if(sel && arg->ui & TAGMASK) {
-		sel->tags = arg->ui & TAGMASK;
+	if(selmon->sel && arg->ui & TAGMASK) {
+		selmon->sel->tags = arg->ui & TAGMASK;
 		arrange();
 	}
 }
@@ -1466,11 +1492,21 @@ 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) {
-			sel->m = m;
+			detach(c);
+			detachstack(c);
+			c->mon = m;
+			attach(c);
+			attachstack(c);
+			m->sel = c;
+			for(c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+			selmon->sel = c;
 			arrange();
 			break;
 		}
@@ -1494,12 +1530,12 @@ tile(Monitor *m) {
 	unsigned int i, n;
 	Client *c;
 
-	for(n = 0, c = nexttiled(m, clients); c; c = nexttiled(m, c->next), n++);
+	for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
 	if(n == 0)
 		return;
 
 	/* master */
-	c = nexttiled(m, clients);
+	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);
 
@@ -1514,7 +1550,7 @@ tile(Monitor *m) {
 	if(h < bh)
 		h = m->wh;
 
-	for(i = 0, c = nexttiled(m, c->next); c; c = nexttiled(m, c->next), i++) {
+	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));
 		if(h != m->wh)
@@ -1525,18 +1561,18 @@ tile(Monitor *m) {
 void
 togglebar(const Arg *arg) {
 	selmon->showbar = !selmon->showbar;
-	updategeom();
+	updatebarpos(selmon);
 	XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
 	arrange();
 }
 
 void
 togglefloating(const Arg *arg) {
-	if(!sel)
+	if(!selmon->sel)
 		return;
-	sel->isfloating = !sel->isfloating || sel->isfixed;
-	if(sel->isfloating)
-		resize(sel, sel->x, sel->y, sel->w, sel->h);
+	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);
 	arrange();
 }
 
@@ -1544,12 +1580,12 @@ void
 toggletag(const Arg *arg) {
 	unsigned int mask;
 
-	if(!sel)
+	if(!selmon->sel)
 		return;
 	
-	mask = sel->tags ^ (arg->ui & TAGMASK);
+	mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
 	if(mask) {
-		sel->tags = mask;
+		selmon->sel->tags = mask;
 		arrange();
 	}
 }
@@ -1565,6 +1601,15 @@ toggleview(const Arg *arg) {
 }
 
 void
+unfocus(Client *c) {
+	if(!c)
+		return;
+	grabbuttons(c, False);
+	XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+	XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+void
 unmanage(Client *c) {
 	XWindowChanges wc;
 
@@ -1575,8 +1620,13 @@ unmanage(Client *c) {
 	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
 	detach(c);
 	detachstack(c);
-	if(sel == c)
+	if(c->mon->sel == c) {
+		/* TODO: consider separate the next code into a function or into detachstack? */
+		Client *tc;
+		for(tc = c->mon->stack; tc && !ISVISIBLE(tc); tc = tc->snext);
+		c->mon->sel = tc;
 		focus(NULL);
+	}
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
 	free(c);
@@ -1615,12 +1665,29 @@ updatebars(void) {
 }
 
 void
+updatebarpos(Monitor *m) {
+	m->wy = m->my;
+	m->wh = m->mh;
+	if(m->showbar) {
+		m->wh -= bh;
+		m->by = m->topbar ? m->wy : m->wy + m->wh;
+		m->wy = m->topbar ? m->wy + bh : m->wy;
+	}
+	else
+		m->by = -bh;
+}
+
+void
 updategeom(void) {
-	int i, n;
+	int i, di, n = 1, x, y;
+	unsigned int dui;
 	Client *c;
-	Monitor *newmons = NULL, *m;
+	Monitor *newmons = NULL, *m, *tm;
+	Window dummy;
 
-#ifdef XINERAMA
+#ifdef XINULATOR
+	n = 2;
+#elif defined(XINERAMA)
 	XineramaScreenInfo *info = NULL;
 
 	if(XineramaIsActive(dpy))
@@ -1634,14 +1701,30 @@ 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;
 			m->wx = info[i].x_org;
-			m->wy = info[i].y_org;
+			m->my = m->wy = info[i].y_org;
 			m->ww = info[i].width;
-			m->wh = info[i].height;
+			m->mh = m->wh = info[i].height;
 		}
 		XFree(info);
 	}
@@ -1651,51 +1734,45 @@ updategeom(void) {
 	{
 		m->screen_number = 0;
 		m->wx = sx;
-		m->wy = sy;
+		m->my = m->wy = sy;
 		m->ww = sw;
-		m->wh = sh;
+		m->mh = m->wh = sh;
 	}
 
 	/* bar geometry setup */
 	for(m = newmons; m; m = m->next) {
 		/* TODO: consider removing the following values from config.h */
+		m->clients = NULL;
+		m->sel = NULL;
+		m->stack = NULL;
 		m->seltags = 0;
 		m->sellt = 0;
 		m->tagset[0] = m->tagset[1] = 1;
 		m->mfact = mfact;
 		m->showbar = showbar;
 		m->topbar = topbar;
-		if(m->showbar) {
-			m->wh -= bh;
-			m->by = m->topbar ? m->wy : m->wy + m->wh;
-			m->wy = m->topbar ? m->wy + bh : m->wy;
-		}
-		else
-			m->by = -bh;
-		/* reassign all clients with same screen number */
-		for(c = clients; c; c = c->next)
-			if(c->m->screen_number == m->screen_number)
-				c->m = m;
+		updatebarpos(m);
 	}
 
-	/* reassign left over clients with disappeared screen number */
-	for(c = clients; c; c = c->next)
-		if(c->m->screen_number >= n)
-			c->m = newmons;
+	/* reassign left over clients of disappeared monitors */
+	for(tm = mons; tm; tm = tm->next)
+		while(tm->clients) {
+			c = tm->clients;
+			tm->clients = c->next;
+			detachstack(c);
+			c->mon = newmons;
+			attach(c);
+			attachstack(c);
+		}
 
 	/* select focused monitor */
-	if(!selmon) {
-		selmon = newmons;
-		int di, x, y;
-		unsigned int dui;
-		Window dummy;
-		if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) 
-			for(m = newmons; m; m = m->next)
-				if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
-					selmon = m;
-					break;
-				}
-	}
+	selmon = newmons;
+	if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) 
+		for(m = newmons; m; m = m->next)
+			if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
+				selmon = m;
+				break;
+			}
 
 	/* final assignment of new monitors */
 	cleanupmons();
@@ -1785,7 +1862,7 @@ updatewmhints(Client *c) {
 	XWMHints *wmh;
 
 	if((wmh = XGetWMHints(dpy, c->win))) {
-		if(c == sel && wmh->flags & XUrgencyHint) {
+		if(c == selmon->sel && wmh->flags & XUrgencyHint) {
 			wmh->flags &= ~XUrgencyHint;
 			XSetWMHints(dpy, c->win, wmh);
 		}
@@ -1841,12 +1918,12 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 
 void
 zoom(const Arg *arg) {
-	Client *c = sel;
+	Client *c = selmon->sel;
 
-	if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (sel && sel->isfloating))
+	if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (selmon->sel && selmon->sel->isfloating))
 		return;
-	if(c == nexttiled(selmon, clients))
-		if(!c || !(c = nexttiled(selmon, c->next)))
+	if(c == nexttiled(selmon->clients))
+		if(!c || !(c = nexttiled(c->next)))
 			return;
 	detach(c);
 	attach(c);