keybinds for audio and bar tweak

2 files changed, 38 insertions, 27 deletions

diff --git a/config.h b/config.h
index 414d23c..2a520e9 100644
--- a/config.h
+++ b/config.h
@@ -43,16 +43,24 @@ static const AppRule rules[] = {              \
  * custom commands
  * must always end with ', NULL };'
  */
-static const char  *termcmd[]     = { "alacritty",     NULL };
-static const char  *menucmd[]     = { "run",           NULL };
-static const char  *now_playing[] = { "now_playing",   NULL };
-static const char  *albumbler[]   = { "albumbler.py",  NULL };
-static const char*  mpc_toggle[]  = { "mpc", "toggle", NULL };
-static const char*  lock[]        = { "lock",          NULL };
+static const char *termcmd[]     = { "alacritty",     NULL };
+static const char *menucmd[]     = { "run",           NULL };
+static const char *now_playing[] = { "now_playing",   NULL };
+static const char *albumbler[]   = { "albumbler.py",  NULL };
+static const char *mpc_toggle[]  = { "mpc", "toggle", NULL };
+static const char *mpc_next[]    = { "mpc", "next",   NULL };
+static const char *mpc_prev[]    = { "mpc", "prev",   NULL };
+static const char *mpc_stop[]    = { "mpc", "stop",   NULL };
+static const char *lock[]        = { "lock",          NULL };
 
 #define XF86AudioLowerVolume 0x1008ff11
-#define XF86AudioRaiseVolume 0x1008ff13
 #define XF86AudioMute        0x1008ff12
+#define XF86AudioRaiseVolume 0x1008ff13
+#define XF86AudioPlay        0x1008ff14
+#define XF86AudioStop        0x1008ff15
+#define XF86AudioPrev        0x1008ff16
+#define XF86AudioNext        0x1008ff17
+
 static const char *vol_dn[] = { "pactl", "set-sink-volume", "0", "-1%",    NULL };
 static const char *vol_up[] = { "pactl", "set-sink-volume", "0", "+1%",    NULL };
 static const char *vol_mt[] = { "pactl", "set-sink-mute",   "0", "toggle", NULL };
@@ -70,46 +78,49 @@ static Key keys[] = {
     // Commands
     { MOD4,               XK_t,          spawn,             {.com = termcmd} },
     { MOD4,               XK_d,          spawn,             {.com = menucmd} },
-    { 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_p,          spawn,             {.com = lock } },
+    { MOD4,               XK_h,          spawn,             {.com = lock } },
     { MOD4|SHIFT|CONTROL, XK_q,          quit,              {.i = 0} }, /* quit with exit value 0 */
 
     // Multimedia
     { 0,                  XF86AudioLowerVolume, spawn,      {.com = vol_dn } },
-    { 0,                  XF86AudioRaiseVolume, spawn,      {.com = vol_up } },
     { 0,                  XF86AudioMute,        spawn,      {.com = vol_mt } },
+    { 0,                  XF86AudioRaiseVolume, spawn,      {.com = vol_up } },
+    { 0,                  XF86AudioPlay,        spawn,      {.com = mpc_toggle } },
+    { 0,                  XF86AudioStop,        spawn,      {.com = mpc_stop } },
+    { 0,                  XF86AudioPrev,        spawn,      {.com = mpc_prev } },
+    { 0,                  XF86AudioNext,        spawn,      {.com = mpc_next } },
 
     // Windows
-    { 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,               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|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_n,          resize_master,     {.i = -10} }, /* decrease size in px */
+    { MOD4,               XK_i,          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 */
+    { MOD4|SHIFT,         XK_i,          resize_stack,      {.i = -10} }, /* decrease size in px */
 
     // Desktops
     { MOD4,               XK_Tab,        last_desktop,      {NULL} },
-    DESKTOPCHANGE(        XK_f,                             0)
+    DESKTOPCHANGE(        XK_l,                             0)
     DESKTOPCHANGE(        XK_u,                             1)
-    DESKTOPCHANGE(        XK_h,                             2)
-    DESKTOPCHANGE(        XK_comma,                         3)
-    DESKTOPCHANGE(        XK_v,                             4)
-    DESKTOPCHANGE(        XK_l,                             5)
-    DESKTOPCHANGE(        XK_o,                             6)
-    DESKTOPCHANGE(        XK_m,                             7)
+    DESKTOPCHANGE(        XK_y,                             2)
+    DESKTOPCHANGE(        XK_semicolon,                     3)
+    DESKTOPCHANGE(        XK_q,                             4)
+    DESKTOPCHANGE(        XK_w,                             5)
+    DESKTOPCHANGE(        XK_f,                             6)
+    DESKTOPCHANGE(        XK_p,                             7)
 
     // Layouts
-    { MOD4,               XK_s,          switch_mode,       {.i = TILE} },
+    { MOD4,               XK_a,          switch_mode,       {.i = RTILE} },
     { MOD4,               XK_r,          switch_mode,       {.i = MONOCLE} },
-    { MOD4,               XK_a,          switch_mode,       {.i = BSTACK} },
-    { MOD4|SHIFT,         XK_s,          switch_mode,       {.i = RTILE} },
+    { MOD4,               XK_s,          switch_mode,       {.i = BSTACK} },
+    { MOD4|SHIFT,         XK_a,          switch_mode,       {.i = TILE} },
     { MOD4|SHIFT,         XK_r,          switch_mode,       {.i = FLOAT} },
     { MOD4,               XK_b,          togglepanel,       {NULL} },
 };
diff --git a/monsterwm.c b/monsterwm.c
index fd064f2..2f2dbec 100644
--- a/monsterwm.c
+++ b/monsterwm.c
@@ -439,7 +439,7 @@ void write_status(void) {
 
     unsetenv("TZ");
     ptm = localtime(&now);
-    strftime(buff, sizeof(buff), "%Z %H:%M:%S %D", ptm);
+    strftime(buff, sizeof(buff), "%Z %H:%M:%S %Y-%m-%d", ptm);
     printf("%s", buff);
 
     fflush(stdout);