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

diff --git a/scrotwm.c b/scrotwm.c
index 62f4c25..54497fe 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -48,7 +48,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#define	SWM_VERSION	"0.5"
+static const char	*cvstag = "$scrotwm$";
+
+#define	SWM_VERSION	"0.7"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -102,7 +104,7 @@
 #define	SWM_D_STACK		0x0020
 #define	SWM_D_MOUSE		0x0040
 #define	SWM_D_PROP		0x0080
-
+#define	SWM_D_CLASS		0x0100
 
 u_int32_t		swm_debug = 0
 			    | SWM_D_MISC
@@ -111,7 +113,9 @@ u_int32_t		swm_debug = 0
 			    | SWM_D_FOCUS
 			    | SWM_D_MOVE
 			    | SWM_D_STACK
+			    | SWM_D_MOUSE
 			    | SWM_D_PROP
+			    | SWM_D_CLASS
 			    ;
 #else
 #define DPRINTF(x...)
@@ -122,18 +126,17 @@ u_int32_t		swm_debug = 0
 #define MODKEY			Mod1Mask
 #define CLEANMASK(mask)		(mask & ~(numlockmask | LockMask))
 #define BUTTONMASK		(ButtonPressMask|ButtonReleaseMask)
-
-#define X(r)		(r)->g.x	
-#define Y(r)		(r)->g.y
-#define WIDTH(r)	(r)->g.w	
-#define HEIGHT(r)	(r)->g.h
+#define MOUSEMASK		(BUTTONMASK|PointerMotionMask)
+#define SWM_PROPLEN		(16)
+#define X(r)			(r)->g.x	
+#define Y(r)			(r)->g.y
+#define WIDTH(r)		(r)->g.w	
+#define HEIGHT(r)		(r)->g.h
 
 #ifndef SWM_LIB
-#define SWM_LIB		"/usr/X11R6/lib/swmhack.so"
+#define SWM_LIB			"/usr/X11R6/lib/swmhack.so"
 #endif
 
-#define SWM_PROPLEN	(16)
-
 char			**start_argv;
 Atom			astate;
 int			(*xerrorxlib)(Display *, XErrorEvent *);
@@ -155,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;
@@ -175,9 +180,10 @@ char			*bar_fonts[] = {
 
 /* terminal + args */
 char			*spawn_term[] = { "xterm", NULL };
-char			*spawn_screenshot[] = { "scrot", NULL, NULL }; /* XXX get from conf */
-char			*spawn_menu[] = { "dmenu_run", "-fn", NULL,
-			    "-nb", NULL, "-nf", NULL, "-sb", NULL, "-sf", NULL, 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 };
 
 #define SWM_MENU_FN	(2)
 #define SWM_MENU_NB	(4)
@@ -200,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);
 
@@ -213,10 +219,13 @@ 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;
 	XSizeHints		sh;
+	XClassHint		ch;
 };
 TAILQ_HEAD(ws_win_list, ws_win);
 
@@ -302,11 +311,61 @@ union arg {
 #define SWM_ARG_ID_STACKINIT	(11)
 #define SWM_ARG_ID_CYCLEWS_UP	(12)
 #define SWM_ARG_ID_CYCLEWS_DOWN	(13)
+#define SWM_ARG_ID_CYCLESC_UP	(14)
+#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;
 };
 
+/* quirks */
+struct quirk {
+	char			*class;
+	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},
+};
+
+/* events */
+void			expose(XEvent *);
+void			keypress(XEvent *);
+void			buttonpress(XEvent *);
+void			configurerequest(XEvent *);
+void			configurenotify(XEvent *);
+void			destroynotify(XEvent *);
+void			enternotify(XEvent *);
+void			focusin(XEvent *);
+void			mappingnotify(XEvent *);
+void			maprequest(XEvent *);
+void			propertynotify(XEvent *);
+void			unmapnotify(XEvent *);
+void			visibilitynotify(XEvent *);
+
+void			(*handler[LASTEvent])(XEvent *) = {
+				[Expose] = expose,
+				[KeyPress] = keypress,
+				[ButtonPress] = buttonpress,
+				[ConfigureRequest] = configurerequest,
+				[ConfigureNotify] = configurenotify,
+				[DestroyNotify] = destroynotify,
+				[EnterNotify] = enternotify,
+				[FocusIn] = focusin,
+				[MappingNotify] = mappingnotify,
+				[MapRequest] = maprequest,
+				[PropertyNotify] = propertynotify,
+				[UnmapNotify] = unmapnotify,
+				[VisibilityNotify] = visibilitynotify,
+};
+
 unsigned long
 name_to_color(char *colorname)
 {
@@ -349,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)
 {
@@ -455,12 +544,22 @@ 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); /* XXX args? */
+				asprintf(&spawn_term[0], "%s", val);
 			if (!strncmp(var, "screenshot_enabled",
 			    strlen("screenshot_enabled")))
 				ss_enabled = atoi(val);
+			if (!strncmp(var, "screenshot_app",
+			    strlen("screenshot_app")))
+				asprintf(&spawn_screenshot[0], "%s", val);
 			break;
 		default:
 			goto bad;
@@ -547,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);
 		}
 	}
@@ -674,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;
@@ -720,6 +830,18 @@ quit(struct swm_region *r, union arg *args)
 }
 
 void
+unmap_all(void)
+{
+	struct ws_win		*win;
+	int			i, j;
+
+	for (i = 0; i < ScreenCount(display); i++)
+		for (j = 0; j < SWM_WS_MAX; j++)
+			TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
+				XUnmapWindow(display, win->id);
+}
+
+void
 restart(struct swm_region *r, union arg *args)
 {
 	DNPRINTF(SWM_D_MISC, "restart: %s\n", start_argv[0]);
@@ -731,6 +853,7 @@ restart(struct swm_region *r, union arg *args)
 
 	bar_extra_stop();
 	bar_extra = 1;
+	unmap_all();
 	XCloseDisplay(display);
 	execvp(start_argv[0], start_argv);
 	fprintf(stderr, "execvp failed\n");
@@ -785,6 +908,9 @@ find_window(Window id)
 void
 spawn(struct swm_region *r, union arg *args)
 {
+	char			*ret;
+	int			si;
+
 	DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
 	/*
 	 * The double-fork construct avoids zombie processes and keeps the code
@@ -792,15 +918,24 @@ spawn(struct swm_region *r, union arg *args)
 	 */
 	if (fork() == 0) {
 		if (fork() == 0) {
-			char *ret;
 			if (display)
 				close(ConnectionNumber(display));
       			setenv("LD_PRELOAD", SWM_LIB, 1);
-			if (asprintf(&ret, "%d", r->ws->idx))
+			if (asprintf(&ret, "%d", r->ws->idx)) {
 				setenv("_SWM_WS", ret, 1);
-			if (asprintf(&ret, "%d", getpid()))
+				free(ret);
+			}
+			if (asprintf(&ret, "%d", getpid())) {
 				setenv("_SWM_PID", ret, 1);
+				free(ret);
+			}
 			setsid();
+			/* kill stdin, mplayer, ssh-add etc. need that */
+			si = open("/dev/null", O_RDONLY, 0);
+			if (si == -1)
+				err(1, "open /dev/null");
+			if (dup2(si, 0) == -1)
+				err(1, "dup2 /dev/null");
 			execvp(args->argv[0], args->argv);
 			fprintf(stderr, "execvp failed\n");
 			perror(" failed");
@@ -881,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);
 
@@ -892,14 +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;
@@ -922,11 +1057,10 @@ 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;
-
 	do {
 		switch (args->id) {
 		case SWM_ARG_ID_CYCLEWS_UP:
@@ -955,6 +1089,33 @@ cyclews(struct swm_region *r, union arg *args)
 }
 
 void
+cyclescr(struct swm_region *r, union arg *args)
+{
+	struct swm_region	*rr;
+	int			i;
+
+	i = r->s->idx;
+	switch (args->id) {
+	case SWM_ARG_ID_CYCLESC_UP:
+		rr = TAILQ_NEXT(r, entry);
+		if (rr == NULL)
+			rr = TAILQ_FIRST(&screens[i].rl);
+		break;
+	case SWM_ARG_ID_CYCLESC_DOWN:
+		rr = TAILQ_PREV(r, swm_region_list, entry);
+		if (rr == NULL)
+			rr = TAILQ_LAST(&screens[i].rl, swm_region_list);
+		break;
+	default:
+		return;
+	};
+	unfocus_all();
+	XSetInputFocus(display, PointerRoot, RevertToPointerRoot, CurrentTime);
+	XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, rr->g.x,
+	    rr->g.y + bar_enabled ? bar_height : 0);
+}
+
+void
 swapwin(struct swm_region *r, union arg *args)
 {
 	struct ws_win		*target;
@@ -1039,7 +1200,7 @@ focus(struct swm_region *r, union arg *args)
 		return;
 	}
 
-	if (winfocus == winlostfocus)
+	if (winfocus == winlostfocus || winfocus == NULL)
 		return;
 
 	XMapRaised(display, winfocus->id);
@@ -1058,7 +1219,6 @@ cycle_layout(struct swm_region *r, union arg *args)
 	if (ws->cur_layout->l_stack == NULL)
 		ws->cur_layout = &layouts[0];
 	ignore_enter = 1;
-
 	stack();
 }
 
@@ -1116,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);
@@ -1145,6 +1310,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 	int			i, j, w_inc, h_inc, w_base, h_base;
 	int			hrh, extra, h_slice, last_h = 0;
 	int			split, colno, winno, mwin, msize, mscale;
+	int			remain, missing, v_slice;;
 	unsigned int		mask;
 
 	DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d\n rot=%s flip=%s",
@@ -1174,7 +1340,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 
 	h_slice = r_g.h / SWM_H_SLICE;
 	if (mwin && winno > mwin) {
-		int v_slice = r_g.w / SWM_V_SLICE;
+		v_slice = r_g.w / SWM_V_SLICE;
 
 		split = mwin;
 		colno = split;
@@ -1182,8 +1348,8 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 
 		if (w_inc > 1 && w_inc < v_slice) {
 			/* adjust for window's requested size increment */
-			int remain = (win_g.w - w_base) % w_inc;
-			int missing = w_inc - remain;
+			remain = (win_g.w - w_base) % w_inc;
+			missing = w_inc - remain;
 
 			if (missing <= extra || j == 0) {
 				extra -= missing;
@@ -1205,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);
@@ -1230,8 +1400,8 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 			win_g.h = hrh + extra;
 		} else if (h_inc > 1 && h_inc < h_slice) {
 			/* adjust for window's requested size increment */
-			int remain = (win_g.h - h_base) % h_inc;
-			int missing = h_inc - remain;
+			remain = (win_g.h - h_base) % h_inc;
+			missing = h_inc - remain;
 
 			if (missing <= extra || j == 0) {
 				extra -= missing;
@@ -1247,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 */
 }
@@ -1413,6 +1585,9 @@ send_to_ws(struct swm_region *r, union arg *args)
 	Atom			ws_idx_atom = 0;
 	unsigned char		ws_idx_str[SWM_PROPLEN];
 
+	if (win == NULL)
+		return;
+
 	DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
 
 	ws = win->ws;
@@ -1470,10 +1645,10 @@ screenshot(struct swm_region *r, union arg *args)
 
 	switch (args->id) {
 	case SWM_ARG_ID_SS_ALL:
-		spawn_screenshot[1] = "-m";
+		spawn_screenshot[1] = "full";
 		break;
 	case SWM_ARG_ID_SS_WINDOW:
-		spawn_screenshot[1] = "-s"; /* XXX doesn't work with scrot */
+		spawn_screenshot[1] = "window";
 		break;
 	default:
 		return;
@@ -1482,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;
@@ -1518,6 +1707,8 @@ struct key {
 	{ MODKEY,		XK_0,		switchws,	{.id = 9} },
 	{ MODKEY,		XK_Right,	cyclews,	{.id = SWM_ARG_ID_CYCLEWS_UP} }, 
 	{ MODKEY,		XK_Left,	cyclews,	{.id = SWM_ARG_ID_CYCLEWS_DOWN} }, 
+	{ MODKEY | ShiftMask,	XK_Right,	cyclescr,	{.id = SWM_ARG_ID_CYCLESC_UP} }, 
+	{ MODKEY | ShiftMask,	XK_Left,	cyclescr,	{.id = SWM_ARG_ID_CYCLESC_DOWN} }, 
 	{ MODKEY | ShiftMask,	XK_1,		send_to_ws,	{.id = 0} },
 	{ MODKEY | ShiftMask,	XK_2,		send_to_ws,	{.id = 1} },
 	{ MODKEY | ShiftMask,	XK_3,		send_to_ws,	{.id = 2} },
@@ -1534,23 +1725,164 @@ 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
-click(struct swm_region *r, union arg *args)
+resize_window(struct ws_win *win, int center)
 {
-	DNPRINTF(SWM_D_MOUSE, "click: button: %d\n", args->id);
+	unsigned int		mask;
+	XWindowChanges		wc;
+	struct swm_region	*r;
 
-	switch (args->id) {
-	case Button1:
-		break;
-	case Button2:
-		break;
-	case Button3:
-		break;
-	default:
+	r = root_to_region(win->wa.root);
+	bzero(&wc, sizeof wc);
+	mask = CWBorderWidth | CWWidth | CWHeight;
+	wc.border_width = 1;
+	wc.width = win->g.w;
+	wc.height = win->g.h;
+	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);
+
+	XConfigureWindow(display, win->id, mask, &wc);
+	config_win(win);
+}
+
+void
+resize(struct ws_win *win, union arg *args)
+{
+	XEvent			ev;
+	Time			time = 0;
+
+	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))
+		return;
+
+	if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync,
+	    GrabModeAsync, None, None /* cursor */, CurrentTime) != GrabSuccess)
 		return;
+	XWarpPointer(display, None, win->id, 0, 0, 0, 0, win->g.w, win->g.h);
+	do {
+		XMaskEvent(display, MOUSEMASK | ExposureMask |
+		    SubstructureRedirectMask, &ev);
+		switch(ev.type) {
+		case ConfigureRequest:
+		case Expose:
+		case MapRequest:
+			handler[ev.type](&ev);
+			break;
+		case MotionNotify:
+			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;
+
+			/* 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);
+
+	/* drain events */
+	while (XCheckMaskEvent(display, EnterWindowMask, &ev));
+}
+
+void
+move_window(struct ws_win *win)
+{
+	unsigned int		mask;
+	XWindowChanges		wc;
+	struct swm_region	*r;
+
+	r = root_to_region(win->wa.root);
+	bzero(&wc, sizeof wc);
+	mask = CWX | CWY;
+	wc.x = win->g.x;
+	wc.y = win->g.y;
+
+	DNPRINTF(SWM_D_STACK, "move_window: win %lu x %d y %d w %d h %d\n",
+	    win->id, wc.x, wc.y, wc.width, wc.height);
+
+	XConfigureWindow(display, win->id, mask, &wc);
+	config_win(win);
+}
+
+void
+move(struct ws_win *win, union arg *args)
+{
+	XEvent			ev;
+	Time			time = 0;
+	int			restack = 0;
+
+	DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %d\n",
+	    win->id, win->floating, win->transient);
+
+	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)
+		return;
+	XWarpPointer(display, None, win->id, 0, 0, 0, 0, 0, 0);
+	do {
+		XMaskEvent(display, MOUSEMASK | ExposureMask |
+		    SubstructureRedirectMask, &ev);
+		switch(ev.type) {
+		case ConfigureRequest:
+		case Expose:
+		case MapRequest:
+			handler[ev.type](&ev);
+			break;
+		case MotionNotify:
+			win->g.x = ev.xmotion.x_root;
+			win->g.y = ev.xmotion.y_root;
+
+			/* 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));
 }
 
 /* mouse */
@@ -1559,11 +1891,13 @@ struct button {
 	unsigned int		action;
 	unsigned int		mask;
 	unsigned int		button;
-	void			(*func)(struct swm_region *r, union arg *);
+	void			(*func)(struct ws_win *, union arg *);
 	union arg		args;
 } buttons[] = {
 	  /* action		key		mouse button	func		args */
-	{ client_click,		MODKEY,		Button1,	click, {.id=Button1} },
+	{ 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} },
 };
 
 void
@@ -1679,8 +2013,7 @@ buttonpress(XEvent *e)
 		if (action == buttons[i].action && buttons[i].func &&
 		    buttons[i].button == ev->button &&
 		    CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-			buttons[i].func(root_to_region(ev->root),
-			&buttons[i].args);
+			buttons[i].func(win, &buttons[i].args);
 }
 
 void
@@ -1700,13 +2033,13 @@ manage_window(Window id)
 	Window			trans;
 	struct workspace	*ws;
 	struct ws_win		*win;
-	XClassHint		ch;
-	int			format;
+	int			format, i, ws_idx;
 	unsigned long		nitems, bytes;
 	Atom			ws_idx_atom = 0, type;
 	unsigned char		ws_idx_str[SWM_PROPLEN], *prop = NULL;
 	struct swm_region	*r;
 	long			mask;
+	const char		*errstr;
 
 	if ((win = find_window(id)) != NULL)
 			return (win);	/* already being managed */
@@ -1714,48 +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) {
-		int		ws_idx;
-		const char	*errstr;
-
+	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);
 
-	/* make new win focused */
-	focus_win(win);
-
-	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);
-
+	/* 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",
@@ -1765,21 +2099,20 @@ 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);
-	*/
-
-	/* XXX make this a table */
-	bzero(&ch, sizeof ch);
-	if (XGetClassHint(display, win->id, &ch)) {
-		/*fprintf(stderr, "class: %s name: %s\n", ch.res_class, ch.res_name); */
-		if (!strcmp(ch.res_class, "MPlayer") && !strcmp(ch.res_name, "xv")) {
-			win->floating = 1;
+	if (XGetClassHint(display, win->id, &win->ch)) {
+		DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n",
+		    win->ch.res_class, win->ch.res_name);
+		for (i = 0; quirks[i].class != NULL && quirks[i].name != NULL &&
+		    quirks[i].quirk != 0; i++){
+			if (!strcmp(win->ch.res_class, quirks[i].class) &&
+			    !strcmp(win->ch.res_name, quirks[i].name)) {
+				DNPRINTF(SWM_D_CLASS, "found: %s name: %s\n",
+				    win->ch.res_class, win->ch.res_name);
+				if (quirks[i].quirk & SWM_Q_FLOAT)
+					win->floating = 1;
+				win->quirks = quirks[i].quirk;
+			}
 		}
-		if (ch.res_class)
-			XFree(ch.res_class);
-		if (ch.res_name)
-			XFree(ch.res_name);
 	}
 
 	XSelectInput(display, id, EnterWindowMask | FocusChangeMask |
@@ -1787,10 +2120,47 @@ manage_window(Window id)
 
 	set_win_state(win, NormalState);
 
+	/* make new win focused */
+	focus_win(win);
+
 	return (win);
 }
 
 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;
@@ -1804,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;
@@ -1818,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) {
@@ -1835,15 +2197,16 @@ configurerequest(XEvent *e)
 				win->g.h = ev->height;
 			if (win->ws->r != NULL) {
 				/* this seems to be full screen */
-				if (win->g.w > WIDTH(win->ws->r)) {
-					/* kill border */
-					win->g.x -= 1;
-					win->g.w += 1;
+				if (win->g.w >= WIDTH(win->ws->r)) {
+					win->g.x = -1;
+					win->g.w = WIDTH(win->ws->r);
+					ev->value_mask |= CWX | CWWidth;
 				}
-				if (win->g.h > HEIGHT(win->ws->r)) {
+				if (win->g.h >= HEIGHT(win->ws->r)) {
 					/* kill border */
-					win->g.y -= 1;
-					win->g.h += 1;
+					win->g.y = -1;
+					win->g.h = HEIGHT(win->ws->r);
+					ev->value_mask |= CWY | CWHeight;
 				}
 			}
 			if ((ev->value_mask & (CWX|CWY)) &&
@@ -1868,27 +2231,13 @@ 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 == win)
-			ws->focus = NULL;
-		if (cur_focus == win)
-			focus_win(ws->focus);
-
-		TAILQ_REMOVE(&ws->winlist, win, entry);
-		set_win_state(win, WithdrawnState);
-		free(win);
+		unmanage_window(win);
+		stack();
 	}
-	stack();
 }
 
 void
@@ -1947,14 +2296,49 @@ maprequest(XEvent *e)
 void
 propertynotify(XEvent *e)
 {
+	struct ws_win		*win;
+	XPropertyEvent		*ev = &e->xproperty;
+
 	DNPRINTF(SWM_D_EVENT, "propertynotify: window: %lu\n",
-	    e->xproperty.window);
+	    ev->window);
+
+	if (ev->state == PropertyDelete)
+		return; /* ignore */
+	win = find_window(ev->window);
+	if (win == NULL)
+		return;
+
+	switch (ev->atom) {
+	case XA_WM_NORMAL_HINTS:
+#if 0
+		long		mask;
+		XGetWMNormalHints(display, win->id, &win->sh, &mask);
+		fprintf(stderr, "normal hints: flag 0x%x\n", win->sh.flags);
+		if (win->sh.flags & PMinSize) {
+			win->g.w = win->sh.min_width;
+			win->g.h = win->sh.min_height;
+			fprintf(stderr, "min %d %d\n", win->g.w, win->g.h);
+		}
+		XMoveResizeWindow(display, win->id,
+		    win->g.x, win->g.y, win->g.w, win->g.h);
+#endif
+		break;
+	default:
+		break;
+	}
 }
 
 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
@@ -1972,22 +2356,6 @@ visibilitynotify(XEvent *e)
 					bar_update();
 }
 
-void			(*handler[LASTEvent])(XEvent *) = {
-				[Expose] = expose,
-				[KeyPress] = keypress,
-				[ButtonPress] = buttonpress,
-				[ConfigureRequest] = configurerequest,
-				[ConfigureNotify] = configurenotify,
-				[DestroyNotify] = destroynotify,
-				[EnterNotify] = enternotify,
-				[FocusIn] = focusin,
-				[MappingNotify] = mappingnotify,
-				[MapRequest] = maprequest,
-				[PropertyNotify] = propertynotify,
-				[UnmapNotify] = unmapnotify,
-				[VisibilityNotify] = visibilitynotify,
-};
-
 int
 xerror_start(Display *d, XErrorEvent *ee)
 {
@@ -2041,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");
@@ -2214,7 +2628,8 @@ main(int argc, char *argv[])
 	fd_set			rd;
 
 	start_argv = argv;
-	fprintf(stderr, "Welcome to scrotwm V%s\n", SWM_VERSION);
+	fprintf(stderr, "Welcome to scrotwm V%s cvs tag: %s\n",
+	    SWM_VERSION, cvstag);
 	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		warnx("no locale support");