summary refs log tree commit diff
path: root/conf.c
diff options
context:
space:
mode:
authorLeah Neukirchen <leah@vuxu.org>2017-07-27 15:06:38 +0200
committerLeah Neukirchen <leah@vuxu.org>2017-07-27 15:07:12 +0200
commit5a46349ec798912f2b5329cc1dbc04ec8595038a (patch)
tree7ca4224cace2f55cbb1df94f65bf0e1ac2a9c40d /conf.c
parent8908e5ec42aad92ff0c06598274b754c9b954b03 (diff)
parent8dee1182a2a65a0286c68310f6f5181560f6275a (diff)
downloadcwm-5a46349ec798912f2b5329cc1dbc04ec8595038a.tar.gz
cwm-5a46349ec798912f2b5329cc1dbc04ec8595038a.tar.xz
cwm-5a46349ec798912f2b5329cc1dbc04ec8595038a.zip
cvsimport
* refs/heads/master:
  Use the key names from keysymdef.h in the default key bindings list for clarification.
  remove extra parentheses
  Pull over the remaining re-implemented window move/resize functions and create a wrapper so that the key and mouse based move/resize callbacks can be unified. This has already been done with other window operations and menus.
  rename one function, matching others, to help upcoming change
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 a321a99..d750c42 100644
--- a/conf.c
+++ b/conf.c
@@ -60,7 +60,7 @@ static const struct {
 	enum context	 context;
 	int		 flag;
 } name_to_func[] = {
-	{ "window-menu-label", kbfunc_menu_client_label, CWM_CONTEXT_CC, 0 },
+	{ "window-menu-label", kbfunc_client_menu_label, CWM_CONTEXT_CC, 0 },
 	{ "window-lower", kbfunc_client_lower, CWM_CONTEXT_CC, 0 },
 	{ "window-raise", kbfunc_client_raise, CWM_CONTEXT_CC, 0 },
 	{ "window-hide", kbfunc_client_hide, CWM_CONTEXT_CC, 0 },
@@ -92,7 +92,7 @@ static const struct {
 	{ "window-movetogroup-8", kbfunc_client_movetogroup, CWM_CONTEXT_CC, 8 },
 	{ "window-movetogroup-9", kbfunc_client_movetogroup, CWM_CONTEXT_CC, 9 },
 
-	{ "window-move", mousefunc_client_move, CWM_CONTEXT_CC, 0 },
+	{ "window-move", kbfunc_client_move, CWM_CONTEXT_CC, 0 },
 	{ "window-move-up", kbfunc_client_move, CWM_CONTEXT_CC,
 	    (CWM_UP) },
 	{ "window-move-down", kbfunc_client_move, CWM_CONTEXT_CC,
@@ -109,7 +109,7 @@ static const struct {
 	    (CWM_RIGHT | CWM_BIGAMOUNT) },
 	{ "window-move-left-big", kbfunc_client_move, CWM_CONTEXT_CC,
 	    (CWM_LEFT | CWM_BIGAMOUNT) },
-	{ "window-resize", mousefunc_client_resize, CWM_CONTEXT_CC, 0 },
+	{ "window-resize", kbfunc_client_resize, CWM_CONTEXT_CC, 0 },
 	{ "window-resize-up", kbfunc_client_resize, CWM_CONTEXT_CC,
 	    (CWM_UP) },
 	{ "window-resize-down", kbfunc_client_resize, CWM_CONTEXT_CC,