Rename 2 kbfunc to match closer to what they do

This commit is contained in:
okan 2016-10-06 14:53:52 +00:00
parent a53fef7b1e
commit a1a192d258
3 changed files with 11 additions and 11 deletions

View File

@ -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.326 2016/10/06 14:41:19 okan Exp $
* $OpenBSD: calmwm.h,v 1.327 2016/10/06 14:53:52 okan Exp $
*/
#ifndef _CALMWM_H_
@ -459,10 +459,8 @@ void screen_assert_clients_within(struct screen_ctx *);
void kbfunc_client_cycle(struct client_ctx *, union arg *, int);
void kbfunc_client_delete(struct client_ctx *, union arg *, int);
void kbfunc_client_grouptoggle(struct client_ctx *,
union arg *, int);
void kbfunc_client_hide(struct client_ctx *, union arg *, int);
void kbfunc_client_label(struct client_ctx *, union arg *, int);
void kbfunc_menu_client_label(struct client_ctx *, union arg *, int);
void kbfunc_client_lower(struct client_ctx *, union arg *, int);
void kbfunc_client_move(struct client_ctx *, union arg *, int);
void kbfunc_client_movetogroup(struct client_ctx *,
@ -471,6 +469,8 @@ void kbfunc_client_raise(struct client_ctx *, union arg *, int);
void kbfunc_client_rcycle(struct client_ctx *, union arg *, int);
void kbfunc_client_resize(struct client_ctx *, union arg *, int);
void kbfunc_client_tile(struct client_ctx *, union arg *, int);
void kbfunc_client_toggle_group(struct client_ctx *,
union arg *, int);
void kbfunc_client_toggle_freeze(struct client_ctx *,
union arg *, int);
void kbfunc_client_toggle_fullscreen(struct client_ctx *,

View File

@ -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.215 2016/10/06 14:41:19 okan Exp $
* $OpenBSD: conf.c,v 1.216 2016/10/06 14:53:52 okan Exp $
*/
#include <sys/types.h>
@ -365,7 +365,7 @@ static const struct {
{.i = CWM_CLIENT_CYCLE} },
{ "rcycle", kbfunc_client_cycle, CWM_CONTEXT_SCREEN,
{.i = CWM_CLIENT_RCYCLE} },
{ "label", kbfunc_client_label, CWM_CONTEXT_CLIENT, {0} },
{ "label", kbfunc_menu_client_label, CWM_CONTEXT_CLIENT, {0} },
{ "delete", kbfunc_client_delete, CWM_CONTEXT_CLIENT, {0} },
{ "group1", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 1} },
{ "group2", kbfunc_group_toggle, CWM_CONTEXT_SCREEN, {.i = 2} },
@ -412,7 +412,7 @@ static const struct {
{.i = (CWM_CLIENT_CYCLE | CWM_CLIENT_CYCLE_INGRP)} },
{ "rcycleingroup", kbfunc_client_cycle, CWM_CONTEXT_CLIENT,
{.i = (CWM_CLIENT_RCYCLE | CWM_CLIENT_CYCLE_INGRP)} },
{ "grouptoggle", kbfunc_client_grouptoggle, CWM_CONTEXT_CLIENT, {0}},
{ "grouptoggle", kbfunc_client_toggle_group, CWM_CONTEXT_CLIENT, {0} },
{ "stick", kbfunc_client_toggle_sticky, CWM_CONTEXT_CLIENT, {0} },
{ "fullscreen", kbfunc_client_toggle_fullscreen, CWM_CONTEXT_CLIENT,
{0} },
@ -488,7 +488,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, {0} },
{ "window_grouptoggle", kbfunc_client_toggle_group, CWM_CONTEXT_CLIENT, {0} },
{ "menu_group", kbfunc_menu_group, CWM_CONTEXT_SCREEN, {0} },
{ "menu_unhide", kbfunc_menu_client, CWM_CONTEXT_SCREEN, {0} },
{ "menu_cmd", kbfunc_menu_cmd, CWM_CONTEXT_SCREEN, {0} },

View File

@ -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.130 2016/10/06 14:41:19 okan Exp $
* $OpenBSD: kbfunc.c,v 1.131 2016/10/06 14:53:53 okan Exp $
*/
#include <sys/types.h>
@ -456,7 +456,7 @@ out:
}
void
kbfunc_client_label(struct client_ctx *cc, union arg *arg, int xev)
kbfunc_menu_client_label(struct client_ctx *cc, union arg *arg, int xev)
{
struct menu *mi;
struct menu_q menuq;
@ -505,7 +505,7 @@ kbfunc_group_alltoggle(struct client_ctx *cc, union arg *arg, int xev)
}
void
kbfunc_client_grouptoggle(struct client_ctx *cc, union arg *arg, int xev)
kbfunc_client_toggle_group(struct client_ctx *cc, union arg *arg, int xev)
{
if (xev == CWM_KEY) {
/* For X apps that steal events. */