diff options
| author | moetunes <moetunes111@gmail.com> | 2011-11-24 12:46:24 +1000 |
|---|---|---|
| committer | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2011-11-24 05:30:13 +0200 |
| commit | d16e2e95e1b48f08e211937f731abd21eec69c14 (patch) | |
| tree | 789e9a842aa2a977e4118b444cbcc075c017c02c /src/config.h | |
| parent | 28602afb74047423df5d454c2a0cce12cb65c12c (diff) | |
Sync with upstream code
Unified master and stack resizing functions as per
c00kiemon5ter/dminiwm@56664339017b86c9dbc9794e6686cc25bf49e795
Conflicts:
src/config.h.def
src/dminiwm.c
Diffstat (limited to 'src/config.h')
| -rw-r--r-- | src/config.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/config.h b/src/config.h index 4f5db48..2462f6b 100644 --- a/src/config.h +++ b/src/config.h @@ -1,4 +1,4 @@ - /* config.h for dminiwm.c [ 0.1.6 ] + /* config.h for dminiwm.c [ 0.1.7 ] * * Started from catwm 31/12/10 * Bad window error checking and numlock checking used from @@ -76,13 +76,13 @@ const char *mtogglecmd[] = { "mpc", "toggle", NULL }; /** Shortcuts **/ static key keys[] = { /* modifier key function argument */ - { MOD1, XK_h, resize, {.i = -10}}, /* decrease */ - { MOD1, XK_l, resize, {.i = +10}}, /* increase */ + { MOD1, XK_h, resize_master, {.i = -10}}, /* decrease */ + { MOD1, XK_l, resize_master, {.i = +10}}, /* increase */ { MOD1|ShiftMask, XK_c, kill_client, {NULL} }, { MOD1, XK_j, next_win, {NULL} }, { MOD1, XK_k, prev_win, {NULL} }, - { MOD1, XK_o, resize_window, {.i = -10}}, /* shrink */ - { MOD1, XK_p, resize_window, {.i = +10}}, /* grow */ + { MOD1, XK_o, resize_stack, {.i = -10}}, /* shrink */ + { MOD1, XK_p, resize_stack, {.i = +10}}, /* grow */ { MOD1, XK_Return, swap_master, {NULL} }, { MOD1|ShiftMask, XK_j, move_down, {NULL} }, { MOD1|ShiftMask, XK_k, move_up, {NULL} }, |