X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=73633966d0ba8602baa0e54ae5db10eb67cffb9c;hp=7a4600f5a84b88421fc774216be7d22e09e32ec8;hb=f0a4845e7dec3a4c7316311fcf1108148bb29730;hpb=9c066c24b3d0b7767651f0f403db2e4007a847c8

diff --git a/dwm.c b/dwm.c
index 7a4600f..7363396 100644
--- a/dwm.c
+++ b/dwm.c
@@ -121,6 +121,7 @@ typedef struct {
 } Layout;
 
 struct Monitor {
+	const char *ltsymbol;
 	float mfact;
 	int num;
 	int by;               /* bar geometry */
@@ -218,9 +219,9 @@ 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 unmanage(Client *c, Bool destroyed);
 static void unmapnotify(XEvent *e);
-static void updategeom(void);
+static Bool updategeom(void);
 static void updatebarpos(Monitor *m);
 static void updatebars(void);
 static void updatenumlockmask(void);
@@ -238,7 +239,7 @@ static void zoom(const Arg *arg);
 
 /* variables */
 static const char broken[] = "broken";
-static char stext[256], ntext[8];
+static char stext[256];
 static int screen;
 static int sw, sh;           /* X display screen geometry width, height */
 static int bh, blw = 0;      /* bar geometry */
@@ -384,6 +385,7 @@ arrange(void) {
 		showhide(m->stack);
 	focus(NULL);
 	for(m = mons; m; m = m->next) {
+		m->ltsymbol = m->lt[m->sellt]->symbol;
 		if(m->lt[m->sellt]->arrange)
 			m->lt[m->sellt]->arrange(m);
 		restack(m);
@@ -466,7 +468,7 @@ cleanup(void) {
 	selmon->lt[selmon->sellt] = &foo;
 	for(m = mons; m; m = m->next)
 		while(m->stack)
-			unmanage(m->stack);
+			unmanage(m->stack, False);
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	else
@@ -533,14 +535,15 @@ configurenotify(XEvent *e) {
 	if(ev->window == root) {
 		sw = ev->width;
 		sh = ev->height;
-		updategeom();
-		if(dc.drawable != 0)
-			XFreePixmap(dpy, dc.drawable);
-		dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-		updatebars();
-		for(m = mons; m; m = m->next)
-			XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
-		arrange();
+		if(updategeom()) {
+			if(dc.drawable != 0)
+				XFreePixmap(dpy, dc.drawable);
+			dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+			updatebars();
+			for(m = mons; m; m = m->next)
+				XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
+			arrange();
+		}
 	}
 }
 
@@ -595,7 +598,7 @@ destroynotify(XEvent *e) {
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 
 	if((c = wintoclient(ev->window)))
-		unmanage(c);
+		unmanage(c, True);
 }
 
 void
@@ -649,13 +652,11 @@ dirtomon(int dir) {
 void
 drawbar(Monitor *m) {
 	int x;
-	unsigned int i, n = 0, occ = 0, urg = 0;
+	unsigned int i, occ = 0, urg = 0;
 	unsigned long *col;
 	Client *c;
 
 	for(c = m->clients; c; c = c->next) {
-		if(ISVISIBLE(c))
-			n++;
 		occ |= c->tags;
 		if(c->isurgent)
 			urg |= c->tags;
@@ -669,15 +670,10 @@ drawbar(Monitor *m) {
 		           occ & 1 << i, urg & 1 << i, col);
 		dc.x += dc.w;
 	}
-	if(blw > 0) {
-		dc.w = blw;
-		drawtext(m->lt[m->sellt]->symbol, dc.norm, False);
-		dc.x += dc.w;
-	}
-	snprintf(ntext, sizeof ntext, "%u", n);
-	dc.w = TEXTW(ntext);
-	drawtext(ntext, dc.norm, False);
-	x = (dc.x += dc.w);
+	dc.w = blw = TEXTW(m->ltsymbol);
+	drawtext(m->ltsymbol, dc.norm, False);
+	dc.x += dc.w;
+	x = dc.x;
 	if(m == selmon) { /* status is only drawn on selected monitor */
 		dc.w = TEXTW(stext);
 		dc.x = m->ww - dc.w;
@@ -1039,8 +1035,15 @@ killclient(const Arg *arg) {
 		ev.xclient.data.l[1] = CurrentTime;
 		XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
 	}
-	else
+	else {
+		XGrabServer(dpy);
+		XSetErrorHandler(xerrordummy);
+		XSetCloseDownMode(dpy, DestroyAll);
 		XKillClient(dpy, selmon->sel->win);
+		XSync(dpy, False);
+		XSetErrorHandler(xerror);
+		XUngrabServer(dpy);
+	}
 }
 
 void
@@ -1130,8 +1133,17 @@ maprequest(XEvent *e) {
 
 void
 monocle(Monitor *m) {
+	static char ntext[8];
+	unsigned int n = 0;
 	Client *c;
 
+	for(c = m->clients; c; c = c->next)
+		if(ISVISIBLE(c))
+			n++;
+	if(n > 0) { /* override layout symbol */
+		snprintf(ntext, sizeof ntext, "[%d]", n);
+		m->ltsymbol = ntext;
+	}
 	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, False);
 }
@@ -1424,8 +1436,6 @@ setmfact(const Arg *arg) {
 
 void
 setup(void) {
-	unsigned int i;
-	int w;
 	XSetWindowAttributes wa;
 
 	/* clean up any zombies immediately */
@@ -1462,10 +1472,6 @@ setup(void) {
 	if(!dc.font.set)
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 	/* init bars */
-	for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
-		w = TEXTW(layouts[i].symbol);
-		blw = MAX(blw, w);
-	}
 	updatebars();
 	updatestatus();
 	/* EWMH support per view */
@@ -1626,22 +1632,24 @@ unfocus(Client *c) {
 }
 
 void
-unmanage(Client *c) {
+unmanage(Client *c, Bool destroyed) {
 	XWindowChanges wc;
 
-	wc.border_width = c->oldbw;
 	/* The server grab construct avoids race conditions. */
-	XGrabServer(dpy);
-	XSetErrorHandler(xerrordummy);
-	XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
 	detach(c);
 	detachstack(c);
-	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-	setclientstate(c, WithdrawnState);
+	if(!destroyed) {
+		wc.border_width = c->oldbw;
+		XGrabServer(dpy);
+		XSetErrorHandler(xerrordummy);
+		XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+		setclientstate(c, WithdrawnState);
+		XSync(dpy, False);
+		XSetErrorHandler(xerror);
+		XUngrabServer(dpy);
+	}
 	free(c);
-	XSync(dpy, False);
-	XSetErrorHandler(xerror);
-	XUngrabServer(dpy);
 	focus(NULL);
 	arrange();
 }
@@ -1652,7 +1660,7 @@ unmapnotify(XEvent *e) {
 	XUnmapEvent *ev = &e->xunmap;
 
 	if((c = wintoclient(ev->window)))
-		unmanage(c);
+		unmanage(c, False);
 }
 
 void
@@ -1685,26 +1693,107 @@ updatebarpos(Monitor *m) {
 		m->by = -bh;
 }
 
-void
+Bool
 updategeom(void) {
-	int i, n = 1;
+	int i, j, nn = 1, n = 1;
 	Client *c;
 	Monitor *newmons = NULL, *m = NULL, *tm;
 
+	/* TODO:
+	 * This function needs to be seriously re-designed:
+	 *
+	 * #ifdef XINERAMA
+	 * 1. Determine number of already existing monitors n
+	 * 2. Determine number of monitors Xinerama reports nn
+	 * 3. if(n <= nn) {
+	 *       if(n < nn) {
+	 *          append nn-n monitors to current struct
+	 *          flag dirty
+	 *       }
+	 *       for(i = 0; i < nn; i++) {
+	 *           if(oldgeom != newgeom) {
+	 *               apply newgeom;
+	 *               flag dirty;
+	 *           }
+	 *       }
+	 *    }
+	 *    else {
+	 *       detach all clients
+	 *       destroy current monitor struct
+	 *       create new monitor struct 
+	 *       attach all clients to first monitor
+	 *       flag dirty;
+	 *    }
+	 *    return dirty flag to caller
+	 *        if dirty is seen by caller:
+	 *           re-arrange bars/pixmaps
+	 *           arrange()
+	 * #else
+	 *    don't share between XINERAMA and non-XINERAMA handling if it gets
+	 *    too ugly
+	 * #endif
+	 */
 #ifdef XINERAMA
-	int nn;
 	XineramaScreenInfo *info = NULL;
+	Bool *flags = NULL;
 
 	if(XineramaIsActive(dpy))
 		info = XineramaQueryScreens(dpy, &n);
-	for(i = 1, nn = n; i < n; i++)
-		if(info[i - 1].x_org == info[i].x_org && info[i - 1].y_org == info[i].y_org
-		&& info[i - 1].width == info[i].width && info[i - 1].height == info[i].height)
-			--nn;
-	n = nn; /* we only consider unique geometries as separate screens */
+	flags = (Bool *)malloc(sizeof(Bool) * n);
+	for(i = 0; i < n; i++)
+		flags[i] = False;
+	/* next double-loop seeks any combination of retrieved Xinerama info
+	 * with existing monitors, this is used to avoid unnecessary
+	 * re-allocations of monitor structs */
+	for(i = 0, nn = n; i < n; i++)
+		for(j = 0, m = mons; m; m = m->next, j++)
+			if(!flags[j]) {
+				if((flags[j] = (
+					info[i].x_org == m->mx
+					&& info[i].y_org == m->my
+					&& info[i].width == m->mw
+					&& info[i].height == m->mh)
+				))
+					--nn;
+			}
+	if(nn == 0) { /* no need to re-allocate monitors */
+		j = 0;
+		for(i = 0, m = mons; m; m = m->next, i++) {
+			m->num = info[i].screen_number;
+			if(info[i].x_org != m->mx
+			|| info[i].y_org != m->my
+			|| info[i].width != m->mw
+			|| info[i].height != m->mh)
+			{
+				m->mx = m->wx = info[i].x_org;
+				m->my = m->wy = info[i].y_org;
+				m->mw = m->ww = info[i].width;
+				m->mh = m->wh = info[i].height;
+				updatebarpos(m);
+				j++;
+			}
+		}
+		XFree(info);
+		free(flags);
+		return j > 0;
+	}
+	/* next algorithm only considers unique geometries as separate screens */
+	for(i = 0; i < n; i++)
+		flags[i] = False; /* used for ignoring certain monitors */
+	for(i = 0, nn = n; i < n; i++)
+		for(j = 0; j < n; j++)
+			if(i != j && !flags[i]) {
+				if((flags[i] = (
+					info[i].x_org == info[j].x_org
+					&& info[i].y_org == info[j].y_org
+					&& info[i].width == info[j].width
+					&& info[i].height == info[j].height)
+				))
+					--nn;
+			}
 #endif /* XINERAMA */
 	/* allocate monitor(s) for the new geometry setup */
-	for(i = 0; i < n; i++) {
+	for(i = 0; i < nn; i++) {
 		if(!(m = (Monitor *)malloc(sizeof(Monitor))))
 			die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));
 		m->next = newmons;
@@ -1713,14 +1802,18 @@ updategeom(void) {
 	/* initialise monitor(s) */
 #ifdef XINERAMA
 	if(XineramaIsActive(dpy)) {
-		for(i = 0, m = newmons; m; m = m->next, i++) {
-			m->num = info[i].screen_number;
-			m->mx = m->wx = info[i].x_org;
-			m->my = m->wy = info[i].y_org;
-			m->mw = m->ww = info[i].width;
-			m->mh = m->wh = info[i].height;
+		for(i = 0, m = newmons; m && i < n; i++) {
+			if(!flags[i]) { /* only use screens that aren't dublettes */
+				m->num = info[i].screen_number;
+				m->mx = m->wx = info[i].x_org;
+				m->my = m->wy = info[i].y_org;
+				m->mw = m->ww = info[i].width;
+				m->mh = m->wh = info[i].height;
+				m = m->next;
+			}
 		}
 		XFree(info);
+		free(flags);
 	}
 	else
 #endif /* XINERAMA */
@@ -1743,6 +1836,7 @@ updategeom(void) {
 		m->topbar = topbar;
 		m->lt[0] = &layouts[0];
 		m->lt[1] = &layouts[1 % LENGTH(layouts)];
+		m->ltsymbol = layouts[0].symbol;
 		updatebarpos(m);
 	}
 	/* reassign left over clients of disappeared monitors */
@@ -1759,6 +1853,7 @@ updategeom(void) {
 	cleanupmons();
 	selmon = mons = newmons;
 	selmon = wintomon(root);
+	return True;
 }
 
 void