summary refs log tree commit diff
path: root/kbfunc.c
diff options
context:
space:
mode:
authorokan <okan>2014-01-22 21:48:27 +0000
committerokan <okan>2014-01-22 21:48:27 +0000
commit77aa5ac45b06b4afa392e21d55e3318913b0347b (patch)
tree958f412e4eb2d3682b95e9c62eb40085e43d3e41 /kbfunc.c
parentac3162439ad826026b499363b445e8c533313ff2 (diff)
downloadcwm-77aa5ac45b06b4afa392e21d55e3318913b0347b.tar.gz
cwm-77aa5ac45b06b4afa392e21d55e3318913b0347b.tar.xz
cwm-77aa5ac45b06b4afa392e21d55e3318913b0347b.zip
Somewhat streamline event loop/restart/quit handling; most notable
change allows a restart to trigger proper teardown first, even though
teardown is not (yet) complete.

After some discussion with oga@nicotinebsd.org regarding a more
complicated version/idea.
Diffstat (limited to 'kbfunc.c')
-rw-r--r--kbfunc.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/kbfunc.c b/kbfunc.c
index f93acc4..b28e83e 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -35,9 +35,6 @@
 
 #define HASH_MARKER	"|1|"
 
-extern char		**cwm_argv;
-extern sig_atomic_t	xev_quit;
-
 void
 kbfunc_client_lower(struct client_ctx *cc, union arg *arg)
 {
@@ -464,16 +461,9 @@ kbfunc_client_freeze(struct client_ctx *cc, union arg *arg)
 }
 
 void
-kbfunc_quit_wm(struct client_ctx *cc, union arg *arg)
-{
-	xev_quit = 1;
-}
-
-void
-kbfunc_restart(struct client_ctx *cc, union arg *arg)
+kbfunc_cwm_status(struct client_ctx *cc, union arg *arg)
 {
-	(void)setsid();
-	(void)execvp(cwm_argv[0], cwm_argv);
+	cwm_status = arg->i;
 }
 
 void