diff options
Diffstat (limited to '')
| -rw-r--r-- | calmwm.h | 14 | ||||
| -rw-r--r-- | conf.c | 46 | ||||
| -rw-r--r-- | kbfunc.c | 10 |
3 files changed, 34 insertions, 36 deletions
@@ -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: calmwm.h,v 1.310 2015/11/12 18:26:41 okan Exp $ + * $OpenBSD: calmwm.h,v 1.311 2015/11/12 21:28:03 okan Exp $ */ #ifndef _CALMWM_H_ @@ -462,12 +462,7 @@ void screen_update_geometry(struct screen_ctx *); void screen_updatestackingorder(struct screen_ctx *); void kbfunc_client_cycle(struct client_ctx *, union arg *); -void kbfunc_client_cyclegroup(struct client_ctx *, - union arg *); void kbfunc_client_delete(struct client_ctx *, union arg *); -void kbfunc_client_group(struct client_ctx *, union arg *); -void kbfunc_client_grouponly(struct client_ctx *, - union arg *); void kbfunc_client_grouptoggle(struct client_ctx *, union arg *); void kbfunc_client_hide(struct client_ctx *, union arg *); @@ -476,8 +471,6 @@ void kbfunc_client_lower(struct client_ctx *, union arg *); void kbfunc_client_move(struct client_ctx *, union arg *); void kbfunc_client_movetogroup(struct client_ctx *, union arg *); -void kbfunc_client_nogroup(struct client_ctx *, - union arg *); void kbfunc_client_raise(struct client_ctx *, union arg *); void kbfunc_client_rcycle(struct client_ctx *, union arg *); void kbfunc_client_resize(struct client_ctx *, union arg *); @@ -498,6 +491,11 @@ void kbfunc_cwm_status(struct client_ctx *, union arg *); void kbfunc_exec(struct client_ctx *, union arg *); void kbfunc_exec_lock(struct client_ctx *, union arg *); void kbfunc_exec_term(struct client_ctx *, union arg *); +void kbfunc_group_alltoggle(struct client_ctx *, + union arg *); +void kbfunc_group_cycle(struct client_ctx *, union arg *); +void kbfunc_group_only(struct client_ctx *, union arg *); +void kbfunc_group_toggle(struct client_ctx *, union arg *); void kbfunc_menu_exec(struct client_ctx *, union arg *); void kbfunc_menu_client(struct client_ctx *, union arg *); void kbfunc_menu_cmd(struct client_ctx *, union arg *); @@ -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} }, @@ -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: kbfunc.c,v 1.124 2015/11/12 18:33:30 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.125 2015/11/12 21:28:03 okan Exp $ */ #include <sys/types.h> @@ -450,25 +450,25 @@ kbfunc_client_delete(struct client_ctx *cc, union arg *arg) } void -kbfunc_client_group(struct client_ctx *cc, union arg *arg) +kbfunc_group_toggle(struct client_ctx *cc, union arg *arg) { group_hidetoggle(cc->sc, arg->i); } void -kbfunc_client_grouponly(struct client_ctx *cc, union arg *arg) +kbfunc_group_only(struct client_ctx *cc, union arg *arg) { group_only(cc->sc, arg->i); } void -kbfunc_client_cyclegroup(struct client_ctx *cc, union arg *arg) +kbfunc_group_cycle(struct client_ctx *cc, union arg *arg) { group_cycle(cc->sc, arg->i); } void -kbfunc_client_nogroup(struct client_ctx *cc, union arg *arg) +kbfunc_group_alltoggle(struct client_ctx *cc, union arg *arg) { group_alltoggle(cc->sc); } |