summary refs log tree commit diff
path: root/calmwm.c
diff options
context:
space:
mode:
authorokan <okan>2017-12-29 20:09:19 +0000
committerokan <okan>2017-12-29 20:09:19 +0000
commit15ca9c03ba2260debfd1b8029c1435ea4a872d1b (patch)
tree3d3ce99ac26ca909a9c3756366a4fc7570e05a62 /calmwm.c
parent6e7dbf5bb71d56bb3443f57cb6b8707a291fe0d2 (diff)
parent5fa1a970345160a2cdd15460c6435446e8ab71a3 (diff)
downloadcwm-15ca9c03ba2260debfd1b8029c1435ea4a872d1b.tar.gz
cwm-15ca9c03ba2260debfd1b8029c1435ea4a872d1b.tar.xz
cwm-15ca9c03ba2260debfd1b8029c1435ea4a872d1b.zip
If the replacement window manager fails to start, restart the fallback (the
original invocation of cwm).
Diffstat (limited to 'calmwm.c')
-rw-r--r--calmwm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/calmwm.c b/calmwm.c
index d95c206..3601d6c 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -56,6 +56,7 @@ main(int argc, char **argv)
 {
 	const char	*conf_file = NULL;
 	char		*conf_path, *display_name = NULL;
+	char		*fallback;
 	int		 ch, xfd;
 	struct pollfd	 pfd[1];
 	struct passwd	*pw;
@@ -64,6 +65,7 @@ main(int argc, char **argv)
 		warnx("no locale support");
 	mbtowc(NULL, NULL, MB_CUR_MAX);
 
+	fallback = u_argv(argv);
 	Conf.wm_argv = u_argv(argv);
 	while ((ch = getopt(argc, argv, "c:d:")) != -1) {
 		switch (ch) {
@@ -132,6 +134,9 @@ main(int argc, char **argv)
 	if (cwm_status == CWM_EXEC_WM)
 		u_exec(Conf.wm_argv);
 
+	warnx("'%s' failed to start, restarting fallback", Conf.wm_argv);
+	u_exec(fallback);
+
 	return(0);
 }