X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=658696b1a93cae32099d889c8dfb4cd6ba57311f;hb=1bee50dce7f24e8746d0ff0113a1061aa3068ffc;hp=e51220d9afa37eb028f3d0a77aa79e27959013f9;hpb=684fc5a3a6497b78a0b56129b4fcc547e3fb56fd;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index e51220d..658696b 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -423,9 +423,11 @@ struct workspace {
 				int horizontal_msize;
 				int horizontal_mwin;
 				int horizontal_stacks;
+				int horizontal_flip;
 				int vertical_msize;
 				int vertical_mwin;
 				int vertical_stacks;
+				int vertical_flip;
 	} l_state;
 };
 
@@ -467,6 +469,7 @@ union arg {
 #define SWM_ARG_ID_MASTERGROW	(21)
 #define SWM_ARG_ID_MASTERADD	(22)
 #define SWM_ARG_ID_MASTERDEL	(23)
+#define SWM_ARG_ID_FLIPLAYOUT	(24)
 #define SWM_ARG_ID_STACKRESET	(30)
 #define SWM_ARG_ID_STACKINIT	(31)
 #define SWM_ARG_ID_CYCLEWS_UP	(40)
@@ -563,20 +566,22 @@ struct ewmh_hint {
 void		 store_float_geom(struct ws_win *, struct swm_region *);
 int		 floating_toggle_win(struct ws_win *);
 void		 spawn_select(struct swm_region *, union arg *, char *, int *);
-unsigned char	*get_win_name(Display *, Window, Atom, Atom, unsigned long *);
+unsigned char	*get_win_name(Window);
 
 int
-get_property(Window id, Atom atom, long count, Atom type,
-    unsigned long *n, unsigned char **data)
+get_property(Window id, Atom atom, long count, Atom type, unsigned long *nitems,
+    unsigned long *nbytes, unsigned char **data)
 {
 	int			format, status;
-	unsigned long		tmp, extra;
-	unsigned long		*nitems;
+	unsigned long		*nbytes_ret, *nitems_ret;
+	unsigned long		nbytes_tmp, nitems_tmp;
 	Atom			real;
 
-	nitems = n != NULL ? n : &tmp;
+	nbytes_ret = nbytes != NULL ? nbytes : &nbytes_tmp;
+	nitems_ret = nitems != NULL ? nitems : &nitems_tmp;
+
 	status = XGetWindowProperty(display, id, atom, 0L, count, False, type,
-	    &real, &format, nitems, &extra, data);
+	    &real, &format, nitems_ret, nbytes_ret, data);
 
 	if (status != Success)
 		return False;
@@ -670,7 +675,7 @@ teardown_ewmh(void)
 	for (i = 0; i < ScreenCount(display); i++) {
 		/* Get the support check window and destroy it */
 		success = get_property(screens[i].root, sup_check, 1, XA_WINDOW,
-		    &n, &data);
+		    &n, NULL, &data);
 
 		if (success) {
 			id = data[0];
@@ -691,7 +696,7 @@ ewmh_autoquirk(struct ws_win *win)
 	Atom			type;
 
 	success = get_property(win->id, ewmh[_NET_WM_WINDOW_TYPE].atom, (~0L),
-	    XA_ATOM, &n, (void *)&data);
+	    XA_ATOM, &n, NULL, (void *)&data);
 
 	if (!success) {
 		XFree(data);
@@ -877,7 +882,7 @@ ewmh_get_win_state(struct ws_win *win)
 		win->ewmh_flags |= SWM_F_MANUAL;
 
 	success = get_property(win->id, ewmh[_NET_WM_STATE].atom,
-	    (~0L), XA_ATOM, &n, (void *)&states);
+	    (~0L), XA_ATOM, &n, NULL, (void *)&states);
 
 	if (!success)
 		return;
@@ -1026,34 +1031,34 @@ dumpwins(struct swm_region *r, union arg *args)
 	XWindowAttributes	wa;
 
 	if (r->ws == NULL) {
-		fprintf(stderr, "dumpwins: invalid workspace\n");
+		warnx("dumpwins: invalid workspace");
 		return;
 	}
 
-	fprintf(stderr, "=== managed window list ws %02d ===\n", r->ws->idx);
+	warnx("=== managed window list ws %02d ===", r->ws->idx);
 
 	TAILQ_FOREACH(win, &r->ws->winlist, entry) {
 		state = getstate(win->id);
 		if (!XGetWindowAttributes(display, win->id, &wa))
-			fprintf(stderr, "window: 0x%lx, failed "
-			    "XGetWindowAttributes\n", win->id);
-		fprintf(stderr, "window: 0x%lx, map_state: %d, state: %d, "
-		    "transient: 0x%lx\n",
-		    win->id, wa.map_state, state, win->transient);
+			warnx("window: 0x%lx, failed XGetWindowAttributes",
+			    win->id);
+		warnx("window: 0x%lx, map_state: %d, state: %d, "
+		    "transient: 0x%lx", win->id, wa.map_state, state,
+		    win->transient);
 	}
 
-	fprintf(stderr, "===== unmanaged window list =====\n");
+	warnx("===== unmanaged window list =====");
 	TAILQ_FOREACH(win, &r->ws->unmanagedlist, entry) {
 		state = getstate(win->id);
 		if (!XGetWindowAttributes(display, win->id, &wa))
-			fprintf(stderr, "window: 0x%lx, failed "
-			    "XGetWindowAttributes\n", win->id);
-		fprintf(stderr, "window: 0x%lx, map_state: %d, state: %d, "
-		    "transient: 0x%lx\n",
-		    win->id, wa.map_state, state, win->transient);
+			warnx("window: 0x%lx, failed XGetWindowAttributes",
+			    win->id);
+		warnx("window: 0x%lx, map_state: %d, state: %d, "
+		    "transient: 0x%lx", win->id, wa.map_state, state,
+		    win->transient);
 	}
 
-	fprintf(stderr, "=================================\n");
+	warnx("=================================");
 }
 #else
 void
@@ -1183,7 +1188,7 @@ name_to_color(char *colorname)
 	if (status)
 		result = screen_def.pixel;
 	else
-		fprintf(stderr, "color '%s' not found.\n", colorname);
+		warnx("color '%s' not found", colorname);
 
 	return (result);
 }
@@ -1213,10 +1218,12 @@ fancy_stacker(struct workspace *ws)
 {
 	strlcpy(ws->stacker, "[   ]", sizeof ws->stacker);
 	if (ws->cur_layout->l_stack == vertical_stack)
-		snprintf(ws->stacker, sizeof ws->stacker, "[%d|%d]",
+		snprintf(ws->stacker, sizeof ws->stacker,
+		    ws->l_state.vertical_flip ? "[%d>%d]" : "[%d|%d]",
 		    ws->l_state.vertical_mwin, ws->l_state.vertical_stacks);
 	if (ws->cur_layout->l_stack == horizontal_stack)
-		snprintf(ws->stacker, sizeof ws->stacker, "[%d-%d]",
+		snprintf(ws->stacker, sizeof ws->stacker,
+		    ws->l_state.horizontal_flip ? "[%dv%d]" : "[%d-%d]",
 		    ws->l_state.horizontal_mwin, ws->l_state.horizontal_stacks);
 }
 
@@ -1225,9 +1232,11 @@ plain_stacker(struct workspace *ws)
 {
 	strlcpy(ws->stacker, "[ ]", sizeof ws->stacker);
 	if (ws->cur_layout->l_stack == vertical_stack)
-		strlcpy(ws->stacker, "[|]", sizeof ws->stacker);
+		strlcpy(ws->stacker, ws->l_state.vertical_flip ? "[>]" : "[|]",
+		    sizeof ws->stacker);
 	if (ws->cur_layout->l_stack == horizontal_stack)
-		strlcpy(ws->stacker, "[-]", sizeof ws->stacker);
+		strlcpy(ws->stacker, ws->l_state.horizontal_flip ? "[v]" : "[-]",
+		    sizeof ws->stacker);
 }
 
 void
@@ -1250,9 +1259,8 @@ custom_region(char *val)
 	    y > DisplayHeight(display, sidx) ||
 	    w + x > DisplayWidth(display, sidx) ||
 	    h + y > DisplayHeight(display, sidx)) {
-		fprintf(stderr, "ignoring region %ux%u+%u+%u "
-		    "- not within screen boundaries "
-		    "(%ux%u)\n", w, h, x, y,
+		warnx("ignoring region %ux%u+%u+%u - not within screen "
+		    "boundaries (%ux%u)", w, h, x, y,
 		    DisplayWidth(display, sidx), DisplayHeight(display, sidx));
 		return;
 	}
@@ -1355,11 +1363,10 @@ void
 bar_window_name(char *s, ssize_t sz, struct ws_win *cur_focus)
 {
 	unsigned char		*title;
-	unsigned long		len;
 
 	if (window_name_enabled && cur_focus != NULL) {
-		if ((title = get_win_name(display, cur_focus->id, a_netwmname,
-		    a_utf8_string, &len)) != NULL) {
+		title = get_win_name(cur_focus->id);
+		if (title != NULL) {
 			DNPRINTF(SWM_D_BAR, "bar_window_name: title: %s\n",
 			    title);
 
@@ -1434,8 +1441,7 @@ bar_update(void)
 				strlcpy((char *)bar_ext, b, sizeof bar_ext);
 			}
 		if (b == NULL && errno != EAGAIN) {
-			fprintf(stderr, "bar_update: bar_extra failed: "
-			    "errno: %d %s\n", errno, strerror(errno));
+			warn("bar_update: bar_extra failed");
 			bar_extra_stop();
 		}
 	} else
@@ -1446,7 +1452,8 @@ bar_update(void)
 	else {
 		time(&tmt);
 		localtime_r(&tmt, &tm);
-		strftime(s, sizeof s, clock_format, &tm);
+		len = strftime(s, sizeof s, clock_format, &tm);
+		s[len] = '\0';
 		strlcat(s, "    ", sizeof s);
 	}
 
@@ -1652,7 +1659,7 @@ getstate(Window w)
 	unsigned char		*p = NULL;
 	unsigned long		n;
 
-	if (!get_property(w, astate, 2L, astate, &n, &p))
+	if (!get_property(w, astate, 2L, astate, &n, NULL, &p))
 		return (-1);
 	if (n != 0)
 		result = *((long *)p);
@@ -1872,8 +1879,7 @@ restart(struct swm_region *r, union arg *args)
 	unmap_all();
 	XCloseDisplay(display);
 	execvp(start_argv[0], start_argv);
-	fprintf(stderr, "execvp failed\n");
-	perror(" failed");
+	warn("execvp failed");
 	quit(NULL, NULL);
 }
 
@@ -1967,7 +1973,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 	setenv("LD_PRELOAD", SWM_LIB, 1);
 
 	if (asprintf(&ret, "%d", ws_idx) == -1) {
-		perror("_SWM_WS");
+		warn("spawn: asprintf SWM_WS");
 		_exit(1);
 	}
 	setenv("_SWM_WS", ret, 1);
@@ -1975,7 +1981,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 	ret = NULL;
 
 	if (asprintf(&ret, "%d", getpid()) == -1) {
-		perror("_SWM_PID");
+		warn("spawn: asprintf _SWM_PID");
 		_exit(1);
 	}
 	setenv("_SWM_PID", ret, 1);
@@ -1983,7 +1989,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 	ret = NULL;
 
 	if (setsid() == -1) {
-		perror("setsid");
+		warn("spawn: setsid");
 		_exit(1);
 	}
 
@@ -1994,7 +2000,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 		 * leave stderr open to record errors
 		*/
 		if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) == -1) {
-			perror("open");
+			warn("spawn: open");
 			_exit(1);
 		}
 		dup2(fd, STDIN_FILENO);
@@ -2005,7 +2011,7 @@ spawn(int ws_idx, union arg *args, int close_fd)
 
 	execvp(args->argv[0], args->argv);
 
-	perror("execvp");
+	warn("spawn: execvp");
 	_exit(1);
 }
 
@@ -2209,7 +2215,7 @@ focus_win(struct ws_win *win)
 		    PropModeReplace, (unsigned char *)&win->id,1);
 	}
 
-	if (window_name_enabled)
+	if (window_name_enabled || title_class_enabled || title_name_enabled)
 		bar_update();
 }
 
@@ -2388,7 +2394,7 @@ sort_windows(struct ws_win_list *wl)
 		if (win->transient) {
 			parent = find_window(win->transient);
 			if (parent == NULL) {
-				fprintf(stderr, "not possible bug\n");
+				warnx("not possible bug");
 				continue;
 			}
 			TAILQ_REMOVE(wl, win, entry);
@@ -3092,6 +3098,9 @@ vertical_config(struct workspace *ws, int id)
 		if (ws->l_state.vertical_stacks > 1)
 			ws->l_state.vertical_stacks--;
 		break;
+	case SWM_ARG_ID_FLIPLAYOUT:
+		ws->l_state.vertical_flip = !ws->l_state.vertical_flip;
+		break;
 	default:
 		return;
 	}
@@ -3102,7 +3111,7 @@ 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);
+	stack_master(ws, g, 0, ws->l_state.vertical_flip);
 }
 
 void
@@ -3139,6 +3148,9 @@ horizontal_config(struct workspace *ws, int id)
 		if (ws->l_state.horizontal_stacks > 1)
 			ws->l_state.horizontal_stacks--;
 		break;
+	case SWM_ARG_ID_FLIPLAYOUT:
+		ws->l_state.horizontal_flip = !ws->l_state.horizontal_flip;
+		break;
 	default:
 		return;
 	}
@@ -3149,7 +3161,7 @@ horizontal_stack(struct workspace *ws, struct swm_geometry *g)
 {
 	DNPRINTF(SWM_D_STACK, "horizontal_stack: workspace: %d\n", ws->idx);
 
-	stack_master(ws, g, 1, 0);
+	stack_master(ws, g, 1, ws->l_state.horizontal_flip);
 }
 
 /* fullscreen view */
@@ -3315,32 +3327,28 @@ iconify(struct swm_region *r, union arg *args)
 }
 
 unsigned char *
-get_win_name(Display *dpy, Window win, Atom wname, Atom stype,
-    unsigned long *slen)
+get_win_name(Window win)
 {
-	int			status, retfmt;
-	unsigned long		nitems, nbytes, nextra;
 	unsigned char		*prop = NULL;
-	Atom			rettype;
-
-	status = XGetWindowProperty(dpy, win, wname, 0L, 0L, False, stype,
-	    &rettype, &retfmt,  &nitems, &nbytes, &prop);
-	if (status != Success)
-		return (NULL);
-	XFree(prop);
+	unsigned long		nbytes, nitems;
 
-	status = XGetWindowProperty(dpy, win, wname, 0L, nbytes, False,
-	    stype, &rettype, &retfmt, &nitems, &nextra, &prop);
-	if (status != Success) {
+	/* try _NET_WM_NAME first */
+	if (get_property(win, a_netwmname, 0L, a_utf8_string, NULL, &nbytes,
+	    &prop)) {
 		XFree(prop);
-		return (NULL);
+		if (get_property(win, a_netwmname, nbytes, a_utf8_string,
+		    &nitems, NULL, &prop))
+			return (prop);
 	}
-	if (rettype != stype) {
-		XFree(prop);
+
+	/* fallback to WM_NAME */
+	if (!get_property(win, a_wmname, 0L, a_string, NULL, &nbytes, &prop))
 		return (NULL);
-	}
-	*slen = nitems;
-	return (prop);
+	XFree(prop);
+	if (get_property(win, a_wmname, nbytes, a_string, &nitems, NULL, &prop))
+		return (prop);
+
+	return (NULL);
 }
 
 void
@@ -3350,7 +3358,6 @@ uniconify(struct swm_region *r, union arg *args)
 	FILE			*lfile;
 	unsigned char		*name;
 	int			count = 0;
-	unsigned long		len;
 
 	DNPRINTF(SWM_D_MISC, "uniconify\n");
 
@@ -3382,8 +3389,7 @@ uniconify(struct swm_region *r, union arg *args)
 		if (win->iconic == 0)
 			continue;
 
-		name = get_win_name(display, win->id, a_netwmname,
-		    a_utf8_string, &len);
+		name = get_win_name(win->id);
 		if (name == NULL)
 			continue;
 		fprintf(lfile, "%s.%lu\n", name, win->id);
@@ -3491,8 +3497,7 @@ search_win(struct swm_region *r, union arg *args)
 
 		sw = calloc(1, sizeof(struct search_window));
 		if (sw == NULL) {
-			fprintf(stderr, "search_win: calloc: %s",
-			    strerror(errno));
+			warn("search_win: calloc");
 			fclose(lfile);
 			search_win_cleanup();
 			return;
@@ -3541,8 +3546,7 @@ search_resp_uniconify(char *resp, unsigned long len)
 	TAILQ_FOREACH(win, &search_r->ws->winlist, entry) {
 		if (win->iconic == 0)
 			continue;
-		name = get_win_name(display, win->id, a_netwmname,
-		    a_utf8_string, &len);
+		name = get_win_name(win->id);
 		if (name == NULL)
 			continue;
 		if (asprintf(&s, "%s.%lu", name, win->id) == -1) {
@@ -3665,13 +3669,13 @@ search_do_resp(void)
 	searchpid = 0;
 
 	if ((resp = calloc(1, MAX_RESP_LEN + 1)) == NULL) {
-		fprintf(stderr, "search: calloc\n");
+		warn("search: calloc");
 		goto done;
 	}
 
 	rbytes = read(select_resp_pipe[0], resp, MAX_RESP_LEN);
 	if (rbytes <= 0) {
-		fprintf(stderr, "search: read error: %s\n", strerror(errno));
+		warn("search: read error");
 		goto done;
 	}
 	resp[rbytes] = '\0';
@@ -4156,6 +4160,7 @@ move_step(struct swm_region *r, union arg *args)
 /* user/key callable function IDs */
 enum keyfuncid {
 	kf_cycle_layout,
+	kf_flip_layout,
 	kf_stack_reset,
 	kf_master_shrink,
 	kf_master_grow,
@@ -4247,6 +4252,7 @@ struct keyfunc {
 } keyfuncs[kf_invalid + 1] = {
 	/* name			function	argument */
 	{ "cycle_layout",	cycle_layout,	{0} },
+	{ "flip_layout",	stack_config,	{.id = SWM_ARG_ID_FLIPLAYOUT} },
 	{ "stack_reset",	stack_config,	{.id = SWM_ARG_ID_STACKRESET} },
 	{ "master_shrink",	stack_config,	{.id = SWM_ARG_ID_MASTERSHRINK} },
 	{ "master_grow",	stack_config,	{.id = SWM_ARG_ID_MASTERGROW} },
@@ -4366,13 +4372,13 @@ update_modkey(unsigned int mod)
 
 /* spawn */
 struct spawn_prog {
+	TAILQ_ENTRY(spawn_prog)	entry;
 	char			*name;
 	int			argc;
 	char			**argv;
 };
-
-int				spawns_size = 0, spawns_length = 0;
-struct spawn_prog		*spawns = NULL;
+TAILQ_HEAD(spawn_list, spawn_prog);
+struct spawn_list		spawns = TAILQ_HEAD_INITIALIZER(spawns);
 
 int
 spawn_expand(struct swm_region *r, union arg *args, char *spawn_name,
@@ -4385,13 +4391,12 @@ spawn_expand(struct swm_region *r, union arg *args, char *spawn_name,
 	DNPRINTF(SWM_D_SPAWN, "spawn_expand: %s\n", spawn_name);
 
 	/* find program */
-	for (i = 0; i < spawns_length; i++) {
-		if (!strcasecmp(spawn_name, spawns[i].name))
-			prog = &spawns[i];
+	TAILQ_FOREACH(prog, &spawns, entry) {
+		if (!strcasecmp(spawn_name, prog->name))
+			break;
 	}
 	if (prog == NULL) {
-		fprintf(stderr, "spawn_custom: program %s not found\n",
-		    spawn_name);
+		warnx("spawn_custom: program %s not found", spawn_name);
 		return (-1);
 	}
 
@@ -4512,123 +4517,102 @@ spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid)
 }
 
 void
-setspawn(struct spawn_prog *prog)
+spawn_insert(char *name, char *args)
 {
-	int			i, j;
+	char			*arg, *cp, *ptr;
+	struct spawn_prog	*sp;
 
-	if (prog == NULL || prog->name == NULL)
-		return;
+	DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s\n", name);
 
-	/* find existing */
-	for (i = 0; i < spawns_length; i++) {
-		if (!strcmp(spawns[i].name, prog->name)) {
-			/* found */
-			if (prog->argv == NULL) {
-				/* delete */
-				DNPRINTF(SWM_D_SPAWN,
-				    "setspawn: delete #%d: %s\n",
-				    i, spawns[i].name);
-				free(spawns[i].name);
-				for (j = 0; j < spawns[i].argc; j++)
-					free(spawns[i].argv[j]);
-				free(spawns[i].argv);
-				j = spawns_length - 1;
-				if (i < j)
-					spawns[i] = spawns[j];
-				spawns_length--;
-				free(prog->name);
-			} else {
-				/* replace */
-				DNPRINTF(SWM_D_SPAWN,
-				    "setspawn: replace #%d: %s\n",
-				    i, spawns[i].name);
-				free(spawns[i].name);
-				for (j = 0; j < spawns[i].argc; j++)
-					free(spawns[i].argv[j]);
-				free(spawns[i].argv);
-				spawns[i] = *prog;
-			}
-			/* found case handled */
-			free(prog);
-			return;
-		}
+	if ((sp = calloc(1, sizeof *sp)) == NULL)
+		err(1, "spawn_insert: malloc");
+	if ((sp->name = strdup(name)) == NULL)
+		err(1, "spawn_insert: strdup");
+
+	/* convert the arguments to an argument list */
+	if ((ptr = cp = strdup(args)) == NULL)
+		err(1, "spawn_insert: strdup");
+	while ((arg = strsep(&ptr, " \t")) != NULL) {
+		/* empty field; skip it */
+		if (*arg == '\0')
+			continue;
+
+		sp->argc++;
+		if ((sp->argv = realloc(sp->argv, sp->argc *
+		    sizeof *sp->argv)) == NULL)
+			err(1, "spawn_insert: realloc");
+		if ((sp->argv[sp->argc - 1] = strdup(arg)) == NULL)
+			err(1, "spawn_insert: strdup");
 	}
+	free(cp);
+
+	TAILQ_INSERT_TAIL(&spawns, sp, entry);
+	DNPRINTF(SWM_D_SPAWN, "spawn_insert: leave\n");
+}
+
+void
+spawn_remove(struct spawn_prog *sp)
+{
+	int			i;
+
+	DNPRINTF(SWM_D_SPAWN, "spawn_remove: %s\n", sp->name);
+
+	TAILQ_REMOVE(&spawns, sp, entry);
+	for (i = 0; i < sp->argc; i++)
+		free(sp->argv[i]);
+	free(sp->argv);
+	free(sp->name);
+	free(sp);
+
+	DNPRINTF(SWM_D_SPAWN, "spawn_remove: leave\n");
+}
+
+void
+spawn_replace(struct spawn_prog *sp, char *name, char *args)
+{
+	DNPRINTF(SWM_D_SPAWN, "spawn_replace: %s [%s]\n", sp->name, name);
+
+	spawn_remove(sp);
+	spawn_insert(name, args);
+
+	DNPRINTF(SWM_D_SPAWN, "spawn_replace: leave\n");
+}
+
+void
+setspawn(char *name, char *args)
+{
+	struct spawn_prog	*sp;
+
+	DNPRINTF(SWM_D_SPAWN, "setspawn: %s\n", name);
 
-	if (prog->argv == NULL) {
-		fprintf(stderr,
-		    "error: setspawn: cannot find program: %s", prog->name);
-		free(prog);
+	if (name == NULL)
 		return;
-	}
 
-	/* not found: add */
-	if (spawns_size == 0 || spawns == NULL) {
-		spawns_size = 4;
-		DNPRINTF(SWM_D_SPAWN, "setspawn: init list %d\n", spawns_size);
-		spawns = malloc((size_t)spawns_size *
-		    sizeof(struct spawn_prog));
-		if (spawns == NULL) {
-			fprintf(stderr, "setspawn: malloc failed\n");
-			perror(" failed");
-			quit(NULL, NULL);
-		}
-	} else if (spawns_length == spawns_size) {
-		spawns_size *= 2;
-		DNPRINTF(SWM_D_SPAWN, "setspawn: grow list %d\n", spawns_size);
-		spawns = realloc(spawns, (size_t)spawns_size *
-		    sizeof(struct spawn_prog));
-		if (spawns == NULL) {
-			fprintf(stderr, "setspawn: realloc failed\n");
-			perror(" failed");
-			quit(NULL, NULL);
+	TAILQ_FOREACH(sp, &spawns, entry) {
+		if (!strcmp(sp->name, name)) {
+			if (*args == '\0')
+				spawn_remove(sp);
+			else
+				spawn_replace(sp, name, args);
+			DNPRINTF(SWM_D_SPAWN, "setspawn: leave\n");
+			return;
 		}
 	}
-
-	if (spawns_length < spawns_size) {
-		DNPRINTF(SWM_D_SPAWN, "setspawn: add #%d %s\n",
-		    spawns_length, prog->name);
-		i = spawns_length++;
-		spawns[i] = *prog;
-	} else {
-		fprintf(stderr, "spawns array problem?\n");
-		if (spawns == NULL) {
-			fprintf(stderr, "spawns array is NULL!\n");
-			quit(NULL, NULL);
-		}
+	if (*args == '\0') {
+		warnx("error: setspawn: cannot find program: %s", name);
+		return;
 	}
-	free(prog);
+
+	spawn_insert(name, args);
+	DNPRINTF(SWM_D_SPAWN, "setspawn: leave\n");
 }
 
 int
 setconfspawn(char *selector, char *value, int flags)
 {
-	struct spawn_prog	*prog;
-	char			*vp, *cp, *word;
-
 	DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, value);
-	if ((prog = calloc(1, sizeof *prog)) == NULL)
-		err(1, "setconfspawn: calloc prog");
-	prog->name = strdup(selector);
-	if (prog->name == NULL)
-		err(1, "setconfspawn prog->name");
-	if ((cp = vp = strdup(value)) == NULL)
-		err(1, "setconfspawn: strdup(value) ");
-	while ((word = strsep(&cp, " \t")) != NULL) {
-		DNPRINTF(SWM_D_SPAWN, "setconfspawn: arg [%s]\n", word);
-		if (cp)
-			cp += (long)strspn(cp, " \t");
-		if (strlen(word) > 0) {
-			prog->argc++;
-			if ((prog->argv = realloc(prog->argv,
-			    prog->argc * sizeof(char *))) == NULL)
-				err(1, "setconfspawn: realloc");
-			if ((prog->argv[prog->argc - 1] = strdup(word)) == NULL)
-				err(1, "setconfspawn: strdup");
-		}
-	}
-	free(vp);
 
-	setspawn(prog);
+	setspawn(selector, value);
 
 	DNPRINTF(SWM_D_SPAWN, "setconfspawn: done\n");
 	return (0);
@@ -4806,7 +4790,7 @@ setconfbinding(char *selector, char *value, int flags)
 	enum keyfuncid		kfid;
 	unsigned int		mod;
 	KeySym			ks;
-	int			i;
+	struct spawn_prog	*sp;
 	DNPRINTF(SWM_D_KEY, "setconfbinding: enter\n");
 	if (selector == NULL) {
 		DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value);
@@ -4831,13 +4815,13 @@ setconfbinding(char *selector, char *value, int flags)
 		}
 	}
 	/* search by custom spawn name */
-	for (i = 0; i < spawns_length; i++) {
-		if (strcasecmp(selector, spawns[i].name) == 0) {
+	TAILQ_FOREACH(sp, &spawns, entry) {
+		if (strcasecmp(selector, sp->name) == 0) {
 			DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n",
 			    selector);
 			if (parsekeys(value, mod_key, &mod, &ks) == 0) {
 				setkeybinding(mod, ks, kf_spawn_custom,
-				    spawns[i].name);
+				    sp->name);
 				return (0);
 			} else
 				return (1);
@@ -4851,6 +4835,7 @@ void
 setup_keys(void)
 {
 	setkeybinding(MODKEY,		XK_space,	kf_cycle_layout,NULL);
+	setkeybinding(MODKEY|ShiftMask,	XK_backslash,	kf_flip_layout,	NULL);
 	setkeybinding(MODKEY|ShiftMask,	XK_space,	kf_stack_reset,	NULL);
 	setkeybinding(MODKEY,		XK_h,		kf_master_shrink,NULL);
 	setkeybinding(MODKEY,		XK_l,		kf_master_grow,	NULL);
@@ -5542,7 +5527,7 @@ conf_load(char *filename, int keymapping)
 	DNPRINTF(SWM_D_CONF, "conf_load: begin\n");
 
 	if (filename == NULL) {
-		fprintf(stderr, "conf_load: no filename\n");
+		warnx("conf_load: no filename");
 		return (1);
 	}
 	if ((config = fopen(filename, "r")) == NULL) {
@@ -5621,12 +5606,9 @@ conf_load(char *filename, int keymapping)
 		optval = strdup(cp);
 		/* call function to deal with it all */
 		if (configopt[optind].func(optsub, optval,
-		    configopt[optind].funcflags) != 0) {
-			fprintf(stderr, "%s line %zd: %s\n",
-			    filename, lineno, line);
+		    configopt[optind].funcflags) != 0)
 			errx(1, "%s: line %zd: invalid data for %s",
 			    filename, lineno, configopt[optind].optname);
-		}
 		free(optval);
 		free(optsub);
 		free(line);
@@ -5661,7 +5643,7 @@ set_child_transient(struct ws_win *win, Window *trans)
 		    " for 0x%lx trans 0x%lx\n", win->id, win->transient);
 
 		if (win->hints == NULL) {
-			fprintf(stderr, "no hints for 0x%lx\n", win->id);
+			warnx("no hints for 0x%lx", win->id);
 			return;
 		}
 
@@ -5673,8 +5655,7 @@ set_child_transient(struct ws_win *win, Window *trans)
 				XFree(wmh);
 
 			if ((wmh = XGetWMHints(display, w->id)) == NULL) {
-				fprintf(stderr, "can't get hints for 0x%lx\n",
-				    w->id);
+				warnx("can't get hints for 0x%lx", w->id);
 				continue;
 			}
 
@@ -5845,9 +5826,8 @@ manage_window(Window id)
 					if (ww->ws->r)
 						r = ww->ws->r;
 					else
-						fprintf(stderr,
-						    "manage_window: fix this "
-						    "bug mcbride\n");
+						warnx("manage_window: fix this "
+						    "bug mcbride");
 					border_me = 1;
 				}
 	}
@@ -6330,7 +6310,7 @@ focusevent(XEvent *e)
 			    SWM_S_COLOR_FOCUS : SWM_S_COLOR_UNFOCUS].color);
 		break;
 	default:
-		fprintf(stderr, "ignoring focusevent\n");
+		warnx("ignoring focusevent");
 		DNPRINTF(SWM_D_FOCUS, "ignoring focusevent\n");
 		break;
 	}
@@ -6418,11 +6398,11 @@ propertynotify(XEvent *e)
 	case XA_WM_NORMAL_HINTS:
 		long		mask;
 		XGetWMNormalHints(display, win->id, &win->sh, &mask);
-		fprintf(stderr, "normal hints: flag 0x%x\n", win->sh.flags);
+		warnx("normal hints: flag 0x%x", win->sh.flags);
 		if (win->sh.flags & PMinSize) {
 			WIDTH(win) = win->sh.min_width;
 			HEIGHT(win) = win->sh.min_height;
-			fprintf(stderr, "min %d %d\n", WIDTH(win), HEIGHT(win));
+			warnx("min %d %d", WIDTH(win), HEIGHT(win));
 		}
 		XMoveResizeWindow(display, win->id,
 		    X(win), Y(win), WIDTH(win), HEIGHT(win));
@@ -6559,7 +6539,7 @@ xerror_start(Display *d, XErrorEvent *ee)
 int
 xerror(Display *d, XErrorEvent *ee)
 {
-	/* fprintf(stderr, "error: %p %p\n", display, ee); */
+	/* warnx("error: %p %p", display, ee); */
 	return (-1);
 }
 
@@ -6918,8 +6898,7 @@ main(int argc, char *argv[])
 	struct sigaction	sact;
 
 	start_argv = argv;
-	fprintf(stderr, "Welcome to scrotwm V%s Build: %s\n",
-	    SCROTWM_VERSION, buildstr);
+	warnx("Welcome to scrotwm V%s Build: %s", SCROTWM_VERSION, buildstr);
 	if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "") ||
 	    !XSupportsLocale())
 		warnx("no locale support");