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.def | |
| 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.def')
| -rw-r--r-- | src/config.h.def | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/config.h.def b/src/config.h.def index 75c4f1f..99f485e 100644 --- a/src/config.h.def +++ b/src/config.h.def @@ -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 @@ -26,7 +26,7 @@ /* Mod (Mod1 == alt) (Mod4 == Super/windows) */ #define MOD1 Mod1Mask -#define MOD4 Mod4Mask +#define MOD4 Mod4Mask #define MASTER_SIZE 0.52 #define TOP_PANEL 1 /* 1=Don't 0=Have the panel at the top instead of the bottom */ #define PANEL_HEIGHT 18 /* 0 for no space for a panel */ @@ -77,14 +77,14 @@ const char* shutdowncmd[] = {"sudo","shutdown","-h","now",NULL}; // Shortcuts static key keys[] = { // MOD KEY FUNCTION ARGS - { MOD1, XK_h, resize, {.i = -10}}, /* decrease */ - { MOD1, XK_l, resize, {.i = +10}}, /* increase */ + { MOD1, XK_h, resize_master, {.i = 10}}, + { MOD1, XK_l, resize_master, {.i = -10}}, { MOD1, XK_c, kill_client, {NULL}}, { MOD1, XK_j, next_win, {NULL}}, { MOD1, XK_k, prev_win, {NULL}}, { MOD1, XK_v, spawn, {.com = dmenucmd}}, - { MOD1, XK_o, resize_window, {.i = -10}}, /* shrink */ - { MOD1, XK_p, resize_window, {.i = +10}}, /* grow */ + { MOD1, XK_p, resize_stack, {.i = 10}}, + { MOD1, XK_o, resize_stack, {.i = -10}}, { MOD1, XK_Return, spawn, {.com = urxvtcmd}}, { MOD1, XK_Up, spawn, {.com = volupcmd}}, { MOD1, XK_Down, spawn, {.com = voldowncmd}}, |