Sync with upstream code

Unified master and stack resizing functions as per
c00kiemon5ter/dminiwm@56664339017b86c9dbc9794e6686cc25bf49e795

Conflicts:

	src/config.h.def
	src/dminiwm.c

4 files changed, 20 insertions, 104 deletions

diff --git a/resize.diff b/resize.diff
deleted file mode 100644
index e1ef985..0000000
--- a/resize.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/src/config.h.def b/src/config.h.def
-index 19f656b..6cf99ef 100644
---- a/src/config.h.def
-+++ b/src/config.h.def
-@@ -77,14 +77,14 @@ const char* shutdowncmd[]   = {"sudo","shutdown","-h","now",NULL};
- // Shortcuts
- static key keys[] = {
-     // MOD               KEY             FUNCTION            ARGS
--    {  MOD1,             XK_h,          increase,          {NULL}},
--    {  MOD1,             XK_l,          decrease,          {NULL}},
-+    {  MOD1,             XK_h,          resize,            {.i = -10}}, /* decrease */
-+    {  MOD1,             XK_l,          resize,            {.i = +10}}, /* increase */
-     {  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_p,          grow_window,       {NULL}},
--    {  MOD1,             XK_o,          shrink_window,     {NULL}},
-+    {  MOD1,             XK_o,          resize_window,     {.i = -10}}, /* shrink */
-+    {  MOD1,             XK_p,          resize_window,     {.i = +10}}, /* grow   */
-     {  MOD1,             XK_Return,     spawn,             {.com = urxvtcmd}},
-     {  MOD1,             XK_Up,	        spawn,             {.com = volupcmd}},
-     {  MOD1,             XK_Down,       spawn,             {.com = voldowncmd}},
-diff --git a/src/dminiwm.c b/src/dminiwm.c
-index 2c4915e..1d7c6fc 100644
---- a/src/dminiwm.c
-+++ b/src/dminiwm.c
-@@ -101,14 +101,13 @@ static void change_desktop(const Arg arg);
- static void client_to_desktop(const Arg arg);
- static void configurenotify(XEvent *e);
- static void configurerequest(XEvent *e);
--static void decrease();
- static void destroynotify(XEvent *e);
- static void enternotify(XEvent *e);
- static void logger(const char* e);
- static unsigned long getcolor(const char* color);
- static void grabkeys();
--static void grow_window();
--static void increase();
-+static void resize_window(const Arg arg);
-+static void resize(const Arg arg);
- static void keypress(XEvent *e);
- static void kill_client();
- static void maprequest(XEvent *e);
-@@ -124,7 +123,6 @@ static void save_desktop(int i);
- static void select_desktop(int i);
- static void send_kill_signal(Window w);
- static void setup();
--static void shrink_window();
- static void sigchld(int unused);
- static void spawn(const Arg arg);
- static void start();
-@@ -350,13 +348,8 @@ void swap_master() {
-     }
- }
- 
--void decrease() {
--        master_size -= 10;
--        tile();
--}
--
--void increase() {
--        master_size += 10;
-+void resize(const Arg arg) {
-+        master_size += arg.i;
-         tile();
- }
- 
-@@ -625,13 +618,8 @@ void switch_grid() {
-     }
- }
- 
--void grow_window() {
--    growth += 10;
--    tile();
--}
--
--void shrink_window() {
--    growth -= 10;
-+void resize_window(const Arg arg) {
-+    growth += arg.i;
-     tile();
- }
- 
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} },
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}},
diff --git a/src/dminiwm.c b/src/dminiwm.c
index d26dfff..2912633 100644
--- a/src/dminiwm.c
+++ b/src/dminiwm.c
@@ -1,4 +1,4 @@
-/* dminiwm.c [ 0.1.6 ]
+/* dminiwm.c [ 0.1.7 ]
 *
 *  I started this from catwm 31/12/10
 *  Bad window error checking and numlock checking used from
@@ -106,8 +106,6 @@ static void enternotify(XEvent *e);
 static void logger(const char* e);
 static unsigned long getcolor(const char* color);
 static void grabkeys();
-static void resize_window(const Arg arg);
-static void resize(const Arg arg);
 static void keypress(XEvent *e);
 static void kill_client();
 static void maprequest(XEvent *e);
@@ -119,6 +117,8 @@ static void prev_desktop();
 static void prev_win();
 static void quit(const Arg arg);
 static void remove_window(Window w);
+static void resize_master(const Arg arg);
+static void resize_stack(const Arg arg);
 static void save_desktop(int i);
 static void select_desktop(int i);
 static void send_kill_signal(Window w);
@@ -348,11 +348,6 @@ void swap_master() {
     }
 }
 
-void resize(const Arg arg) {
-        master_size += arg.i;
-        tile();
-}
-
 /* **************************** Desktop Management ************************************* */
 void change_desktop(const Arg arg) {
     client *c;
@@ -618,7 +613,12 @@ void switch_grid() {
     }
 }
 
-void resize_window(const Arg arg) {
+void resize_master(const Arg arg) {
+        master_size += arg.i;
+        tile();
+}
+
+void resize_stack(const Arg arg) {
     growth += arg.i;
     tile();
 }