diff options
| author | okan <okan> | 2016-11-15 00:22:02 +0000 |
|---|---|---|
| committer | okan <okan> | 2016-11-15 00:22:02 +0000 |
| commit | db02592e5cfd5cf1395b4e40be8feb54f943a603 (patch) | |
| tree | 1f98096e69a67fbb364849de54aeb478c046e651 | |
| parent | 62dc5ae1320c833d1d6a8354543cada41a2bc4f3 (diff) | |
| download | cwm-db02592e5cfd5cf1395b4e40be8feb54f943a603.tar.gz cwm-db02592e5cfd5cf1395b4e40be8feb54f943a603.tar.xz cwm-db02592e5cfd5cf1395b4e40be8feb54f943a603.zip | |
revert previous; upcoming changes will hopefully deal with these more
naturally.
| -rw-r--r-- | calmwm.h | 2 | ||||
| -rw-r--r-- | conf.c | 4 | ||||
| -rw-r--r-- | kbfunc.c | 22 |
3 files changed, 2 insertions, 26 deletions
diff --git a/calmwm.h b/calmwm.h index d430b51..e7c679f 100644 --- a/calmwm.h +++ b/calmwm.h @@ -463,9 +463,7 @@ void screen_assert_clients_within(struct screen_ctx *); void kbfunc_cwm_status(void *, union arg *, enum xev); void kbfunc_ptrmove(void *, union arg *, enum xev); void kbfunc_client_move(void *, union arg *, enum xev); -void kbfunc_client_move_key(void *, union arg *, enum xev); void kbfunc_client_resize(void *, union arg *, enum xev); -void kbfunc_client_resize_key(void *, union arg *, enum xev); void kbfunc_client_delete(void *, union arg *, enum xev); void kbfunc_client_lower(void *, union arg *, enum xev); void kbfunc_client_raise(void *, union arg *, enum xev); diff --git a/conf.c b/conf.c index f12a7fd..827e88f 100644 --- a/conf.c +++ b/conf.c @@ -177,8 +177,8 @@ static const struct { { "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} }, - { "window_move", kbfunc_client_move, CWM_CONTEXT_CC, {0} }, - { "window_resize", kbfunc_client_resize, CWM_CONTEXT_CC, {0} }, + { "window_move", mousefunc_client_move, CWM_CONTEXT_CC, {0} }, + { "window_resize", mousefunc_client_resize, CWM_CONTEXT_CC, {0} }, { "window_grouptoggle", kbfunc_client_toggle_group, CWM_CONTEXT_CC, {0} }, { "menu_group", kbfunc_menu_group, CWM_CONTEXT_SC, {0} }, { "menu_unhide", kbfunc_menu_client, CWM_CONTEXT_SC, {0} }, diff --git a/kbfunc.c b/kbfunc.c index 40bd84e..8edea79 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -86,17 +86,6 @@ kbfunc_ptrmove(void *ctx, union arg *arg, enum xev xev) void kbfunc_client_move(void *ctx, union arg *arg, enum xev xev) { - int m = (xev == CWM_XEV_BTN); - - if (m) - mousefunc_client_move(ctx, arg, xev); - else - kbfunc_client_move_key(ctx, arg, xev); -} - -void -kbfunc_client_move_key(void *ctx, union arg *arg, enum xev xev) -{ struct client_ctx *cc = ctx; struct screen_ctx *sc = cc->sc; struct geom area; @@ -151,17 +140,6 @@ kbfunc_client_move_key(void *ctx, union arg *arg, enum xev xev) void kbfunc_client_resize(void *ctx, union arg *arg, enum xev xev) { - int m = (xev == CWM_XEV_BTN); - - if (m) - mousefunc_client_resize(ctx, arg, xev); - else - kbfunc_client_resize_key(ctx, arg, xev); -} - -void -kbfunc_client_resize_key(void *ctx, union arg *arg, enum xev xev) -{ struct client_ctx *cc = ctx; unsigned int mx = 0, my = 0; int amt = 1; |