X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=7c076489365cda6a5b8ea14de22b4f7dcfb01e08;hb=de65c2a567bd5b9b4274d7ac5bed3cb833c409a5;hp=116b81b0157c2fb6c5ef62b185beefdbb311c0a6;hpb=7288f47b93a35b571269b2c478ffd59a9c888612;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 116b81b..7c07648 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.6"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -101,6 +103,8 @@
 #define	SWM_D_MOVE		0x0010
 #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
@@ -109,6 +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...)
@@ -119,17 +126,22 @@ 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 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"
+#endif
 
 char			**start_argv;
 Atom			astate;
 int			(*xerrorxlib)(Display *, XErrorEvent *);
 int			other_wm;
 int			running = 1;
+int			ss_enabled = 0;
 int			xrandr_eventbase;
 int			ignore_enter = 0;
 unsigned int		numlockmask = 0;
@@ -146,6 +158,7 @@ char			*bar_argv[] = { NULL, NULL };
 int			bar_pipe[2];
 char			bar_ext[SWM_BAR_MAX];
 sig_atomic_t		bar_alarm = 0;
+int			bar_delay = 30;
 int			bar_enabled = 1;
 int			bar_extra = 1;
 int			bar_extra_running = 0;
@@ -164,8 +177,9 @@ char			*bar_fonts[] = {
 
 /* terminal + args */
 char			*spawn_term[] = { "xterm", NULL };
-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_menu[] = { "dmenu_run", "-fn", NULL, "-nb", NULL,
+			    "-nf", NULL, "-sb", NULL, "-sf", NULL, NULL };
 
 #define SWM_MENU_FN	(2)
 #define SWM_MENU_NB	(4)
@@ -194,7 +208,6 @@ struct swm_region {
 }; 
 TAILQ_HEAD(swm_region_list, swm_region);
 
-
 struct ws_win {
 	TAILQ_ENTRY(ws_win)	entry;
 	Window			id;
@@ -205,6 +218,7 @@ struct ws_win {
 	struct workspace	*ws;	/* always valid */
 	struct swm_screen	*s;	/* always valid, never changes */
 	XWindowAttributes	wa;
+	XSizeHints		sh;
 };
 TAILQ_HEAD(ws_win_list, ws_win);
 
@@ -290,9 +304,24 @@ 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)
 	char			**argv;
 };
 
+struct quirk {
+	char			*class;
+	char			*name;
+	unsigned long		quirk;
+#define SWM_Q_FLOAT		(1<<0)
+} quirks[] = {
+	{ "MPlayer",		"xv",		SWM_Q_FLOAT },
+	{ "OpenOffice.org 2.4",	"VCLSalFrame",	SWM_Q_FLOAT },
+	{ NULL,		NULL,		0},
+};
+
 unsigned long
 name_to_color(char *colorname)
 {
@@ -403,24 +432,26 @@ conf_load(char *filename)
 			if (!strncmp(var, "bar_enabled", strlen("bar_enabled")))
 				bar_enabled = atoi(val);
 			else if (!varmatch(var, "bar_border", &i))
-				setscreencolor(var, i, SWM_S_COLOR_BAR_BORDER);
+				setscreencolor(val, i, SWM_S_COLOR_BAR_BORDER);
 			else if (!varmatch(var, "bar_color", &i))
-				setscreencolor(var, i, SWM_S_COLOR_BAR);
+				setscreencolor(val, i, SWM_S_COLOR_BAR);
 			else if (!varmatch(var, "bar_font_color", &i))
-				setscreencolor(var, i, SWM_S_COLOR_BAR_FONT);
+				setscreencolor(val, i, SWM_S_COLOR_BAR_FONT);
 			else if (!strncmp(var, "bar_font", strlen("bar_font")))
 				asprintf(&bar_fonts[0], "%s", val);
 			else if (!strncmp(var, "bar_action", strlen("bar_action")))
 				asprintf(&bar_argv[0], "%s", val);
+			else if (!strncmp(var, "bar_delay", strlen("bar_delay")))
+				bar_delay = atoi(val);
 			else
 				goto bad;
 			break;
 
 		case 'c':
 			if (!varmatch(var, "color_focus", &i))
-				setscreencolor(var, i, SWM_S_COLOR_FOCUS);
+				setscreencolor(val, i, SWM_S_COLOR_FOCUS);
 			else if (!varmatch(var, "color_unfocus", &i))
-				setscreencolor(var, i, SWM_S_COLOR_UNFOCUS);
+				setscreencolor(val, i, SWM_S_COLOR_UNFOCUS);
 			else if (!strncmp(var, "cycle_empty", strlen("cycle_empty")))
 				cycle_visible = atoi(val);
 			else if (!strncmp(var, "cycle_visible", strlen("cycle_visible")))
@@ -441,7 +472,13 @@ conf_load(char *filename)
 
 		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;
@@ -534,8 +571,7 @@ bar_update(void)
 		}
 	}
 	XSync(display, False);
-
-	alarm(60);
+	alarm(bar_delay);
 }
 
 void
@@ -702,6 +738,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]);
@@ -713,6 +761,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");
@@ -739,8 +788,8 @@ root_to_region(Window root)
 	} else {
 		/* otherwise, choose a region based on pointer location */
 		TAILQ_FOREACH(r, &screens[i].rl, entry) {
-			if (x > X(r) && x < X(r) + WIDTH(r) &&
-			    y > Y(r) && y < Y(r) + HEIGHT(r))
+			if (x >= X(r) && x <= X(r) + WIDTH(r) &&
+			    y >= Y(r) && y <= Y(r) + HEIGHT(r))
 				break;
 		}
 
@@ -767,6 +816,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
@@ -776,7 +828,22 @@ spawn(struct swm_region *r, union arg *args)
 		if (fork() == 0) {
 			if (display)
 				close(ConnectionNumber(display));
+      			setenv("LD_PRELOAD", SWM_LIB, 1);
+			if (asprintf(&ret, "%d", r->ws->idx)) {
+				setenv("_SWM_WS", ret, 1);
+				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");
@@ -786,7 +853,6 @@ spawn(struct swm_region *r, union arg *args)
 	wait(0);
 }
 
-
 void
 spawnmenu(struct swm_region *r, union arg *args)
 {
@@ -874,7 +940,6 @@ switchws(struct swm_region *r, union arg *args)
 
 		TAILQ_FOREACH(win, &old_ws->winlist, entry)
 			XUnmapWindow(display, win->id);
-
 		old_ws->r = NULL;
 		old_ws->restack = 1;
 	} else {
@@ -903,7 +968,6 @@ cyclews(struct swm_region *r, union arg *args)
 	    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:
@@ -932,6 +996,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;
@@ -1016,9 +1107,10 @@ focus(struct swm_region *r, union arg *args)
 		return;
 	}
 
-	if (winfocus == winlostfocus)
+	if (winfocus == winlostfocus || winfocus == NULL)
 		return;
 
+	XMapRaised(display, winfocus->id);
 	focus_win(winfocus);
 	XSync(display, False);
 }
@@ -1034,7 +1126,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();
 }
 
@@ -1107,47 +1198,25 @@ stack_floater(struct ws_win *win, struct swm_region *r)
 	XConfigureWindow(display, win->id, mask, &wc);
 }
 
-
+#define SWAPXY(g)	do {				\
+	int tmp;					\
+	tmp = (g)->y; (g)->y = (g)->x; (g)->x = tmp;	\
+	tmp = (g)->h; (g)->h = (g)->w; (g)->w = tmp;	\
+} while (0)
 void
-vertical_config(struct workspace *ws, int id)
+stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 {
-	DNPRINTF(SWM_D_STACK, "vertical_resize: workspace: %d\n", ws->idx);
-
-	switch (id) {
-	case SWM_ARG_ID_STACKRESET:
-	case SWM_ARG_ID_STACKINIT:
-		ws->l_state.vertical_msize = SWM_V_SLICE / 2;
-		ws->l_state.vertical_mwin = 1;
-		break;
-	case SWM_ARG_ID_MASTERSHRINK:
-		if (ws->l_state.vertical_msize > 1)
-			ws->l_state.vertical_msize--;
-		break;
-	case SWM_ARG_ID_MASTERGROW:
-		if (ws->l_state.vertical_msize < SWM_V_SLICE - 1)
-			ws->l_state.vertical_msize++;
-		break;
-	case SWM_ARG_ID_MASTERADD:
-		ws->l_state.vertical_mwin++;
-		break;
-	case SWM_ARG_ID_MASTERDEL:
-		if (ws->l_state.vertical_mwin > 0)
-			ws->l_state.vertical_mwin--;
-		break;
-	default:
-		return;
-	}
-}
-
-void
-vertical_stack(struct workspace *ws, struct swm_geometry *g) {
 	XWindowChanges		wc;
-	struct swm_geometry	gg = *g;
+	struct swm_geometry	win_g, r_g = *g;
 	struct ws_win		*win, *winfocus;
-	int			i, j, split, colno, hrh, winno, main_width;
+	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, "vertical_stack: workspace: %d\n", ws->idx);
+	DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d\n rot=%s flip=%s",
+	    ws->idx, rot ? "yes" : "no", flip ? "yes" : "no");
 
 	if ((winno = count_win(ws, 0)) == 0)
 		return;
@@ -1156,53 +1225,121 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) {
 		ws->focus = TAILQ_FIRST(&ws->winlist);
 	winfocus = cur_focus ? cur_focus : ws->focus;
 
-	if (ws->l_state.vertical_mwin &&
-	    winno > ws->l_state.vertical_mwin) {
-		split = ws->l_state.vertical_mwin;
+	win = TAILQ_FIRST(&ws->winlist);
+	if (rot) {
+		w_inc = win->sh.width_inc;
+		w_base = win->sh.base_width;
+		mwin = ws->l_state.horizontal_mwin;
+		mscale = ws->l_state.horizontal_msize;
+		SWAPXY(&r_g);
+	} else {
+		w_inc = win->sh.height_inc;
+		w_base = win->sh.base_height;
+		mwin = ws->l_state.vertical_mwin;
+		mscale = ws->l_state.vertical_msize;
+	}
+	win_g = r_g;
+
+	h_slice = r_g.h / SWM_H_SLICE;
+	if (mwin && winno > mwin) {
+		v_slice = r_g.w / SWM_V_SLICE;
+
+		split = mwin;
 		colno = split;
-		main_width = (g->w / SWM_V_SLICE) *
-		   ws->l_state.vertical_msize;
-		gg.w = main_width;
+		msize = v_slice * mscale;
+
+		if (w_inc > 1 && w_inc < v_slice) {
+			/* adjust for window's requested size increment */
+			remain = (win_g.w - w_base) % w_inc;
+			missing = w_inc - remain;
+
+			if (missing <= extra || j == 0) {
+				extra -= missing;
+				win_g.w += missing;
+			} else {
+				win_g.w -= remain;
+				extra += remain;
+			}
+		}
+
+		win_g.w = msize;
+		if (flip) 
+			win_g.x += r_g.w - msize;
 	} else {
 		colno = winno;
 		split = 0;
 	}
-	hrh = g->h / colno;
-	gg.h = hrh - 2;
+	hrh = r_g.h / colno;
+	extra = r_g.h - (colno * hrh);
+	win_g.h = hrh - 2;
 
 	i = j = 0;
 	TAILQ_FOREACH(win, &ws->winlist, entry) {
 		if (split && i == split) {
 			colno = winno - split;
-			hrh = (g->h / colno);
-			gg.x += main_width + 2;
-			gg.w = g->w - (main_width + 2);
-			gg.h = hrh - 2;
+			hrh = (r_g.h / colno);
+			extra = r_g.h - (colno * hrh);
+			if (flip)
+				win_g.x = r_g.x;
+			else
+				win_g.x += msize + 2;
+			win_g.w = r_g.w - (msize + 2);
 			j = 0;
 		}
-		if (j == colno - 1)
-			gg.h = (hrh + (g->h - (colno * hrh)));
+		win_g.h = hrh - 2;
+		if (rot) {
+			h_inc = win->sh.width_inc;
+			h_base = win->sh.base_width;
+		} else {
+		   	h_inc =	win->sh.height_inc;	
+			h_base = win->sh.base_height;
+		}
+		if (j == colno - 1) {
+			win_g.h = hrh + extra;
+		} else if (h_inc > 1 && h_inc < h_slice) {
+			/* adjust for window's requested size increment */
+			remain = (win_g.h - h_base) % h_inc;
+			missing = h_inc - remain;
+
+			if (missing <= extra || j == 0) {
+				extra -= missing;
+				win_g.h += missing;
+			} else {
+				win_g.h -= remain;
+				extra += remain;
+			}
+		}
 		 
 		if (j == 0)
-			gg.y = g->y;
+			win_g.y = r_g.y;
 		else
-			gg.y += hrh;
-
+			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;
-			win->g.x = wc.x = gg.x;
-			win->g.y = wc.y = gg.y;
-			win->g.w = wc.width = gg.w;
-			win->g.h = wc.height = gg.h;
+			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);
+			*/
 		}
 
 		XMapRaised(display, win->id);
+		last_h = win_g.h;
 		i++;
 		j++;
 	}
@@ -1211,6 +1348,44 @@ vertical_stack(struct workspace *ws, struct swm_geometry *g) {
 		focus_win(winfocus); /* has to be done outside of the loop */
 }
 
+void
+vertical_config(struct workspace *ws, int id)
+{
+	DNPRINTF(SWM_D_STACK, "vertical_resize: workspace: %d\n", ws->idx);
+
+	switch (id) {
+	case SWM_ARG_ID_STACKRESET:
+	case SWM_ARG_ID_STACKINIT:
+		ws->l_state.vertical_msize = SWM_V_SLICE / 2;
+		ws->l_state.vertical_mwin = 1;
+		break;
+	case SWM_ARG_ID_MASTERSHRINK:
+		if (ws->l_state.vertical_msize > 1)
+			ws->l_state.vertical_msize--;
+		break;
+	case SWM_ARG_ID_MASTERGROW:
+		if (ws->l_state.vertical_msize < SWM_V_SLICE - 1)
+			ws->l_state.vertical_msize++;
+		break;
+	case SWM_ARG_ID_MASTERADD:
+		ws->l_state.vertical_mwin++;
+		break;
+	case SWM_ARG_ID_MASTERDEL:
+		if (ws->l_state.vertical_mwin > 0)
+			ws->l_state.vertical_mwin--;
+		break;
+	default:
+		return;
+	}
+}
+
+void
+vertical_stack(struct workspace *ws, struct swm_geometry *g)
+{
+	DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx);
+
+	stack_master(ws, g, 0, 0);
+}
 
 void
 horizontal_config(struct workspace *ws, int id)
@@ -1244,74 +1419,11 @@ horizontal_config(struct workspace *ws, int id)
 }
 
 void
-horizontal_stack(struct workspace *ws, struct swm_geometry *g) {
-	XWindowChanges		wc;
-	struct swm_geometry	gg = *g;
-	struct ws_win		*win, *winfocus;
-	int			i, j, split, rowno, hrw, winno, main_height;
-	unsigned int		mask;
-
-	DNPRINTF(SWM_D_STACK, "horizontal_stack: workspace: %d\n", ws->idx);
-
-	if ((winno = count_win(ws, 0)) == 0)
-		return;
-
-	if (ws->focus == NULL)
-		ws->focus = TAILQ_FIRST(&ws->winlist);
-	winfocus = cur_focus ? cur_focus : ws->focus;
-
-	if (ws->l_state.horizontal_mwin &&
-	    winno > ws->l_state.horizontal_mwin) {
-		split = ws->l_state.horizontal_mwin;
-		rowno = split;
-		main_height = (g->h / SWM_V_SLICE) *
-		   ws->l_state.horizontal_msize;
-		gg.h = main_height;
-	} else {
-		rowno = winno;
-		split = 0;
-	}
-	hrw = g->w / rowno;
-	gg.w = hrw - 2;
-
-	i = j = 0;
-	TAILQ_FOREACH(win, &ws->winlist, entry) {
-		if (split && i == split) {
-			rowno = winno - split;
-			hrw = (g->w / rowno);
-			gg.y += main_height + 2;
-			gg.h = g->h - (main_height + 2);
-			gg.w = hrw - 2;
-			j = 0;
-		}
-		if (j == rowno - 1)
-			gg.w = (hrw + (g->w - (rowno * hrw)));
-
-		if (j == 0)
-			gg.x = g->x;
-		else
-			gg.x += hrw;
-
-		if (win->transient != 0 || win->floating != 0)
-			stack_floater(win, ws->r);
-		else {
-			bzero(&wc, sizeof wc);
-			wc.border_width = 1;
-			win->g.x = wc.x = gg.x;
-			win->g.y = wc.y = gg.y;
-			win->g.w = wc.width = gg.w;
-			win->g.h = wc.height = gg.h;
-			mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
-			XConfigureWindow(display, win->id, mask, &wc);
-		}
-
-		XMapRaised(display, win->id);
-		j++;
-		i++;
-	}
+horizontal_stack(struct workspace *ws, struct swm_geometry *g)
+{
+	DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx);
 
-	if (winfocus)
-		focus_win(winfocus); /* this has to be done outside of the loop */
+	stack_master(ws, g, 1, 0);
 }
 
 /* fullscreen view */
@@ -1366,6 +1478,8 @@ send_to_ws(struct swm_region *r, union arg *args)
 	int			wsid = args->id;
 	struct ws_win		*win = cur_focus;
 	struct workspace	*ws, *nws;
+	Atom			ws_idx_atom = 0;
+	unsigned char		ws_idx_str[SWM_PROPLEN];
 
 	DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
 
@@ -1386,6 +1500,16 @@ send_to_ws(struct swm_region *r, union arg *args)
 	TAILQ_INSERT_TAIL(&nws->winlist, win, entry);
 	win->ws = nws;
 
+	/* Try to update the window's workspace property */
+	ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+	if (ws_idx_atom &&
+	    snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) {
+		DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n",
+		    ws_idx_str);
+		XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
+		    PropModeReplace, ws_idx_str, SWM_PROPLEN);
+	}
+
 	if (count_win(nws, 1) == 1)
 		nws->focus = win;
 	ws->restack = 1;
@@ -1394,6 +1518,38 @@ send_to_ws(struct swm_region *r, union arg *args)
 	stack();
 }
 
+void
+wkill(struct swm_region *r, union arg *args)
+{
+	DNPRINTF(SWM_D_MISC, "wkill\n");
+	if(r->ws->focus != NULL)
+		XKillClient(display, r->ws->focus->id);
+}
+
+void
+screenshot(struct swm_region *r, union arg *args)
+{
+	union arg			a;
+
+	DNPRINTF(SWM_D_MISC, "screenshot\n");
+
+	if (ss_enabled == 0)
+		return;
+
+	switch (args->id) {
+	case SWM_ARG_ID_SS_ALL:
+		spawn_screenshot[1] = "full";
+		break;
+	case SWM_ARG_ID_SS_WINDOW:
+		spawn_screenshot[1] = "window";
+		break;
+	default:
+		return;
+	}
+	a.argv = spawn_screenshot;
+	spawn(r, &a);
+}
+
 /* key definitions */
 struct key {
 	unsigned int		mod;
@@ -1430,6 +1586,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} },
@@ -1443,6 +1601,9 @@ struct key {
 	{ MODKEY,		XK_b,		bar_toggle,	{0} },
 	{ MODKEY,		XK_Tab,		focus,		{.id = SWM_ARG_ID_FOCUSNEXT} },
 	{ MODKEY | ShiftMask,	XK_Tab,		focus,		{.id = SWM_ARG_ID_FOCUSPREV} },
+	{ 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} },
 };
 
 void
@@ -1604,51 +1765,96 @@ set_win_state(struct ws_win *win, long state)
 }
 
 struct ws_win *
-manage_window(Window id, struct workspace *ws)
+manage_window(Window id)
 {
 	Window			trans;
+	struct workspace	*ws;
 	struct ws_win		*win;
 	XClassHint		ch;
+	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;
 
-	TAILQ_FOREACH(win, &ws->winlist, entry) {
-		if (win->id == id)
+	if ((win = find_window(id)) != NULL)
 			return (win);	/* already being managed */
-	}
 
 	if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
 		errx(1, "calloc: failed to allocate memory for new window");
 
+	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);
+	r = root_to_region(win->wa.root);
+	/* If the window was managed before, put it in the same workspace */
+	if (prop) {
+		DNPRINTF(SWM_D_PROP, "got property _SWM_WS=%s\n", prop);
+		ws_idx = strtonum(prop, 0, 9, &errstr);
+		if (errstr)
+			DNPRINTF(SWM_D_EVENT, "window idx is %s: %s",
+			    errstr, prop);
+		ws = &r->s->ws[ws_idx];
+	} else
+		ws = r->ws;
+
 	win->id = id;
 	win->ws = ws;
-	win->s = ws->r->s;	/* this never changes */
+	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);
 	}
-	XGetWindowAttributes(display, id, &win->wa);
 	win->g.w = win->wa.width;
 	win->g.h = win->wa.height;
 	win->g.x = win->wa.x;
 	win->g.y = win->wa.y;
 
-	/* XXX make this a table */
+	XGetWMNormalHints(display, win->id, &win->sh, &mask); /* XXX function? */
+
+	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",
+		    ws_idx_str);
+		XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
+		    PropModeReplace, ws_idx_str, SWM_PROPLEN);
+	}
+	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);
+	*/
+
 	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;
-		}
+		DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n",
+		    ch.res_class, ch.res_name);
+		for (i = 0; quirks[i].class != NULL && quirks[i].name != NULL &&
+		    quirks[i].quirk != 0; i++){
+			if (!strcmp(ch.res_class, quirks[i].class) &&
+			    !strcmp(ch.res_name, quirks[i].name)) {
+				DNPRINTF(SWM_D_CLASS, "found: %s name: %s\n",
+				    ch.res_class, ch.res_name);
+				if (quirks[i].quirk & SWM_Q_FLOAT)
+					win->floating = 1;
+			}
+#if 0
+		/* XXX logic says to do this but get a double free */
 		if (ch.res_class)
 			XFree(ch.res_class);
 		if (ch.res_name)
 			XFree(ch.res_name);
+#endif
+		}
 	}
 
 	XSelectInput(display, id, EnterWindowMask | FocusChangeMask |
@@ -1656,6 +1862,9 @@ manage_window(Window id, struct workspace *ws)
 
 	set_win_state(win, NormalState);
 
+	/* make new win focused */
+	focus_win(win);
+
 	return (win);
 }
 
@@ -1664,7 +1873,7 @@ configurerequest(XEvent *e)
 {
 	XConfigureRequestEvent	*ev = &e->xconfigurerequest;
 	struct ws_win		*win;
-	int			new = 1;
+	int			new = 0;
 	XWindowChanges		wc;
 
 	if ((win = find_window(ev->window)) == NULL)
@@ -1673,6 +1882,10 @@ 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;
@@ -1683,6 +1896,10 @@ 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) {
@@ -1696,15 +1913,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)) &&
@@ -1740,16 +1958,16 @@ destroynotify(XEvent *e)
 			ws->focus = TAILQ_PREV(win, ws_win_list, entry);
 		if (ws->focus == NULL)
 			ws->focus = TAILQ_FIRST(&ws->winlist);
-		if (ws->focus == win)
+		if (ws->focus == NULL || ws->focus == win) {
 			ws->focus = NULL;
-		if (cur_focus == win)
+			unfocus_all();
+		} else
 			focus_win(ws->focus);
-
 		TAILQ_REMOVE(&ws->winlist, win, entry);
 		set_win_state(win, WithdrawnState);
 		free(win);
+		stack();
 	}
-	stack();
 }
 
 void
@@ -1793,7 +2011,6 @@ maprequest(XEvent *e)
 {
 	XMapRequestEvent	*ev = &e->xmaprequest;
 	XWindowAttributes	wa;
-	struct swm_region	*r;
 
 	DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
 	    e->xmaprequest.window);
@@ -1802,16 +2019,43 @@ maprequest(XEvent *e)
 		return;
 	if (wa.override_redirect)
 		return;
-	r = root_to_region(wa.root);
-	manage_window(e->xmaprequest.window, r->ws);
+	manage_window(e->xmaprequest.window);
 	stack();
 }
 
 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
@@ -1942,11 +2186,16 @@ setup_screens(void)
 	int			ncrtc = 0, w = 0;
         int			i, j, k;
 	struct workspace	*ws;
+	int			ws_idx_atom;
+
 
 	if ((screens = calloc(ScreenCount(display),
 	     sizeof(struct swm_screen))) == NULL)
 		errx(1, "calloc: screens");
 
+	ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+	
+
 	/* map physical screens */
 	for (i = 0; i < ScreenCount(display); i++) {
 		DNPRINTF(SWM_D_WS, "setup_screens: init screen %d\n", i);
@@ -2005,7 +2254,7 @@ setup_screens(void)
 		else 
 			ncrtc = sr->ncrtc;
 
-		for (c = 0; c < ncrtc; c++) {
+		for (c = 0, ci = NULL; c < ncrtc; c++) {
 			ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]);
 			if (ci->noutput == 0)
 				continue;
@@ -2019,7 +2268,8 @@ setup_screens(void)
 				    ci->x, ci->y, ci->width, ci->height);
 			w++;
 		}
-		XRRFreeCrtcInfo(ci);
+		if (ci)
+			XRRFreeCrtcInfo(ci);
 		XRRFreeScreenResources(sr);
 #else
 		new_region(&screens[i], &screens[i].ws[w], 0, 0,
@@ -2041,7 +2291,7 @@ setup_screens(void)
 
 			if (wa.map_state == IsViewable ||
 			    getstate(wins[i]) == NormalState)
-				manage_window(wins[i], r->ws);
+				manage_window(wins[i]);
 		}
 		/* transient windows */
 		for (i = 0; i < no; i++) {
@@ -2051,7 +2301,7 @@ setup_screens(void)
 			if (XGetTransientForHint(display, wins[i], &d1) &&
 			    (wa.map_state == IsViewable || getstate(wins[i]) ==
 			    NormalState))
-				manage_window(wins[i], r->ws);
+				manage_window(wins[i]);
                 }
                 if (wins) {
                         XFree(wins);
@@ -2071,7 +2321,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");