X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=54497fe6e19b356c5723f09c69096e45dfd328f1;hb=e9824be6280586629060a5d678057b89d60b50fb;hp=49ffc8545ff5510db473f942fde1d337cab99062;hpb=63d5e9bd53052d6ac7beb8bbba0a2ea2b667b96f;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 49ffc85..54497fe 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -50,7 +50,7 @@
 
 static const char	*cvstag = "$scrotwm$";
 
-#define	SWM_VERSION	"0.6"
+#define	SWM_VERSION	"0.7"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -158,6 +158,8 @@ double			dialog_ratio = .6;
 char			*bar_argv[] = { NULL, NULL };
 int			bar_pipe[2];
 char			bar_ext[SWM_BAR_MAX];
+char			bar_vertext[SWM_BAR_MAX];
+int			bar_version = 0;
 sig_atomic_t		bar_alarm = 0;
 int			bar_delay = 30;
 int			bar_enabled = 1;
@@ -179,6 +181,7 @@ char			*bar_fonts[] = {
 /* terminal + args */
 char			*spawn_term[] = { "xterm", NULL };
 char			*spawn_screenshot[] = { "screenshot.sh", NULL, NULL };
+char			*spawn_lock[] = { "xlock", NULL };
 char			*spawn_menu[] = { "dmenu_run", "-fn", NULL, "-nb", NULL,
 			    "-nf", NULL, "-sb", NULL, "-sf", NULL, NULL };
 
@@ -203,9 +206,9 @@ struct workspace;
 struct swm_region {
 	TAILQ_ENTRY(swm_region)	entry;
 	struct swm_geometry	g;
-	Window			bar_window;
 	struct workspace 	*ws;	/* current workspace on this region */
 	struct swm_screen	*s;	/* screen idx */
+	Window			bar_window;
 }; 
 TAILQ_HEAD(swm_region_list, swm_region);
 
@@ -216,6 +219,8 @@ struct ws_win {
 	int			got_focus;
 	int			floating;
 	int			transient;
+	int			manual;
+	unsigned long		quirks;
 	struct workspace	*ws;	/* always valid */
 	struct swm_screen	*s;	/* always valid, never changes */
 	XWindowAttributes	wa;
@@ -310,6 +315,8 @@ union arg {
 #define SWM_ARG_ID_CYCLESC_DOWN	(15)
 #define SWM_ARG_ID_SS_ALL	(0)
 #define SWM_ARG_ID_SS_WINDOW	(1)
+#define SWM_ARG_ID_DONTCENTER	(0)
+#define SWM_ARG_ID_CENTER	(1)
 	char			**argv;
 };
 
@@ -319,9 +326,12 @@ struct quirk {
 	char			*name;
 	unsigned long		quirk;
 #define SWM_Q_FLOAT		(1<<0)
+#define SWM_Q_TRANSSZ		(1<<1)
 } quirks[] = {
 	{ "MPlayer",		"xv",		SWM_Q_FLOAT },
 	{ "OpenOffice.org 2.4",	"VCLSalFrame",	SWM_Q_FLOAT },
+	{ "OpenOffice.org 3.0",	"VCLSalFrame",	SWM_Q_FLOAT },
+	{ "Firefox-bin",	"firefox-bin",	SWM_Q_TRANSSZ},
 	{ NULL,		NULL,		0},
 };
 
@@ -398,6 +408,36 @@ setscreencolor(char *val, int i, int c)
 		    i, ScreenCount(display));
 }
 
+void		new_region(struct swm_screen *, struct workspace *,
+			    int, int, int, int);
+
+void
+custom_region(char *val)
+{
+	unsigned int			sidx, x, y, w, h;
+
+	if (sscanf(val, "screen[%u]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5)
+		errx(1, "invalid custom region, "
+		    "should be 'screen[<n>]:<n>x<n>+<n>+<n>\n");
+	if (sidx < 1 || sidx > ScreenCount(display))
+		errx(1, "invalid screen index: %d out of bounds (maximum %d)\n",
+		    sidx, ScreenCount(display));
+	sidx--;
+
+	if (w < 1 || h < 1)
+		errx(1, "region %ux%u+%u+%u too small\n", w, h, x, y);
+
+	if (x  < 0 || x > DisplayWidth(display, sidx) ||
+	    y < 0 || y > DisplayHeight(display, sidx) ||
+	    w + x > DisplayWidth(display, sidx) ||
+	    h + y > DisplayHeight(display, sidx))
+		errx(1, "region %ux%u+%u+%u not within screen boundaries "
+		    "(%ux%u)\n", w, h, x, y,
+		    DisplayWidth(display, sidx), DisplayHeight(display, sidx));
+	    
+	new_region(&screens[sidx], NULL, x, y, w, h);
+}
+
 int
 varmatch(char *var, char *name, int *index)
 {
@@ -504,6 +544,13 @@ conf_load(char *filename)
 				goto bad;
 			break;
 
+		case 'r':
+			if (!strncmp(var, "region", strlen("region")))
+				custom_region(val);
+			else
+				goto bad;
+			break;
+
 		case 's':
 			if (!strncmp(var, "spawn_term", strlen("spawn_term")))
 				asprintf(&spawn_term[0], "%s", val);
@@ -599,8 +646,8 @@ bar_update(void)
 	for (i = 0; i < ScreenCount(display); i++) {
 		x = 1;
 		TAILQ_FOREACH(r, &screens[i].rl, entry) {
-			snprintf(loc, sizeof loc, "%s     %d:%d    %s",
-			    s, x++, r->ws->idx + 1, bar_ext);
+			snprintf(loc, sizeof loc, "%s     %d:%d    %s    %s",
+			    s, x++, r->ws->idx + 1, bar_ext, bar_vertext);
 			bar_print(r, loc);
 		}
 	}
@@ -726,6 +773,17 @@ bar_setup(struct swm_region *r)
 }
 
 void
+version(struct swm_region *r, union arg *args)
+{
+	bar_version = !bar_version;
+	if (bar_version)
+		strlcpy(bar_vertext, cvstag, sizeof bar_vertext);
+	else
+		strlcpy(bar_vertext, "", sizeof bar_vertext);
+	bar_update();
+}
+
+void
 config_win(struct ws_win *win)
 {
 	XConfigureEvent		ce;
@@ -958,7 +1016,7 @@ switchws(struct swm_region *r, union arg *args)
 	old_ws = this_r->ws;
 	new_ws = &this_r->s->ws[wsid];
 
-	DNPRINTF(SWM_D_WS, "switchws screen %d region %dx%d+%d+%d: "
+	DNPRINTF(SWM_D_WS, "switchws screen[%d]:%dx%d+%d+%d: "
 	    "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r),
 	    old_ws->idx, wsid);
 
@@ -969,13 +1027,14 @@ switchws(struct swm_region *r, union arg *args)
 	if (!other_r) {
 		/* if the other workspace is hidden, switch windows */
 		/* map new window first to prevent ugly blinking */
+		old_ws->r = NULL;
+		old_ws->restack = 1;
+
 		TAILQ_FOREACH(win, &new_ws->winlist, entry)
 			XMapRaised(display, win->id);
 
 		TAILQ_FOREACH(win, &old_ws->winlist, entry)
 			XUnmapWindow(display, win->id);
-		old_ws->r = NULL;
-		old_ws->restack = 1;
 	} else {
 		other_r->ws = old_ws;
 		old_ws->r = other_r;
@@ -998,7 +1057,7 @@ cyclews(struct swm_region *r, union arg *args)
 	struct swm_screen	*s = r->s;
 
 	DNPRINTF(SWM_D_WS, "cyclews id %d "
-	    "in screen %d region %dx%d+%d+%d ws %d\n", args->id,
+	    "in screen[%d]:%dx%d+%d+%d ws %d\n", args->id,
 	    r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), r->ws->idx);
 
 	a.id = r->ws->idx;
@@ -1217,14 +1276,19 @@ stack_floater(struct ws_win *win, struct swm_region *r)
 	bzero(&wc, sizeof wc);
 	mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
 	wc.border_width = 1;
-	if (win->transient) {
+	if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) {
 		win->g.w = (double)WIDTH(r) * dialog_ratio;
 		win->g.h = (double)HEIGHT(r) * dialog_ratio;
 	}
 	wc.width = win->g.w;
 	wc.height = win->g.h;
-	wc.x = (WIDTH(r) - win->g.w) / 2;
-	wc.y = (HEIGHT(r) - win->g.h) / 2;
+	if (win->manual) {
+		wc.x = win->g.x;
+		wc.y = win->g.y;
+	} else {
+		wc.x = (WIDTH(r) - win->g.w) / 2;
+		wc.y = (HEIGHT(r) - win->g.h) / 2;
+	}
 
 	DNPRINTF(SWM_D_STACK, "stack_floater: win %lu x %d y %d w %d h %d\n",
 	    win->id, wc.x, wc.y, wc.width, wc.height);
@@ -1307,8 +1371,12 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 	extra = r_g.h - (colno * hrh);
 	win_g.h = hrh - 2;
 
+	/*  stack all the tiled windows */
 	i = j = 0;
 	TAILQ_FOREACH(win, &ws->winlist, entry) {
+		if (win->transient != 0 || win->floating != 0)
+			continue;
+
 		if (split && i == split) {
 			colno = winno - split;
 			hrh = (r_g.h / colno);
@@ -1349,35 +1417,37 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 		else
 			win_g.y += last_h + 2;
 
-		if (win->transient != 0 || win->floating != 0)
-			stack_floater(win, ws->r);
-		else {
-			bzero(&wc, sizeof wc);
-			wc.border_width = 1;
-			if (rot) {
-				win->g.x = wc.x = win_g.y;
-				win->g.y = wc.y = win_g.x;
-				win->g.w = wc.width = win_g.h;
-				win->g.h = wc.height = win_g.w;
-			} else {
-				win->g.x = wc.x = win_g.x;
-				win->g.y = wc.y = win_g.y;
-				win->g.w = wc.width = win_g.w;
-				win->g.h = wc.height = win_g.h;
-			}
-			mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
-			XConfigureWindow(display, win->id, mask, &wc);
-			/*
-			fprintf(stderr, "vertical_stack: win %d x %d y %d w %d h %d bw %d\n", win->id, win->g.x, win->g.y, win->g.w , win->g.h, wc.border_width);
-			*/
+		bzero(&wc, sizeof wc);
+		wc.border_width = 1;
+		if (rot) {
+			win->g.x = wc.x = win_g.y;
+			win->g.y = wc.y = win_g.x;
+			win->g.w = wc.width = win_g.h;
+			win->g.h = wc.height = win_g.w;
+		} else {
+			win->g.x = wc.x = win_g.x;
+			win->g.y = wc.y = win_g.y;
+			win->g.w = wc.width = win_g.w;
+			win->g.h = wc.height = win_g.h;
 		}
-
+		mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+		XConfigureWindow(display, win->id, mask, &wc);
 		XMapRaised(display, win->id);
+
 		last_h = win_g.h;
 		i++;
 		j++;
 	}
 
+	/* now, stack all the floaters and transients */
+	TAILQ_FOREACH(win, &ws->winlist, entry) {
+		if (win->transient == 0 && win->floating == 0)
+			continue;
+
+		stack_floater(win, ws->r);
+		XMapRaised(display, win->id);
+	}
+
 	if (winfocus)
 		focus_win(winfocus); /* has to be done outside of the loop */
 }
@@ -1587,6 +1657,20 @@ screenshot(struct swm_region *r, union arg *args)
 	spawn(r, &a);
 }
 
+void
+floating_toggle(struct swm_region *r, union arg *args)
+{
+	struct ws_win	*win = cur_focus;
+
+	if (win == NULL)
+		return;
+
+	win->floating = !win->floating;
+	win->manual = 0;
+	stack();
+	focus_win(win);
+}
+
 /* key definitions */
 struct key {
 	unsigned int		mod;
@@ -1641,10 +1725,13 @@ struct key {
 	{ MODKEY | ShiftMask,	XK_x,		wkill,		{0} },
 	{ MODKEY,		XK_s,		screenshot,	{.id = SWM_ARG_ID_SS_ALL} },
 	{ MODKEY | ShiftMask,	XK_s,		screenshot,	{.id = SWM_ARG_ID_SS_WINDOW} },
+	{ MODKEY,		XK_t,		floating_toggle,{0} },
+	{ MODKEY | ShiftMask,	XK_v,		version,	{0} },
+	{ MODKEY | ShiftMask,	XK_Delete,	spawn,		{.argv = spawn_lock} },
 };
 
 void
-resize_window(struct ws_win *win)
+resize_window(struct ws_win *win, int center)
 {
 	unsigned int		mask;
 	XWindowChanges		wc;
@@ -1652,12 +1739,15 @@ resize_window(struct ws_win *win)
 
 	r = root_to_region(win->wa.root);
 	bzero(&wc, sizeof wc);
-	mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
+	mask = CWBorderWidth | CWWidth | CWHeight;
 	wc.border_width = 1;
 	wc.width = win->g.w;
 	wc.height = win->g.h;
-	wc.x = (WIDTH(r) - win->g.w) / 2;
-	wc.y = (HEIGHT(r) - win->g.h) / 2;
+	if (center == SWM_ARG_ID_CENTER) {
+		wc.x = (WIDTH(r) - win->g.w) / 2;
+		wc.y = (HEIGHT(r) - win->g.h) / 2;
+		mask |= CWX | CWY;
+	}
 
 	DNPRINTF(SWM_D_STACK, "resize_window: win %lu x %d y %d w %d h %d\n",
 	    win->id, wc.x, wc.y, wc.width, wc.height);
@@ -1670,8 +1760,9 @@ void
 resize(struct ws_win *win, union arg *args)
 {
 	XEvent			ev;
+	Time			time = 0;
 
-	DNPRINTF(SWM_D_MOUSE, "resize: win %d floating %d trans %d\n",
+	DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %d\n",
 	    win->id, win->floating, win->transient);
 
 	if (!(win->transient != 0 || win->floating != 0))
@@ -1691,17 +1782,26 @@ resize(struct ws_win *win, union arg *args)
 			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
-			XSync(display, False);
 			if (ev.xmotion.x < 0)
 				ev.xmotion.x = 0;
 			if (ev.xmotion.y < 0)
 				ev.xmotion.y = 0;
 			win->g.w = ev.xmotion.x;
 			win->g.h = ev.xmotion.y;
-			resize_window(win);
+
+			/* not free, don't sync more than 60 times / second */
+			if ((ev.xmotion.time - time) > (1000 / 60) ) {
+				time = ev.xmotion.time;
+				XSync(display, False);
+				resize_window(win, args->id);
+			}
 			break;
 		}
 	} while (ev.type != ButtonRelease);
+	if (time) {
+		XSync(display, False);
+		resize_window(win, args->id);
+	}
 	XWarpPointer(display, None, win->id, 0, 0, 0, 0, win->g.w - 1,
 	    win->g.h - 1);
 	XUngrabPointer(display, CurrentTime);
@@ -1734,12 +1834,17 @@ void
 move(struct ws_win *win, union arg *args)
 {
 	XEvent			ev;
+	Time			time = 0;
+	int			restack = 0;
 
-	DNPRINTF(SWM_D_MOUSE, "move: win %d floating %d trans %d\n",
+	DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %d\n",
 	    win->id, win->floating, win->transient);
 
-	if (!(win->transient != 0 || win->floating != 0))
-		return;
+	if (win->floating == 0) {
+		win->floating = 1;
+		win->manual = 1;
+		restack = 1;
+	}
 
 	if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync,
 	    GrabModeAsync, None, None /* cursor */, CurrentTime) != GrabSuccess)
@@ -1755,15 +1860,26 @@ move(struct ws_win *win, union arg *args)
 			handler[ev.type](&ev);
 			break;
 		case MotionNotify:
-			XSync(display, False);
 			win->g.x = ev.xmotion.x_root;
 			win->g.y = ev.xmotion.y_root;
-			move_window(win);
+
+			/* not free, don't sync more than 60 times / second */
+			if ((ev.xmotion.time - time) > (1000 / 60) ) {
+				time = ev.xmotion.time;
+				XSync(display, False);
+				move_window(win);
+			}
 			break;
 		}
 	} while (ev.type != ButtonRelease);
+	if (time) {
+		XSync(display, False);
+		move_window(win);
+	}
 	XWarpPointer(display, None, win->id, 0, 0, 0, 0, 0, 0);
 	XUngrabPointer(display, CurrentTime);
+	if (restack)
+		stack();
 
 	/* drain events */
 	while (XCheckMaskEvent(display, EnterWindowMask, &ev));
@@ -1779,7 +1895,8 @@ struct button {
 	union arg		args;
 } buttons[] = {
 	  /* action		key		mouse button	func		args */
-	{ client_click,		MODKEY,		Button3,	resize, 	{0} },
+	{ client_click,		MODKEY,		Button3,	resize, 	{.id = SWM_ARG_ID_DONTCENTER} },
+	{ client_click,		MODKEY | ShiftMask, Button3,	resize, 	{.id = SWM_ARG_ID_CENTER} },
 	{ client_click,		MODKEY,		Button1,	move, 		{0} },
 };
 
@@ -1930,42 +2047,49 @@ manage_window(Window id)
 	if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
 		errx(1, "calloc: failed to allocate memory for new window");
 
+	/* Get all the window data in one shot */
 	ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
 	if (ws_idx_atom)
 		XGetWindowProperty(display, id, ws_idx_atom, 0, SWM_PROPLEN,
 		    False, XA_STRING, &type, &format, &nitems, &bytes, &prop);
-
 	XGetWindowAttributes(display, id, &win->wa);
+	XGetTransientForHint(display, id, &trans);
+	XGetWMNormalHints(display, id, &win->sh, &mask); /* XXX function? */
+	if (trans) {
+		win->transient = trans;
+		DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
+		    (unsigned)win->id, win->transient);
+	}
+	
+	/*
+	 * Figure out where to put the window. If it was previously assigned to
+	 * a workspace (either by spawn() or manually moving), and isn't
+	 * transient, * put it in the same workspace
+	 */
 	r = root_to_region(win->wa.root);
-	/* If the window was managed before, put it in the same workspace */
-	if (prop) {
+	if (prop && win->transient == 0) {
 		DNPRINTF(SWM_D_PROP, "got property _SWM_WS=%s\n", prop);
 		ws_idx = strtonum(prop, 0, 9, &errstr);
-		if (errstr)
+		if (errstr) {
 			DNPRINTF(SWM_D_EVENT, "window idx is %s: %s",
 			    errstr, prop);
+		}
 		ws = &r->s->ws[ws_idx];
 	} else
 		ws = r->ws;
 
+	/* set up the window layout */
 	win->id = id;
 	win->ws = ws;
 	win->s = r->s;	/* this never changes */
 	TAILQ_INSERT_TAIL(&ws->winlist, win, entry);
 
-	XGetTransientForHint(display, win->id, &trans);
-	if (trans) {
-		win->transient = trans;
-		DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
-		    (unsigned)win->id, win->transient);
-	}
 	win->g.w = win->wa.width;
 	win->g.h = win->wa.height;
 	win->g.x = win->wa.x;
 	win->g.y = win->wa.y;
 
-	XGetWMNormalHints(display, win->id, &win->sh, &mask); /* XXX function? */
-
+	/* Set window properties so we can remember this after reincarnation */
 	if (ws_idx_atom && prop == NULL &&
 	    snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) < SWM_PROPLEN) {
 		DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n",
@@ -1975,10 +2099,6 @@ manage_window(Window id)
 	}
 	XFree(prop);
 
-	/*
-	fprintf(stderr, "manage window: %d x %d y %d w %d h %d\n", win->id, win->g.x, win->g.y, win->g.w, win->g.h);
-	*/
-
 	if (XGetClassHint(display, win->id, &win->ch)) {
 		DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n",
 		    win->ch.res_class, win->ch.res_name);
@@ -1990,6 +2110,7 @@ manage_window(Window id)
 				    win->ch.res_class, win->ch.res_name);
 				if (quirks[i].quirk & SWM_Q_FLOAT)
 					win->floating = 1;
+				win->quirks = quirks[i].quirk;
 			}
 		}
 	}
@@ -2006,6 +2127,40 @@ manage_window(Window id)
 }
 
 void
+unmanage_window(struct ws_win *win)
+{
+	struct workspace	*ws;
+
+	if (win == NULL)
+		return;
+
+	DNPRINTF(SWM_D_MISC, "unmanage_window:  %lu\n", win->id);
+
+	ws = win->ws;
+	if (ws->restack)
+		return;
+
+	/* find a window to focus */
+	if (ws->focus == win)
+		ws->focus = TAILQ_PREV(win, ws_win_list, entry);
+	if (ws->focus == NULL)
+		ws->focus = TAILQ_FIRST(&ws->winlist);
+	if (ws->focus == NULL || ws->focus == win) {
+		ws->focus = NULL;
+		unfocus_all();
+	} else
+		focus_win(ws->focus);
+
+	TAILQ_REMOVE(&win->ws->winlist, win, entry);
+	set_win_state(win, WithdrawnState);
+	if (win->ch.res_class)
+		XFree(win->ch.res_class);
+	if (win->ch.res_name)
+		XFree(win->ch.res_name);
+	free(win);
+}
+
+void
 configurerequest(XEvent *e)
 {
 	XConfigureRequestEvent	*ev = &e->xconfigurerequest;
@@ -2019,10 +2174,6 @@ configurerequest(XEvent *e)
 	if (new) {
 		DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n",
 		    ev->window);
-		/*
-		fprintf(stderr, "configurerequest: new window: %lu x %d y %d w %d h %d bw %d s %d sm %d\n",
-		    ev->window, ev->x, ev->y, ev->width, ev->height, ev->border_width, ev->above, ev->detail);
-		*/
 		bzero(&wc, sizeof wc);
 		wc.x = ev->x;
 		wc.y = ev->y;
@@ -2033,10 +2184,6 @@ configurerequest(XEvent *e)
 		wc.stack_mode = ev->detail;
 		XConfigureWindow(display, ev->window, ev->value_mask, &wc);
 	} else {
-		/*
-		fprintf(stderr, "configurerequest: change window: %lu\n",
-		    ev->window);
-		*/
 		DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n",
 		    ev->window);
 		if (win->floating) {
@@ -2084,29 +2231,11 @@ destroynotify(XEvent *e)
 {
 	struct ws_win		*win;
 	XDestroyWindowEvent	*ev = &e->xdestroywindow;
-	struct workspace	*ws;
 
 	DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
 
 	if ((win = find_window(ev->window)) != NULL) {
-		ws = win->ws;
-		/* find a window to focus */
-		if (ws->focus == win)
-			ws->focus = TAILQ_PREV(win, ws_win_list, entry);
-		if (ws->focus == NULL)
-			ws->focus = TAILQ_FIRST(&ws->winlist);
-		if (ws->focus == NULL || ws->focus == win) {
-			ws->focus = NULL;
-			unfocus_all();
-		} else
-			focus_win(ws->focus);
-		TAILQ_REMOVE(&ws->winlist, win, entry);
-		set_win_state(win, WithdrawnState);
-		if (win->ch.res_class)
-			XFree(win->ch.res_class);
-		if (win->ch.res_name)
-			XFree(win->ch.res_name);
-		free(win);
+		unmanage_window(win);
 		stack();
 	}
 }
@@ -2202,7 +2331,14 @@ propertynotify(XEvent *e)
 void
 unmapnotify(XEvent *e)
 {
+	XDestroyWindowEvent	*ev = &e->xdestroywindow;
+	struct ws_win		*win;
+
 	DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
+
+	if ((win = find_window(ev->window)) != NULL)
+		if (win->transient)
+			unmanage_window(win);
 }
 
 void
@@ -2273,13 +2409,59 @@ getstate(Window w)
 }
 
 void
+remove_region(struct swm_region *r) 
+{
+	struct swm_screen	*s = r->s;
+	struct ws_win		*win;
+
+	DNPRINTF(SWM_D_MISC, "removing region: screen[%d]:%dx%d+%d+%d\n",
+	     s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r));
+
+	TAILQ_FOREACH(win, &r->ws->winlist, entry)
+		XUnmapWindow(display, win->id);
+	r->ws->r = NULL;
+
+	XDestroyWindow(display, r->bar_window);
+	TAILQ_REMOVE(&s->rl, r, entry);
+	free(r);
+}
+
+void
 new_region(struct swm_screen *s, struct workspace *ws,
     int x, int y, int w, int h)
 {
-	struct swm_region	*r;
+	struct swm_region	*r, *n;
+	int			i;
+
+	DNPRINTF(SWM_D_MISC, "new region: screen[%d]:%dx%d+%d+%d\n",
+	     s->idx, w, h, x, y);
+
+	/* remove any conflicting regions */
+	n = TAILQ_FIRST(&s->rl);
+	while (n) {
+		r = n;
+		n = TAILQ_NEXT(r, entry);
+		if (X(r) < (x + w) &&
+		    (X(r) + WIDTH(r)) > x &&
+		    Y(r) < (y + h) &&
+		    (Y(r) + HEIGHT(r)) > y) {
+			if (ws == NULL)
+				ws = r->ws;
+			remove_region(r);
+		}
+	}
 
-	DNPRINTF(SWM_D_MISC, "new region on screen %d: %dx%d (%d, %d)\n",
-	     s->idx, x, y, w, h);
+	/* pick an appropriate workspace */
+	if (ws == NULL) {
+		for (i = 0; i < SWM_WS_MAX; i++)
+			if (s->ws[i].r == NULL) {
+				ws = &s->ws[i];
+				break;
+			}
+
+		if (ws == NULL)
+			errx(1, "no free regions\n");
+	}
 
 	if ((r = calloc(1, sizeof(struct swm_region))) == NULL)
 		errx(1, "calloc: failed to allocate memory for screen");