add RTILE for tiling with main on right, restore resize function

1 files changed, 21 insertions, 19 deletions

diff --git a/config.h b/config.h
index 360d338..414d23c 100644
--- a/config.h
+++ b/config.h
@@ -10,17 +10,17 @@
 #define SHIFT           ShiftMask   /* Shift key */
 
 /** generic settings **/
-#define MASTER_SIZE     0.6
+#define MASTER_SIZE     0.55
 #define SHOW_PANEL      True      /* show panel by default on exec */
 #define TOP_PANEL       False     /* False means panel is on bottom */
 #define PANEL_HEIGHT    18        /* 0 for no space for panel, thus no panel */
-#define DEFAULT_MODE    TILE      /* initial layout/mode: TILE MONOCLE BSTACK GRID FLOAT */
+#define DEFAULT_MODE    RTILE     /* initial layout/mode: TILE MONOCLE BSTACK RTILE FLOAT */
 #define ATTACH_ASIDE    True      /* False means new window is master */
 #define FOLLOW_WINDOW   False     /* follow the window when moved to a different desktop */
 #define FOLLOW_MOUSE    False     /* focus the window the mouse just entered */
 #define CLICK_TO_FOCUS  True      /* focus an unfocused window when clicked  */
 #define FOCUS_BUTTON    Button3   /* mouse button to be used along with CLICK_TO_FOCUS */
-#define BORDER_WIDTH    2         /* window border width */
+#define BORDER_WIDTH    1         /* window border width */
 #define FOCUS           "#ff950e" /* focused window border color    */
 #define UNFOCUS         "#444444" /* unfocused window border color  */
 #define MINWSZ          50        /* minimum window size in pixels  */
@@ -73,7 +73,7 @@ static Key keys[] = {
     { MOD4,               XK_space,      spawn,             {.com = mpc_toggle } },
     { MOD4|SHIFT,         XK_space,      spawn,             {.com = albumbler } },
     { MOD4|SHIFT|CONTROL, XK_space,      spawn,             {.com = now_playing } },
-    { MOD4,               XK_h,          spawn,             {.com = lock } },
+    { MOD4,               XK_p,          spawn,             {.com = lock } },
     { MOD4|SHIFT|CONTROL, XK_q,          quit,              {.i = 0} }, /* quit with exit value 0 */
 
     // Multimedia
@@ -82,32 +82,34 @@ static Key keys[] = {
     { 0,                  XF86AudioMute,        spawn,      {.com = vol_mt } },
 
     // Windows
-    { MOD4,               XK_n,          next_win,          {NULL} },
-    { MOD4,               XK_o,          prev_win,          {NULL} },
-    { MOD4|SHIFT,         XK_n,          move_down,         {NULL} },
-    { MOD4|SHIFT,         XK_o,          move_up,           {NULL} },
+    { MOD4,               XK_c,          next_win,          {NULL} },
+    { MOD4,               XK_i,          prev_win,          {NULL} },
+    { MOD4|SHIFT,         XK_c,          move_down,         {NULL} },
+    { MOD4|SHIFT,         XK_i,          move_up,           {NULL} },
     { MOD4|SHIFT,         XK_k,          killclient,        {NULL} },
     { MOD4,               XK_Return,     swap_master,       {NULL} },
     { MOD4,               XK_BackSpace,  focusurgent,       {NULL} },
     { MOD4,               XK_e,          resize_master,     {.i = +10} }, /* increase size in px */
-    { MOD4,               XK_i,          resize_master,     {.i = -10} }, /* decrease size in px */
+    { MOD4,               XK_n,          resize_master,     {.i = -10} }, /* decrease size in px */
+    { MOD4|SHIFT,         XK_e,          resize_stack,      {.i = +10} }, /* increase size in px */
+    { MOD4|SHIFT,         XK_n,          resize_stack,      {.i = -10} }, /* decrease size in px */
 
     // Desktops
     { MOD4,               XK_Tab,        last_desktop,      {NULL} },
-    DESKTOPCHANGE(        XK_l,                             0)
+    DESKTOPCHANGE(        XK_f,                             0)
     DESKTOPCHANGE(        XK_u,                             1)
-    DESKTOPCHANGE(        XK_y,                             2)
-    DESKTOPCHANGE(        XK_semicolon,                     3)
-    DESKTOPCHANGE(        XK_q,                             4)
-    DESKTOPCHANGE(        XK_w,                             5)
-    DESKTOPCHANGE(        XK_f,                             6)
-    DESKTOPCHANGE(        XK_p,                             7)
+    DESKTOPCHANGE(        XK_h,                             2)
+    DESKTOPCHANGE(        XK_comma,                         3)
+    DESKTOPCHANGE(        XK_v,                             4)
+    DESKTOPCHANGE(        XK_l,                             5)
+    DESKTOPCHANGE(        XK_o,                             6)
+    DESKTOPCHANGE(        XK_m,                             7)
 
     // Layouts
-    { MOD4,               XK_a,          switch_mode,       {.i = TILE} },
+    { MOD4,               XK_s,          switch_mode,       {.i = TILE} },
     { MOD4,               XK_r,          switch_mode,       {.i = MONOCLE} },
-    { MOD4,               XK_s,          switch_mode,       {.i = BSTACK} },
-    { MOD4|SHIFT,         XK_a,          switch_mode,       {.i = GRID} },
+    { MOD4,               XK_a,          switch_mode,       {.i = BSTACK} },
+    { MOD4|SHIFT,         XK_s,          switch_mode,       {.i = RTILE} },
     { MOD4|SHIFT,         XK_r,          switch_mode,       {.i = FLOAT} },
     { MOD4,               XK_b,          togglepanel,       {NULL} },
 };