aboutsummaryrefslogtreecommitdiffstats
path: root/conf.c
diff options
context:
space:
mode:
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/conf.c b/conf.c
index 82ca358..5545684 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.200 2015/11/12 18:26:41 okan Exp $
+ * $OpenBSD: conf.c,v 1.201 2015/11/12 21:28:03 okan Exp $
*/
#include <sys/types.h>
@@ -361,24 +361,24 @@ static const struct {
{.i = CWM_CLIENT_RCYCLE} },
{ "label", kbfunc_client_label, CWM_CONTEXT_CLIENT, {0} },
{ "delete", kbfunc_client_delete, CWM_CONTEXT_CLIENT, {0} },
- { "group1", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 1} },
- { "group2", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 2} },
- { "group3", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 3} },
- { "group4", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 4} },
- { "group5", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 5} },
- { "group6", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 6} },
- { "group7", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 7} },
- { "group8", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 8} },
- { "group9", kbfunc_client_group, CWM_CONTEXT_SCREEN, {.i = 9} },
- { "grouponly1", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 1} },
- { "grouponly2", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 2} },
- { "grouponly3", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 3} },
- { "grouponly4", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 4} },
- { "grouponly5", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 5} },
- { "grouponly6", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 6} },
- { "grouponly7", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 7} },
- { "grouponly8", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 8} },
- { "grouponly9", kbfunc_client_grouponly, CWM_CONTEXT_SCREEN, {.i = 9} },
+ { "group1", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 1} },
+ { "group2", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 2} },
+ { "group3", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 3} },
+ { "group4", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 4} },
+ { "group5", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 5} },
+ { "group6", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 6} },
+ { "group7", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 7} },
+ { "group8", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 8} },
+ { "group9", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 9} },
+ { "grouponly1", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 1} },
+ { "grouponly2", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 2} },
+ { "grouponly3", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 3} },
+ { "grouponly4", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 4} },
+ { "grouponly5", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 5} },
+ { "grouponly6", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 6} },
+ { "grouponly7", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 7} },
+ { "grouponly8", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 8} },
+ { "grouponly9", kbfunc_group_only, CWM_CONTEXT_SCREEN, {.i = 9} },
{ "movetogroup1", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
{.i = 1} },
{ "movetogroup2", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
@@ -397,10 +397,10 @@ static const struct {
{.i = 8} },
{ "movetogroup9", kbfunc_client_movetogroup, CWM_CONTEXT_CLIENT,
{.i = 9} },
- { "nogroup", kbfunc_client_nogroup, CWM_CONTEXT_SCREEN, {0} },
- { "cyclegroup", kbfunc_client_cyclegroup, CWM_CONTEXT_SCREEN,
+ { "nogroup", kbfunc_group_alltoggle, CWM_CONTEXT_SCREEN, {0} },
+ { "cyclegroup", kbfunc_group_cycle, CWM_CONTEXT_SCREEN,
{.i = CWM_CLIENT_CYCLE} },
- { "rcyclegroup", kbfunc_client_cyclegroup, CWM_CONTEXT_SCREEN,
+ { "rcyclegroup", kbfunc_group_cycle, CWM_CONTEXT_SCREEN,
{.i = CWM_CLIENT_RCYCLE} },
{ "cycleingroup", kbfunc_client_cycle, CWM_CONTEXT_CLIENT,
{.i = (CWM_CLIENT_CYCLE | CWM_CLIENT_CYCLE_INGRP)} },
@@ -483,7 +483,7 @@ static const struct {
{ "window_hide", kbfunc_client_hide, CWM_CONTEXT_CLIENT, {0} },
{ "window_move", mousefunc_client_move, CWM_CONTEXT_CLIENT, {0} },
{ "window_resize", mousefunc_client_resize, CWM_CONTEXT_CLIENT, {0} },
- { "window_grouptoggle", kbfunc_client_grouptoggle, CWM_CONTEXT_CLIENT,
+ { "window_grouptoggle", kbfunc_group_toggle, CWM_CONTEXT_CLIENT,
{.i = CWM_MOUSE} },
{ "menu_group", mousefunc_menu_group, CWM_CONTEXT_SCREEN, {0} },
{ "menu_unhide", mousefunc_menu_client, CWM_CONTEXT_SCREEN, {0} },