X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=8564d3d7c9d3c0cf0a5d362af2e03a48080f0ad9;hb=1ebdff4405817d61b3ca6a6ebd865bf226fdcfe4;hp=87cb9467a58e2786d28bd8248e612f4c63e4b28b;hpb=0839929c3d0642e2f3d1abc59fa7d2089187c30e;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 87cb946..8564d3d 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -56,11 +56,16 @@
 #include <locale.h>
 #include <unistd.h>
 #include <time.h>
+#include <signal.h>
 #include <string.h>
+#include <util.h>
+#include <pwd.h>
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/queue.h>
+#include <sys/param.h>
 
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
@@ -73,16 +78,18 @@
 #ifdef SWM_DEBUG
 #define DPRINTF(x...)		do { if (swm_debug) fprintf(stderr, x); } while(0)
 #define DNPRINTF(n,x...)	do { if (swm_debug & n) fprintf(stderr, x); } while(0)
-#define	SWM_D_EVENT		0x0001
-#define	SWM_D_WS		0x0002
-#define	SWM_D_FOCUS		0x0004
-#define	SWM_D_MISC		0x0008
+#define	SWM_D_MISC		0x0001
+#define	SWM_D_EVENT		0x0002
+#define	SWM_D_WS		0x0004
+#define	SWM_D_FOCUS		0x0008
+#define	SWM_D_MOVE		0x0010
 
-uint32_t		swm_debug = 0
+u_int32_t		swm_debug = 0
+			    | SWM_D_MISC
 			    | SWM_D_EVENT
 			    | SWM_D_WS
 			    | SWM_D_FOCUS
-			    | SWM_D_MISC
+			    | SWM_D_MOVE
 			    ;
 #else
 #define DPRINTF(x...)
@@ -93,45 +100,94 @@ uint32_t		swm_debug = 0
 #define MODKEY			Mod1Mask
 #define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
 
+char			**start_argv;
+Atom			astate;
 int			(*xerrorxlib)(Display *, XErrorEvent *);
 int			other_wm;
 int			screen;
-int			width, height;
 int			running = 1;
 int			ignore_enter = 0;
 unsigned int		numlockmask = 0;
-unsigned long		col_focus = 0xff0000;	/* XXX should this be per ws? */
-unsigned long		col_unfocus = 0x888888;
+unsigned long		color_focus = 0xff0000;	/* XXX should this be per ws? */
+unsigned long		color_unfocus = 0x888888;
 Display			*display;
 Window			root;
 
 /* status bar */
 int			bar_enabled = 1;
-int			bar_height = 12;
+int			bar_height = 0;
+unsigned long		bar_border = 0x008080;
+unsigned long		bar_color = 0x000000;
+unsigned long		bar_font_color = 0xa0a0a0;
 Window			bar_window;
 GC			bar_gc;
 XGCValues		bar_gcv;
 XFontStruct		*bar_fs;
 char			bar_text[128];
+char			*bar_fonts[] = {
+			    "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*",
+			    "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*",
+			    NULL
+};
 
-struct ws_win {
-	TAILQ_ENTRY(ws_win)	entry;
-	Window			id;
+/* terminal + args */
+char				*spawn_term[] = { "xterm", NULL };
+char				*spawn_menu[] = { "dmenu_run", NULL };
+
+/* layout manager data */
+struct swm_geometry {
 	int			x;
 	int			y;
-	int			width;
-	int			height;
+	int			w;
+	int			h;
 };
 
+
+struct ws_win {
+	TAILQ_ENTRY(ws_win)	entry;
+	Window			id;
+	struct swm_geometry	g;
+	int			floating;
+	int			transient;
+	XWindowAttributes	wa;
+	XSizeHints		sh;
+};
 TAILQ_HEAD(ws_win_list, ws_win);
 
+/* layout handlers */
+void	stack(void);
+void	vertical_init(int);
+void	vertical_resize(int);
+void	vertical_stack(struct swm_geometry *);
+void	horizontal_init(int);
+void	horizontal_resize(int);
+void	horizontal_stack(struct swm_geometry *);
+void	max_init(int);
+void	max_focus(struct ws_win *);
+void	max_stack(struct swm_geometry *);
+
+struct layout {
+	void			(*l_init)(int);	/* init/reset */
+	void			(*l_stack)(struct swm_geometry *);
+	void			(*l_resize)(int);
+	void			(*l_focus)(struct ws_win *);
+} layouts[] =  {
+	/* init			stack,			resize */
+	{ vertical_init,	vertical_stack,		vertical_resize,	NULL},
+	{ horizontal_init,	horizontal_stack,	horizontal_resize,	NULL},
+	{ NULL,			max_stack,		NULL,			max_focus},
+	{ NULL,			NULL,			NULL,			NULL},
+};
+
+
 /* define work spaces */
 #define SWM_WS_MAX		(10)
 struct workspace {
 	int			visible;	/* workspace visible */
 	int			restack;	/* restack on switch */
+	struct swm_geometry	g;
+	struct layout		*cur_layout;	/* current layout handlers */
 	struct ws_win		*focus;		/* which win has focus */
-	int			winno;		/* total nr of windows */
 	struct ws_win_list	winlist;	/* list of windows in ws */
 } ws[SWM_WS_MAX];
 int			current_ws = 0;
@@ -142,11 +198,94 @@ union arg {
 #define SWM_ARG_ID_FOCUSNEXT	(0)
 #define SWM_ARG_ID_FOCUSPREV	(1)
 #define SWM_ARG_ID_FOCUSMAIN	(2)
+#define SWM_ARG_ID_SWAPNEXT	(3)
+#define SWM_ARG_ID_SWAPPREV	(4)
+#define SWM_ARG_ID_SWAPMAIN	(5)
+#define SWM_ARG_ID_MASTERSHRINK (6)
+#define SWM_ARG_ID_MASTERGROW	(7)
 	char			**argv;
 };
 
+/* conf file stuff */
+#define	SWM_CONF_WS	"\n= \t"
+#define SWM_CONF_FILE	"scrotwm.conf"
+int
+conf_load(char *filename)
+{
+	FILE			*config;
+	char			*line, *cp, *var, *val;
+	size_t			 len, lineno = 0;
 
-void	stack(void);
+	DNPRINTF(SWM_D_MISC, "conf_load: filename %s\n", filename);
+
+	if (filename == NULL)
+		return (1);
+
+	if ((config = fopen(filename, "r")) == NULL)
+		return (1);
+
+	for (;;) {
+		if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL)
+			if (feof(config))
+				break;
+		cp = line;
+		cp += (long)strspn(cp, SWM_CONF_WS);
+		if (cp[0] == '\0') {
+			/* empty line */
+			free(line);
+			continue;
+		}
+		if ((var = strsep(&cp, SWM_CONF_WS)) == NULL || cp == NULL)
+			break;
+		cp += (long)strspn(cp, SWM_CONF_WS);
+		if ((val = strsep(&cp, SWM_CONF_WS)) == NULL)
+			break;
+
+		DNPRINTF(SWM_D_MISC, "conf_load: %s=%s\n",var ,val);
+		switch (var[0]) {
+		case 'b':
+			if (!strncmp(var, "bar_enabled", strlen("bar_enabled")))
+				bar_enabled = atoi(val);
+			else if (!strncmp(var, "bar_border",
+			    strlen("bar_border")))
+				bar_border = strtol(val, NULL, 16);
+			else if (!strncmp(var, "bar_color",
+			    strlen("bar_color")))
+				bar_color = strtol(val, NULL, 16);
+			else if (!strncmp(var, "bar_font_color",
+			    strlen("bar_font_color")))
+				bar_font_color = strtol(val, NULL, 16);
+			else if (!strncmp(var, "bar_font", strlen("bar_font")))
+				asprintf(&bar_fonts[0], "%s", val);
+			else
+				goto bad;
+			break;
+
+		case 'c':
+			if (!strncmp(var, "color_focus", strlen("color_focus")))
+				color_focus = strtol(val, NULL, 16);
+			else if (!strncmp(var, "color_unfocus",
+			    strlen("color_unfocus")))
+				color_unfocus = strtol(val, NULL, 16);
+			else
+				goto bad;
+			break;
+
+		case 's':
+			if (!strncmp(var, "spawn_term", strlen("spawn_term")))
+				asprintf(&spawn_term[0], "%s", val); /* XXX args? */
+			break;
+		default:
+			goto bad;
+		}
+		free(line);
+	}
+
+	fclose(config);
+	return (0);
+bad:
+	errx(1, "invalid conf file entry: %s=%s", var, val);
+}
 
 void
 bar_print(void)
@@ -154,8 +293,11 @@ bar_print(void)
 	time_t			tmt;
 	struct tm		tm;
 
+	if (bar_enabled == 0)
+		return;
+
 	/* clear old text */
-	XSetForeground(display, bar_gc, 0x000000);
+	XSetForeground(display, bar_gc, bar_color);
 	XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
 	    strlen(bar_text));
 
@@ -163,10 +305,109 @@ bar_print(void)
 	time(&tmt);
 	localtime_r(&tmt, &tm);
 	strftime(bar_text, sizeof bar_text, "%a %b %d %R %Z %Y", &tm);
-	XSetForeground(display, bar_gc, 0xa0a0a0);
+	XSetForeground(display, bar_gc, bar_font_color);
 	XDrawString(display, bar_window, bar_gc, 4, bar_fs->ascent, bar_text,
 	    strlen(bar_text));
 	XSync(display, False);
+
+	alarm(60);
+}
+
+void
+bar_signal(int sig)
+{
+	/* XXX yeah yeah byte me */
+	bar_print();
+}
+
+void
+bar_toggle(union arg *args)
+{
+	int i;
+
+	DNPRINTF(SWM_D_MISC, "bar_toggle\n");
+
+	if (bar_enabled) {
+		bar_enabled = 0;
+		XUnmapWindow(display, bar_window);
+	} else {
+		bar_enabled = 1;
+		XMapRaised(display, bar_window);
+	}
+	XSync(display, False);
+	for (i = 0; i < SWM_WS_MAX; i++)
+		ws[i].restack = 1;
+
+	stack();
+	bar_print(); /* must be after stack */
+}
+
+void
+bar_setup(void)
+{
+	int			i;
+
+	for (i = 0; bar_fonts[i] != NULL; i++) {
+		bar_fs = XLoadQueryFont(display, bar_fonts[i]);
+		if (bar_fs)
+			break;
+	}
+	if (bar_fonts[i] == NULL)
+			errx(1, "couldn't load font");
+	bar_height = bar_fs->ascent + bar_fs->descent + 3;
+
+	bar_window = XCreateSimpleWindow(display, root, 0, 0,
+	    ws[current_ws].g.w, bar_height - 2, 1, bar_border, bar_color);
+	bar_gc = XCreateGC(display, bar_window, 0, &bar_gcv);
+	XSetFont(display, bar_gc, bar_fs->fid);
+	XSelectInput(display, bar_window, VisibilityChangeMask);
+	if (bar_enabled) {
+		XMapRaised(display, bar_window);
+	}
+	DNPRINTF(SWM_D_MISC, "bar_setup: bar_window %d\n", (int)bar_window);
+
+	if (signal(SIGALRM, bar_signal) == SIG_ERR)
+		err(1, "could not install bar_signal");
+	bar_print();
+}
+
+void
+config_win(struct ws_win *win)
+{
+	XConfigureEvent		ce;
+
+	DNPRINTF(SWM_D_MISC, "config_win: win %lu x %d y %d w %d h %d\n",
+	    win->id, win->g.x, win->g.y, win->g.w, win->g.h);
+	ce.type = ConfigureNotify;
+	ce.display = display;
+	ce.event = win->id;
+	ce.window = win->id;
+	ce.x = win->g.x;
+	ce.y = win->g.y;
+	ce.width = win->g.w;
+	ce.height = win->g.h;
+	ce.border_width = 1; /* XXX store this! */
+	ce.above = None;
+	ce.override_redirect = False;
+	XSendEvent(display, win->id, False, StructureNotifyMask, (XEvent *)&ce);
+}
+
+int
+count_win(int wsid, int count_transient)
+{
+	struct ws_win		*win;
+	int			count = 0;
+
+	TAILQ_FOREACH (win, &ws[wsid].winlist, entry) {
+		if (count_transient == 0 && win->floating)
+			continue;
+		if (count_transient == 0 && win->transient)
+			continue;
+		count++;
+	}
+	DNPRINTF(SWM_D_MISC, "count_win: %d\n", count);
+
+	return (count);
 }
 void
 quit(union arg *args)
@@ -176,6 +417,18 @@ quit(union arg *args)
 }
 
 void
+restart(union arg *args)
+{
+	DNPRINTF(SWM_D_MISC, "restart: %s\n", start_argv[0]);
+
+	XCloseDisplay(display);
+	execvp(start_argv[0], start_argv);
+	fprintf(stderr, "execvp failed\n");
+	perror(" failed");
+	quit(NULL);
+}
+
+void
 spawn(union arg *args)
 {
 	DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
@@ -201,7 +454,7 @@ void
 focus_win(struct ws_win *win)
 {
 	DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win->id);
-	XSetWindowBorder(display, win->id, col_focus);
+	XSetWindowBorder(display, win->id, color_focus);
 	XSetInputFocus(display, win->id, RevertToPointerRoot, CurrentTime);
 	ws[current_ws].focus = win;
 }
@@ -210,7 +463,7 @@ void
 unfocus_win(struct ws_win *win)
 {
 	DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", win->id);
-	XSetWindowBorder(display, win->id, col_unfocus);
+	XSetWindowBorder(display, win->id, color_unfocus);
 	if (ws[current_ws].focus == win)
 		ws[current_ws].focus = NULL;
 }
@@ -228,7 +481,7 @@ switchws(union arg *args)
 
 	/* map new window first to prevent ugly blinking */
 	TAILQ_FOREACH (win, &ws[wsid].winlist, entry)
-		XMapWindow(display, win->id);
+		XMapRaised(display, win->id);
 	ws[wsid].visible = 1;
 
 	TAILQ_FOREACH (win, &ws[current_ws].winlist, entry)
@@ -240,6 +493,7 @@ switchws(union arg *args)
 	ignore_enter = 1;
 	if (ws[wsid].restack) {
 		stack();
+		bar_print();
 	} else {
 		if (ws[wsid].focus != NULL)
 			focus_win(ws[wsid].focus);
@@ -248,172 +502,514 @@ switchws(union arg *args)
 }
 
 void
+swapwin(union arg *args)
+{
+	struct ws_win		*target;
+
+	DNPRINTF(SWM_D_MOVE, "swapwin: id %d\n", args->id);
+	if (ws[current_ws].focus == NULL)
+		return;
+
+	switch (args->id) {
+	case SWM_ARG_ID_SWAPPREV:
+		target = TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
+		TAILQ_REMOVE(&ws[current_ws].winlist,
+		    ws[current_ws].focus, entry);
+		if (target == NULL)
+			TAILQ_INSERT_TAIL(&ws[current_ws].winlist,
+			    ws[current_ws].focus, entry);
+		else
+			TAILQ_INSERT_BEFORE(target, ws[current_ws].focus,
+			    entry);
+		break;
+	case SWM_ARG_ID_SWAPNEXT: 
+		target = TAILQ_NEXT(ws[current_ws].focus, entry);
+		TAILQ_REMOVE(&ws[current_ws].winlist,
+		    ws[current_ws].focus, entry);
+		if (target == NULL)
+			TAILQ_INSERT_HEAD(&ws[current_ws].winlist,
+			    ws[current_ws].focus, entry);
+		else
+			TAILQ_INSERT_AFTER(&ws[current_ws].winlist, target,
+			    ws[current_ws].focus, entry);
+		break;
+	case SWM_ARG_ID_SWAPMAIN:
+		target = TAILQ_FIRST(&ws[current_ws].winlist);
+		if (target == ws[current_ws].focus)
+			return;
+		TAILQ_REMOVE(&ws[current_ws].winlist, target, entry);
+		TAILQ_INSERT_BEFORE(ws[current_ws].focus, target, entry);
+		TAILQ_REMOVE(&ws[current_ws].winlist,
+		    ws[current_ws].focus, entry);
+		TAILQ_INSERT_HEAD(&ws[current_ws].winlist,
+		    ws[current_ws].focus, entry);
+		break;
+	default:
+		DNPRINTF(SWM_D_MOVE, "invalid id: %d\n", args->id);
+		return;
+	}
+
+	ignore_enter = 2;
+	stack();
+}
+
+void
 focus(union arg *args)
 {
 	struct ws_win		*winfocus, *winlostfocus;
 
 	DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id);
-	if (ws[current_ws].focus == NULL || ws[current_ws].winno == 0)
+	if (ws[current_ws].focus == NULL)
 		return;
 
 	winlostfocus = ws[current_ws].focus;
 
 	switch (args->id) {
 	case SWM_ARG_ID_FOCUSPREV:
-		if (ws[current_ws].focus ==
-		    TAILQ_FIRST(&ws[current_ws].winlist))
-			ws[current_ws].focus =
+		winfocus = TAILQ_PREV(ws[current_ws].focus, ws_win_list, entry);
+		if (winfocus == NULL)
+			winfocus =
 			    TAILQ_LAST(&ws[current_ws].winlist, ws_win_list);
-		else
-			ws[current_ws].focus =TAILQ_PREV(ws[current_ws].focus,
-			    ws_win_list, entry);
 		break;
 
 	case SWM_ARG_ID_FOCUSNEXT:
-		if (ws[current_ws].focus == TAILQ_LAST(&ws[current_ws].winlist,
-		    ws_win_list))
-			ws[current_ws].focus =
-			    TAILQ_FIRST(&ws[current_ws].winlist);
-		else
-			ws[current_ws].focus =
-			    TAILQ_NEXT(ws[current_ws].focus, entry);
+		winfocus = TAILQ_NEXT(ws[current_ws].focus, entry);
+		if (winfocus == NULL)
+			winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
 		break;
 
 	case SWM_ARG_ID_FOCUSMAIN:
-		ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);;
+		winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
 		break;
 
 	default:
 		return;
 	}
 
-	winfocus = ws[current_ws].focus;
+	if (winfocus == winlostfocus)
+		return;
+
 	unfocus_win(winlostfocus);
 	focus_win(winfocus);
+	/* XXX if we hook in focus_win(), we get a nasty cycle */
+	if (ws[current_ws].cur_layout->l_focus != NULL)
+		ws[current_ws].cur_layout->l_focus(winfocus);
 	XSync(display, False);
 }
 
-/* I know this sucks but it works well enough */
 void
-stack(void)
+cycle_layout(union arg *args)
 {
-	XWindowChanges		wc;
-	struct ws_win		wf, *win, *winfocus = &wf;
-	int			i, h, w, x, y, hrh;
+	DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", current_ws);
+
+	ws[current_ws].cur_layout++;
+	if (ws[current_ws].cur_layout->l_stack == NULL)
+		ws[current_ws].cur_layout = &layouts[0];
+	ignore_enter = 1;
+
+	stack();
+}
+
+void
+resize_master(union arg *args)
+{
+	DNPRINTF(SWM_D_EVENT, "resize_master: id %d\n", args->id);
+
+	if (ws[current_ws].cur_layout->l_resize != NULL)
+		ws[current_ws].cur_layout->l_resize(args->id);
+}
+
+void
+stack_reset(union arg *args)
+{
+	DNPRINTF(SWM_D_EVENT, "stack_reset: ws %d\n", current_ws);
 
+	if (ws[current_ws].cur_layout->l_init != NULL) {
+		ws[current_ws].cur_layout->l_init(current_ws);
+		stack();
+	}
+}
+
+void
+stack(void) {
+	struct swm_geometry g;
 	DNPRINTF(SWM_D_EVENT, "stack: workspace: %d\n", current_ws);
 
-	winfocus->id = root;
+	/* start with workspace geometry, adjust for bar */
+	g = ws[current_ws].g;
+	if (bar_enabled) {
+		g.y += bar_height;
+		g.h -= bar_height;
+	} 
+
+	ws[current_ws].restack = 0;
+	ws[current_ws].cur_layout->l_stack(&g);
+	XSync(display, False);
+}
+
+void
+stack_floater(struct ws_win *win)
+{
+	unsigned int		mask;
+	XWindowChanges		wc;
+
+#if 0
+	bzero(&wc, sizeof wc);
+	wc.border_width = 1;
+	mask = CWX | CWY | CWBorderWidth;
+
+	win->g.w = wc.width = win->wa.width;
+	win->g.h = wc.height = win->wa.height;
+	win->g.x = wc.x = (ws[current_ws].g.w - win->wa.width) / 2;
+	win->g.y = wc.y = (ws[current_ws].g.h - win->wa.height) / 2;
+
+	DNPRINTF(SWM_D_EVENT, "stack_floater: win %d x %d y %d w %d h %d\n",
+	    win, wc.x, wc.y, wc.width, wc.height);
+
+	XConfigureWindow(display, win->id, mask, &wc);
+return;
+#endif
+	bzero(&wc, sizeof wc);
+	wc.border_width = 1;
+	mask = CWX | CWY | CWBorderWidth;
+
+	/* use obsolete width height */
+	if (win->sh.flags & USPosition) {
+		win->g.w = wc.width = win->sh.width;
+		win->g.h = wc.height = win->sh.height;
+		mask |= CWWidth | CWHeight;
+	}
+
+	/* try min max */
+	if (win->sh.flags & PMinSize) {
+		/* some hints are retarded */
+		if (win->sh.min_width < ws[current_ws].g.w / 10)
+			win->sh.min_width = ws[current_ws].g.w / 3;
+		if (win->sh.min_height < ws[current_ws].g.h / 10)
+			win->sh.height = ws[current_ws].g.h / 3;
+
+		win->g.w = wc.width = win->sh.min_width * 2;
+		win->g.h = wc.height = win->sh.min_height * 2;
+		mask |= CWWidth | CWHeight;
+	}
+	if (win->sh.flags & PMaxSize) {
+		/* potentially override min values */
+		if (win->sh.max_width < ws[current_ws].g.w) {
+			win->g.w = wc.width = win->sh.max_width;
+			mask |= CWWidth;
+		}
+		if (win->sh.max_height < ws[current_ws].g.h) {
+			win->g.h = wc.height = win->sh.max_height;
+			mask |= CWHeight;
+		}
+	}
+
+	/* make sure we don't clobber the screen */
+	if ((mask & CWWidth) && win->wa.width > ws[current_ws].g.w)
+		win->wa.width = ws[current_ws].g.w - 4;
+	if ((mask & CWHeight) && win->wa.height > ws[current_ws].g.h)
+		win->wa.height = ws[current_ws].g.h - 4;
+
+	/* supposed to be obsolete */
+	if (win->sh.flags & USPosition) {
+		win->g.x = wc.x = win->sh.x;
+		win->g.y = wc.y = win->sh.y;
+	} else {
+		win->g.x = wc.x = (ws[current_ws].g.w - win->wa.width) / 2;
+		win->g.y = wc.y = (ws[current_ws].g.h - win->wa.height) / 2;
+	}
+	DNPRINTF(SWM_D_EVENT, "stack_floater: win %d x %d y %d w %d h %d\n",
+	    win, wc.x, wc.y, wc.width, wc.height);
+
+	XConfigureWindow(display, win->id, mask, &wc);
+}
+
+
+int vertical_msize[SWM_WS_MAX];
+
+void
+vertical_init(int ws_idx)
+{
+	DNPRINTF(SWM_D_MISC, "vertical_init: workspace: %d\n", current_ws);
+
+	vertical_msize[ws_idx] = ws[ws_idx].g.w / 2;
+}
+
+void
+vertical_resize(int id)
+{
+	DNPRINTF(SWM_D_MISC, "vertical_resize: workspace: %d\n", current_ws);
 
-	if (ws[current_ws].winno == 0)
+	switch (id) {
+	case SWM_ARG_ID_MASTERSHRINK:
+		vertical_msize[current_ws] -= ws[current_ws].g.w / 32;
+		if ( vertical_msize[current_ws] < ws[current_ws].g.w / 16)
+			vertical_msize[current_ws] = ws[current_ws].g.w / 16;
+		break;
+	case SWM_ARG_ID_MASTERGROW:
+		vertical_msize[current_ws] += ws[current_ws].g.w / 32;
+		if ( vertical_msize[current_ws] >
+		   (ws[current_ws].g.w - (ws[current_ws].g.w / 16)))
+			vertical_msize[current_ws] =
+			    ws[current_ws].g.w - ws[current_ws].g.w / 16;
+		break;
+	default:
 		return;
+	}
+	stack();
+}
 
-	if (ws[current_ws].winno > 1)
-		w = width / 2;
-	else
-		w = width;
+void
+vertical_stack(struct swm_geometry *g) {
+	XWindowChanges		wc;
+	struct swm_geometry	gg = *g;
+	struct ws_win		wf, *win, *winfocus = &wf;
+	int			i, hrh, winno;
+	unsigned int		mask;
 
-	if (ws[current_ws].winno > 2)
-		hrh = height / (ws[current_ws].winno - 1);
+	DNPRINTF(SWM_D_EVENT, "vertical_stack: workspace: %d\n", current_ws);
+
+	winno = count_win(current_ws, 0);
+	if (winno == 0)
+		return;
+	winfocus->id = root;
+
+	if (winno > 1)
+		gg.w = vertical_msize[current_ws];
+
+	if (winno > 2)
+		hrh = g->h / (winno - 1);
 	else
 		hrh = 0;
 
-	x = 0;
-	y = bar_height;
-	h = height;
 	i = 0;
 	TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
 		if (i == 1) {
-			x += w + 2;
-			w -= 2;
+			gg.x += vertical_msize[current_ws] + 2;
+			gg.w = g->w - (vertical_msize[current_ws] + 2);
 		}
 		if (i != 0 && hrh != 0) {
 			/* correct the last window for lost pixels */
 			if (win == TAILQ_LAST(&ws[current_ws].winlist,
 			    ws_win_list)) {
-				h = height - (i * hrh);
-				if (h == 0)
-					h = hrh;
-				else
-					h += hrh;
-				y += hrh;
+				gg.h = hrh + (g->h - (i * hrh));
+				gg.y += hrh;
 			} else {
-				h = hrh - 2;
+				gg.h = hrh - 2;
 				/* leave first right hand window at y = 0 */
 				if (i > 1)
-					y += h + 2;
+					gg.y += gg.h + 2;
 			}
 		}
 
-		bzero(&wc, sizeof wc);
-		win->x = wc.x = x;
-		win->y = wc.y = y;
-		win->width = wc.width = w;
-		win->height = wc.height = h;
-		wc.border_width = 1;
-		XConfigureWindow(display, win->id, CWX | CWY | CWWidth |
-		    CWHeight | CWBorderWidth, &wc);
+		if (win->transient != 0 || win->floating != 0)
+			stack_floater(win);
+		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);
+		}
+
 		if (win == ws[current_ws].focus)
 			winfocus = win;
 		else
 			unfocus_win(win);
-		XMapWindow(display, win->id);
+		XMapRaised(display, win->id);
 		i++;
 	}
 
 	focus_win(winfocus); /* this has to be done outside of the loop */
-	XSync(display, False);
 }
 
+int horizontal_msize[SWM_WS_MAX];
+
 void
-swap_to_main(union arg *args)
+horizontal_init(int ws_idx)
 {
-	struct ws_win 		*tmpwin = TAILQ_FIRST(&ws[current_ws].winlist);
+	DNPRINTF(SWM_D_MISC, "horizontal_init: workspace: %d\n", current_ws);
 
-	DNPRINTF(SWM_D_MISC, "swap_to_main: win: %lu\n",
-	    ws[current_ws].focus->id);
+	horizontal_msize[ws_idx] = ws[ws_idx].g.h / 2;
+}
 
-	TAILQ_REMOVE(&ws[current_ws].winlist, tmpwin, entry);
-	TAILQ_INSERT_AFTER(&ws[current_ws].winlist, ws[current_ws].focus,
-	    tmpwin, entry);
-	TAILQ_REMOVE(&ws[current_ws].winlist, ws[current_ws].focus, entry);
-	TAILQ_INSERT_HEAD(&ws[current_ws].winlist, ws[current_ws].focus, entry);
-	ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
-	ignore_enter = 2;
+void
+horizontal_resize(int id)
+{
+	DNPRINTF(SWM_D_MISC, "horizontal_resize: workspace: %d\n", current_ws);
+
+	switch (id) {
+	case SWM_ARG_ID_MASTERSHRINK:
+		horizontal_msize[current_ws] -= ws[current_ws].g.h / 32;
+		if ( horizontal_msize[current_ws] < ws[current_ws].g.h / 16)
+			horizontal_msize[current_ws] = ws[current_ws].g.h / 16;
+		break;
+	case SWM_ARG_ID_MASTERGROW:
+		horizontal_msize[current_ws] += ws[current_ws].g.h / 32;
+		if ( horizontal_msize[current_ws] >
+		   (ws[current_ws].g.h - (ws[current_ws].g.h / 16)))
+			horizontal_msize[current_ws] =
+			    ws[current_ws].g.h - ws[current_ws].g.h / 16;
+		break;
+	default:
+		return;
+	}
 	stack();
 }
 
 void
+horizontal_stack(struct swm_geometry *g) {
+	XWindowChanges		wc;
+	struct swm_geometry	gg = *g;
+	struct ws_win		wf, *win, *winfocus = &wf;
+	int			i, hrw, winno;
+	unsigned int		mask;
+
+	DNPRINTF(SWM_D_EVENT, "horizontal_stack: workspace: %d\n", current_ws);
+
+	winno = count_win(current_ws, 0);
+	if (winno == 0)
+		return;
+	winfocus->id = root;
+
+	if (winno > 1)
+		gg.h = horizontal_msize[current_ws];
+
+	if (winno > 2)
+		hrw = g->w / (winno - 1);
+	else
+		hrw = 0;
+
+	i = 0;
+	TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+		if (i == 1) {
+			gg.y += horizontal_msize[current_ws] + 2;
+			gg.h = g->h - (horizontal_msize[current_ws] + 2);
+		}
+		if (i != 0 && hrw != 0) {
+			/* correct the last window for lost pixels */
+			if (win == TAILQ_LAST(&ws[current_ws].winlist,
+			    ws_win_list)) {
+				gg.w = hrw + (g->w - (i * hrw));
+				gg.x += hrw;
+			} else {
+				gg.w = hrw - 2;
+				/* leave first bottom window at x = 0 */
+				if (i > 1)
+					gg.x += gg.w + 2;
+			}
+		}
+
+		if (win->transient != 0 || win->floating != 0)
+			stack_floater(win);
+		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);
+		}
+
+		if (win == ws[current_ws].focus)
+			winfocus = win;
+		else
+			unfocus_win(win);
+		XMapRaised(display, win->id);
+		i++;
+	}
+
+	focus_win(winfocus); /* this has to be done outside of the loop */
+}
+
+void
+max_focus(struct ws_win *fwin)
+{
+	struct ws_win *win;
+
+	TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+		if (win->transient == 0 && win->floating == 0 && win == fwin)
+			XMapRaised(display, win->id);
+		else
+			XUnmapWindow(display, win->id);
+	}
+}
+
+/* fullscreen view */
+void
+max_stack(struct swm_geometry *g) {
+	XWindowChanges		wc;
+	struct swm_geometry	gg = *g;
+	struct ws_win		*win, *winfocus;
+	unsigned int		mask;
+
+	DNPRINTF(SWM_D_EVENT, "max_stack: workspace: %d\n", current_ws);
+
+	if (count_win(current_ws, 0) == 0)
+		return;
+
+	winfocus = ws[current_ws].focus;
+	if (!winfocus)
+		winfocus = TAILQ_FIRST(&ws[current_ws].winlist);
+
+	TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+		if (win->transient != 0 || win->floating != 0) {
+			if (win == winfocus)
+				stack_floater(win); /* XXX maximize? */
+			else
+				XUnmapWindow(display, win->id);
+		} 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);
+
+			if (winfocus == win)
+				XMapRaised(display, win->id);
+			else
+				XUnmapWindow(display, win->id);
+		}
+	}
+
+	focus_win(winfocus); /* this has to be done outside of the loop */
+}
+
+void
 send_to_ws(union arg *args)
 {
 	int			wsid = args->id;
 	struct ws_win		*win = ws[current_ws].focus;
 
-	DNPRINTF(SWM_D_MISC, "send_to_ws: win: %lu\n", win->id);
+	DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
 
 	XUnmapWindow(display, win->id);
 
 	/* find a window to focus */
-	ws[current_ws].focus = TAILQ_PREV(win, ws_win_list,entry);
+	ws[current_ws].focus = TAILQ_PREV(win, ws_win_list, entry);
 	if (ws[current_ws].focus == NULL)
 		ws[current_ws].focus = TAILQ_FIRST(&ws[current_ws].winlist);
+	if (ws[current_ws].focus == win)
+		ws[current_ws].focus = NULL;
 
 	TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
-	ws[current_ws].winno--;
 
 	TAILQ_INSERT_TAIL(&ws[wsid].winlist, win, entry);
-	if (ws[wsid].winno == 0)
+	if (count_win(wsid, 1) == 1)
 		ws[wsid].focus = win;
-	ws[wsid].winno++;
 	ws[wsid].restack = 1;
 
 	stack();
 }
 
-
-/* terminal + args */
-char				*term[] = { "xterm", NULL };
-
 /* key definitions */
 struct key {
 	unsigned int		mod;
@@ -422,9 +1018,19 @@ struct key {
 	union arg		args;
 } keys[] = {
 	/* modifier		key	function		argument */
-	{ MODKEY,		XK_Return,	swap_to_main,	{0} },
-	{ MODKEY | ShiftMask,	XK_Return,	spawn,		{.argv = term } },
+	{ MODKEY,		XK_space,	cycle_layout,	{0} }, 
+	{ MODKEY | ShiftMask,	XK_space,	stack_reset,	{0} }, 
+	{ MODKEY,		XK_h,		resize_master,	{.id = SWM_ARG_ID_MASTERSHRINK} },
+	{ MODKEY,		XK_l,		resize_master,	{.id = SWM_ARG_ID_MASTERGROW} },
+	{ MODKEY,		XK_Return,	swapwin,	{.id = SWM_ARG_ID_SWAPMAIN} },
+	{ MODKEY,		XK_j,		focus,		{.id = SWM_ARG_ID_FOCUSNEXT} },
+	{ MODKEY,		XK_k,		focus,		{.id = SWM_ARG_ID_FOCUSPREV} },
+	{ MODKEY | ShiftMask,	XK_j,		swapwin,	{.id = SWM_ARG_ID_SWAPNEXT} },
+	{ MODKEY | ShiftMask,	XK_k,		swapwin,	{.id = SWM_ARG_ID_SWAPPREV} },
+	{ MODKEY | ShiftMask,	XK_Return,	spawn,		{.argv = spawn_term} },
+	{ MODKEY,		XK_p,		spawn,		{.argv = spawn_menu} },
 	{ MODKEY | ShiftMask,	XK_q,		quit,		{0} },
+	{ MODKEY,		XK_q,		restart,	{0} },
 	{ MODKEY,		XK_m,		focus,		{.id = SWM_ARG_ID_FOCUSMAIN} },
 	{ MODKEY,		XK_1,		switchws,	{.id = 0} },
 	{ MODKEY,		XK_2,		switchws,	{.id = 1} },
@@ -446,8 +1052,8 @@ struct key {
 	{ MODKEY | ShiftMask,	XK_8,		send_to_ws,	{.id = 7} },
 	{ MODKEY | ShiftMask,	XK_9,		send_to_ws,	{.id = 8} },
 	{ MODKEY | ShiftMask,	XK_0,		send_to_ws,	{.id = 9} },
-	{ MODKEY,		XK_Tab,		focus,		{.id = SWM_ARG_ID_FOCUSPREV} },
-	{ MODKEY | ShiftMask,	XK_Tab,		focus,		{.id = SWM_ARG_ID_FOCUSNEXT} },
+	{ 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} },
 };
 
@@ -544,24 +1150,97 @@ buttonpress(XEvent *e)
 }
 
 void
-configurerequest(XEvent *e)
+set_win_state(struct ws_win *win, long state)
 {
-	XConfigureRequestEvent	*ev = &e->xconfigurerequest;
-	struct ws_win		*win;
+	long			data[] = {state, None};
 
-	DNPRINTF(SWM_D_EVENT, "configurerequest: window: %lu\n", ev->window);
+	DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id);
 
-	XSelectInput(display, ev->window, ButtonPressMask | EnterWindowMask |
-	    FocusChangeMask);
+	XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace,
+	    (unsigned char *)data, 2);
+}
+
+struct ws_win *
+manage_window(Window id)
+{
+	Window			trans;
+	struct ws_win		*win;
+	XClassHint		ch;
+
+	TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+		if (win->id == id)
+			return (win);	/* already being managed */
+	}
 
 	if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
 		errx(1, "calloc: failed to allocate memory for new window");
 
-	win->id = ev->window;
+	win->id = id;
 	TAILQ_INSERT_TAIL(&ws[current_ws].winlist, win, entry);
 	ws[current_ws].focus = win; /* make new win focused */
-	ws[current_ws].winno++;
-	stack();
+
+	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, win->id, &win->wa);
+	XGetNormalHints(display, win->id, &win->sh);
+
+	/* XXX */
+	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(ch.res_class)
+			XFree(ch.res_class);
+		if(ch.res_name)
+			XFree(ch.res_name);
+	}
+
+	XSelectInput(display, id, ButtonPressMask | EnterWindowMask |
+	    FocusChangeMask | ExposureMask);
+
+	set_win_state(win, NormalState);
+
+	return (win);
+}
+
+void
+configurerequest(XEvent *e)
+{
+	XConfigureRequestEvent	*ev = &e->xconfigurerequest;
+	struct ws_win		*win;
+	int			new = 1;
+	XWindowChanges		wc;
+
+	TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
+		if (win->id == ev->window) {
+			new = 0;
+			break;
+		}
+	}
+
+	if (new) {
+		DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n",
+		    ev->window);
+		bzero(&wc, sizeof wc);
+		wc.x = ev->x;
+		wc.y = ev->y;
+		wc.width = ev->width;
+		wc.height = ev->height;
+		wc.border_width = ev->border_width;
+		wc.sibling = ev->above;
+		wc.stack_mode = ev->detail;
+		XConfigureWindow(display, ev->window, ev->value_mask, &wc);
+	} else {
+		DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n",
+		    ev->window);
+		config_win(win);
+	}
 }
 
 void
@@ -582,15 +1261,17 @@ destroynotify(XEvent *e)
 	TAILQ_FOREACH (win, &ws[current_ws].winlist, entry) {
 		if (ev->window == win->id) {
 			/* find a window to focus */
-			ws[current_ws].focus =
-			    TAILQ_PREV(win, ws_win_list,entry);
+			ws[current_ws].focus = TAILQ_PREV(win,
+			    ws_win_list, entry);
 			if (ws[current_ws].focus == NULL)
 				ws[current_ws].focus =
 				    TAILQ_FIRST(&ws[current_ws].winlist);
+			if (win == ws[current_ws].focus)
+				ws[current_ws].focus = NULL;
 	
 			TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
+			set_win_state(win, WithdrawnState);
 			free(win);
-			ws[current_ws].winno--;
 			break;
 		}
 	}
@@ -631,7 +1312,6 @@ focusin(XEvent *e)
 
 	if (ev->window == root)
 		return;
-
 	/*
 	 * kill grab for now so that we can cut and paste , this screws up
 	 * click to focus
@@ -658,8 +1338,18 @@ mappingnotify(XEvent *e)
 void
 maprequest(XEvent *e)
 {
+	XMapRequestEvent	*ev = &e->xmaprequest;
+	XWindowAttributes	wa;
+
 	DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
 	    e->xmaprequest.window);
+
+	if(!XGetWindowAttributes(display, ev->window, &wa))
+		return;
+	if(wa.override_redirect)
+		return;
+	manage_window(e->xmaprequest.window);
+	stack();
 }
 
 void
@@ -675,6 +1365,16 @@ unmapnotify(XEvent *e)
 	DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window);
 }
 
+void
+visibilitynotify(XEvent *e)
+{
+	DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: %lu\n", e->xvisibility.window);
+
+	if (e->xvisibility.window == bar_window &&
+	    e->xvisibility.state == VisibilityUnobscured)
+		bar_print();
+}
+
 void			(*handler[LASTEvent])(XEvent *) = {
 				[Expose] = expose,
 				[KeyPress] = keypress,
@@ -688,6 +1388,7 @@ void			(*handler[LASTEvent])(XEvent *) = {
 				[MapRequest] = maprequest,
 				[PropertyNotify] = propertynotify,
 				[UnmapNotify] = unmapnotify,
+				[VisibilityNotify] = visibilitynotify,
 };
 
 int
@@ -700,8 +1401,7 @@ xerror_start(Display *d, XErrorEvent *ee)
 int
 xerror(Display *d, XErrorEvent *ee)
 {
-	fprintf(stderr, "error: %p %p\n", display, ee);
-
+	/* fprintf(stderr, "error: %p %p\n", display, ee); */
 	return (-1);
 }
 
@@ -723,12 +1423,38 @@ active_wm(void)
 	return (0);
 }
 
+long
+getstate(Window w)
+{
+	int			format, status;
+	long			result = -1;
+	unsigned char		*p = NULL;
+	unsigned long		n, extra;
+	Atom			real;
+
+	astate = XInternAtom(display, "WM_STATE", False);
+	status = XGetWindowProperty(display, w, astate, 0L, 2L, False, astate,
+	    &real, &format, &n, &extra, (unsigned char **)&p);
+	if(status != Success)
+		return (-1);
+	if(n != 0)
+		result = *p;
+	XFree(p);
+	return (result);
+}
+
 int
 main(int argc, char *argv[])
 {
+	struct passwd		*pwd;
+	char			conf[PATH_MAX], *cfile = NULL;
+	struct stat		sb;
 	XEvent			e;
-	int			i;
+	unsigned int		i, j, num;
+	Window			d1, d2, *wins = NULL;
+	XWindowAttributes	wa;
 
+	start_argv = argv;
 	fprintf(stderr, "Welcome to scrotwm V%s\n", SWM_VERSION);
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		warnx("no locale support");
@@ -741,51 +1467,82 @@ main(int argc, char *argv[])
 
 	screen = DefaultScreen(display);
 	root = RootWindow(display, screen);
-	width = DisplayWidth(display, screen) - 2;
-	height = DisplayHeight(display, screen) - 2;
+	astate = XInternAtom(display, "WM_STATE", False);
 
-	/* make work space 1 active */
-	ws[0].visible = 1;
-	ws[0].restack = 0;
-	ws[0].focus = NULL;
-	ws[0].winno = 0;
-	TAILQ_INIT(&ws[0].winlist);
-	for (i = 1; i < SWM_WS_MAX; i++) {
+	/* look for local and global conf file */
+	pwd = getpwuid(getuid());
+	if (pwd == NULL)
+		errx(1, "invalid user %d", getuid());
+
+	snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE);
+	if (stat(conf, &sb) != -1) {
+		if (S_ISREG(sb.st_mode))
+			cfile = conf;
+	} else {
+		/* try global conf file */
+		snprintf(conf, sizeof conf, "/etc/%s", SWM_CONF_FILE);
+		if (!stat(conf, &sb))
+			if (S_ISREG(sb.st_mode))
+				cfile = conf;
+	}
+	if (cfile)
+		conf_load(cfile);
+
+	/* init all workspaces */
+	for (i = 0; i < SWM_WS_MAX; i++) {
 		ws[i].visible = 0;
-		ws[i].restack = 0;
+		ws[i].restack = 1;
 		ws[i].focus = NULL;
-		ws[i].winno = 0;
+		ws[i].g.x = 0;
+		ws[i].g.y = 0;
+		ws[i].g.w = DisplayWidth(display, screen) - 2;
+		ws[i].g.h = DisplayHeight(display, screen) - 2;
 		TAILQ_INIT(&ws[i].winlist);
+
+		for (j = 0; layouts[j].l_stack != NULL; j++) {
+			if (layouts[j].l_init != NULL)
+				layouts[j].l_init(i);
+		}
+		ws[i].cur_layout = &layouts[0];
 	}
+	/* make work space 1 active */
+	ws[0].visible = 1;
+
+	/* grab existing windows */
+	if (XQueryTree(display, root, &d1, &d2, &wins, &num)) {
+		/* normal windows */
+		for (i = 0; i < num; i++) {
+                        XGetWindowAttributes(display, wins[i], &wa);
+			if (!XGetWindowAttributes(display, wins[i], &wa) ||
+			    wa.override_redirect || XGetTransientForHint(display, wins[i], &d1))
+				continue;
+			if (wa.map_state == IsViewable || getstate(wins[i]) == NormalState)
+				manage_window(wins[i]);
+		}
+		/* transient windows */
+		for (i = 0; i < num; i++) {
+			if(!XGetWindowAttributes(display, wins[i], &wa))
+				continue;
+			if (XGetTransientForHint(display, wins[i], &d1) &&
+			    (wa.map_state == IsViewable || getstate(wins[i]) ==
+			    NormalState))
+				manage_window(wins[i]);
+                }
+                if(wins)
+                        XFree(wins);
+        }
+	ws[0].focus = TAILQ_FIRST(&ws[0].winlist);
 
 	/* setup status bar */
-	bar_fs = XLoadQueryFont(display,
-	    "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*");
-	if (bar_fs == NULL) {
-		/* load a font that is default */
-		bar_fs = XLoadQueryFont(display,
-		    "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*");
-		if (bar_fs == NULL)
-			errx(1, "couldn't load font");
-	}
-	bar_height = bar_fs->ascent + bar_fs->descent + 3;
+	bar_setup();
 
 	XSelectInput(display, root, SubstructureRedirectMask |
 	    SubstructureNotifyMask | ButtonPressMask | KeyPressMask |
 	    EnterWindowMask | LeaveWindowMask | StructureNotifyMask |
-	    FocusChangeMask | PropertyChangeMask);
+	    FocusChangeMask | PropertyChangeMask | ExposureMask);
 
 	grabkeys();
-
-	bar_window = XCreateSimpleWindow(display, root, 0, 0, width,
-	    bar_height - 2, 1, 0x008080, 0x000000);
-	bar_gc = XCreateGC(display, bar_window, 0, &bar_gcv);
-	XSetFont(display, bar_gc, bar_fs->fid);
-	if (bar_enabled) {
-		height -= bar_height; /* correct screen height */
-		XMapWindow(display, bar_window);
-	}
-	bar_print();
+	stack();
 
 	while (running) {
 		XNextEvent(display, &e);