mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

If a client does not set increment values, use 'moveamount' as a way to

Browse Source 
scale keyboard based resizes; extend kbfunc_amount().

Behaviour noted by, tested by, and ok sthen@
This commit is contained in:
okan 2015-11-17 14:32:38 +00:00
parent e8d77b6890
commit 8aa2f317af
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kbfunc.c
View File

@ -38,7 +38,7 @@
extern sig_atomic_t cwm_status; extern sig_atomic_t cwm_status;
static void kbfunc_amount(int, unsigned int *, unsigned int *); static void kbfunc_amount(int, int, unsigned int *, unsigned int *);
void void
kbfunc_client_lower(struct client_ctx *cc, union arg *arg) kbfunc_client_lower(struct client_ctx *cc, union arg *arg)
@ -54,12 +54,10 @@ kbfunc_client_raise(struct client_ctx *cc, union arg *arg)
} }
static void static void
kbfunc_amount(int flags, unsigned int *mx, unsigned int *my) kbfunc_amount(int flags, int amt, unsigned int *mx, unsigned int *my)
{ {
#define CWM_FACTOR 10 #define CWM_FACTOR 10
int amt;
amt = Conf.mamount;
if (flags & CWM_BIGAMOUNT) if (flags & CWM_BIGAMOUNT)
amt *= CWM_FACTOR; amt *= CWM_FACTOR;
@ -86,7 +84,7 @@ kbfunc_ptrmove(struct client_ctx *cc, union arg *arg)
int x, y; int x, y;
unsigned int mx = 0, my = 0; unsigned int mx = 0, my = 0;
kbfunc_amount(arg->i, &mx, &my); kbfunc_amount(arg->i, Conf.mamount, &mx, &my);
xu_ptr_getpos(sc->rootwin, &x, &y); xu_ptr_getpos(sc->rootwin, &x, &y);
xu_ptr_setpos(sc->rootwin, x + mx, y + my); xu_ptr_setpos(sc->rootwin, x + mx, y + my);
@ -103,7 +101,7 @@ kbfunc_client_move(struct client_ctx *cc, union arg *arg)
if (cc->flags & CLIENT_FREEZE) if (cc->flags & CLIENT_FREEZE)
return; return;
kbfunc_amount(arg->i, &mx, &my); kbfunc_amount(arg->i, Conf.mamount, &mx, &my);
cc->geom.x += mx; cc->geom.x += mx;
if (cc->geom.x + cc->geom.w < 0) if (cc->geom.x + cc->geom.w < 0)
@ -137,11 +135,15 @@ void
kbfunc_client_resize(struct client_ctx *cc, union arg *arg) kbfunc_client_resize(struct client_ctx *cc, union arg *arg)
{ {
unsigned int mx = 0, my = 0; unsigned int mx = 0, my = 0;
int amt = 1;
if (cc->flags & CLIENT_FREEZE) if (cc->flags & CLIENT_FREEZE)
return; return;
kbfunc_amount(arg->i, &mx, &my); if (!(cc->hint.flags & PResizeInc))
amt = Conf.mamount;
kbfunc_amount(arg->i, amt, &mx, &my);
if ((cc->geom.w += mx * cc->hint.incw) < cc->hint.minw) if ((cc->geom.w += mx * cc->hint.incw) < cc->hint.minw)
cc->geom.w = cc->hint.minw; cc->geom.w = cc->hint.minw;