aboutsummaryrefslogtreecommitdiffstats
path: root/conf.c
diff options
context:
space:
mode:
authorokan2014-01-22 21:48:27 +0000
committerokan2014-01-22 21:48:27 +0000
commitd86dc240a824ab0c88be47a7c951517b8a07fdde (patch)
tree817269e43357f67bfcbaab33f728076e706d9484 /conf.c
parent129338185f898dfe060a3de1b5b7aba429161b81 (diff)
downloadcwm-d86dc240a824ab0c88be47a7c951517b8a07fdde.tar.gz
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf.c b/conf.c
index cc7f417..b38f2c4 100644
--- a/conf.c
+++ b/conf.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: conf.c,v 1.160 2014/01/21 15:42:44 okan Exp $
+ * $OpenBSD: conf.c,v 1.161 2014/01/22 21:48:27 okan Exp $
*/
#include <sys/param.h>
@@ -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} },