summary refs log tree commit diff
path: root/conf.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 /conf.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 'conf.c')
-rw-r--r--conf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf.c b/conf.c
index 8f0258f..ffcc979 100644
--- a/conf.c
+++ b/conf.c
@@ -373,8 +373,8 @@ static const struct {
 	{ "vmaximize", kbfunc_client_vmaximize, CWM_WIN, {0} },
 	{ "hmaximize", kbfunc_client_hmaximize, CWM_WIN, {0} },
 	{ "freeze", kbfunc_client_freeze, CWM_WIN, {0} },
-	{ "restart", kbfunc_restart, 0, {0} },
-	{ "quit", kbfunc_quit_wm, 0, {0} },
+	{ "restart", kbfunc_cwm_status, 0, {.i = CWM_RESTART} },
+	{ "quit", kbfunc_cwm_status, 0, {.i = CWM_QUIT} },
 	{ "exec", kbfunc_exec, 0, {.i = CWM_EXEC_PROGRAM} },
 	{ "exec_wm", kbfunc_exec, 0, {.i = CWM_EXEC_WM} },
 	{ "ssh", kbfunc_ssh, 0, {0} },