summary refs log tree commit diff
path: root/kbfunc.c
diff options
context:
space:
mode:
authorokan <okan>2008-07-11 15:18:29 +0000
committerokan <okan>2008-07-11 15:18:29 +0000
commit6ea4b1bd3b3f6106a61e4fbb98a267f86a32261f (patch)
treee459581324620e4da3537abd0dc610d6200beb42 /kbfunc.c
parent8be175b175f04c4c16ec4be63bab6b1d2b0ebbfd (diff)
downloadcwm-6ea4b1bd3b3f6106a61e4fbb98a267f86a32261f.tar.gz
cwm-6ea4b1bd3b3f6106a61e4fbb98a267f86a32261f.tar.xz
cwm-6ea4b1bd3b3f6106a61e4fbb98a267f86a32261f.zip
no more hidden (and mysterious) config reloads and allow binding a key
to a config reload; CMS-r by default.

ok oga@
Diffstat (limited to 'kbfunc.c')
-rw-r--r--kbfunc.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/kbfunc.c b/kbfunc.c
index e52d7e5..c836f6f 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -168,7 +168,6 @@ kbfunc_menu_search(struct client_ctx *scratch, void *arg)
 
 	TAILQ_INIT(&menuq);
 
-	conf_reload(&Conf);
 	TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
 		XCALLOC(mi, struct menu);
 		strlcpy(mi->text, cmd->label, sizeof(mi->text));
@@ -215,14 +214,12 @@ kbfunc_cmdexec(struct client_ctx *cc, void *arg)
 void
 kbfunc_term(struct client_ctx *cc, void *arg)
 {
-	conf_reload(&Conf);
 	u_spawn(Conf.termpath);
 }
 
 void
 kbfunc_lock(struct client_ctx *cc, void *arg)
 {
-	conf_reload(&Conf);
 	u_spawn(Conf.lockpath);
 }
 
@@ -393,7 +390,6 @@ kbfunc_ssh(struct client_ctx *scratch, void *arg)
 
 	if ((mi = menu_filter(&menuq, "ssh", NULL, 1,
 	    search_match_exec, NULL)) != NULL) {
-		conf_reload(&Conf);
 		l = snprintf(cmd, sizeof(cmd), "%s -e ssh %s", Conf.termpath,
 		    mi->text);
 		if (l != -1 && l < sizeof(cmd))
@@ -482,3 +478,9 @@ kbfunc_quit_wm(struct client_ctx *cc, void *arg)
 {
 	_xev_quit = 1;
 }
+
+void
+kbfunc_reload(struct client_ctx *cc, void *arg)
+{
+	conf_reload(&Conf);
+}