Merge branch 'patch/named-scratchpads' into config

config.def.h

@@ -3,23 +3,17 @@
 /* appearance */
 static const unsigned int   borderpx                = 1; /* border pixel of windows */
 static const unsigned int   gappx                   = 6; /* gaps between windows */
-static const unsigned int snap = 32;    /* snap pixel */
+static const unsigned int   snap                    = 32;/* snap pixel */
-static const unsigned int systraypinning =
+static const unsigned int   systraypinning          = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
-    0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor
+static const unsigned int   systrayonleft           = 0; /* 0: systray in the right corner, >0: systray on left of status text */
-          X */
-static const unsigned int systrayonleft =
-    0; /* 0: systray in the right corner, >0: systray on left of status text */
 static const unsigned int   systrayspacing          = 3; /* systray spacing */
-static const int systraypinningfailfirst =
+static const int            systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
-    1; /* 1: if pinning fails, display systray on the first monitor, False:
-          display systray on the last monitor*/
 static const int            showsystray             = 1; /* 0 means no systray */
 static const int            showbar                 = 1; /* 0 means no bar */
 static const int            topbar                  = 1; /* 0 means bottom bar */
-static const char *fonts[] = {
+static const int            allowkill               = 1; /* allow killing clients by default? */
-    "FiraCode Nerd Font:size=10:antialias=true:hinting=true"};
+static const char           *fonts[]                = {"FiraCode Nerd Font:size=10:antialias=true:hinting=true"};
-static const char dmenufont[] =
+static const char           dmenufont[]             = "FiraCode Nerd Font:size=10:antialias=true:hinting=true";
-    "FiraCode Nerd Font:size=10:antialias=true:hinting=true";
 
 static const char           norm_fg[]               = "#D5C4A1";
 static const char           norm_bg[]               = "#262626";
@@ -46,27 +40,24 @@ static const Rule rules[] = {
      *	WM_CLASS(STRING) = instance, class
      *	WM_NAME(STRING) = title
      */
-    /* class                    instance    title       tags mask isfloating
+    /* class                    instance    title           tags mask   allowkill   isfloating  monitor */
-       monitor */
+    {"firefox",                 NULL,       NULL,           1 << 0,     0,          0,          -1          0},
-    {"firefox", NULL, NULL, 1 << 0, 0, -1},
+    {"thunderbird",             NULL,       NULL,           1 << 6,     1,          0,          -1          0},
-    {"thunderbird", NULL, NULL, 1 << 6, 0, -1},
+    {"org.mozilla.Thunderbird", NULL,       NULL,           1 << 6,     1,          0,          -1          0},
-    {"org.mozilla.Thunderbird", NULL, NULL, 1 << 6, 0, -1},
+    {"ManagerDesktop",          NULL,       NULL,           1 << 7,     1,          0,          -1          0},
-    {"ManagerDesktop", NULL, NULL, 1 << 7, 0, -1},
+    {"Manager",                 NULL,       NULL,           1 << 7,     1,          0,          -1          0},
-    {"Manager", NULL, NULL, 1 << 7, 0, -1},
+    {"InputLeap",               NULL,       NULL,           1 << 8,     1,          1,          -1          0},
-    {"InputLeap", NULL, NULL, 1 << 8, 1, -1},
+    {"Nextcloud",               NULL,       NULL,           1 << 8,     1,          0,          -1          0},
-    {"Nextcloud", NULL, NULL, 1 << 8, 0, -1},
+    {"feishin",                 NULL,       NULL,           1 << 2,     1,          0,          -1          0},
-    {"feishin", NULL, NULL, 1 << 2, 0, -1},
+	{ NULL,                     NULL,       "scratchpad",   0,          1,          0,          -1,         's'},
 };
 
 /* layout(s) */
 static const float  mfact           = 0.50; /* factor of master area size [0.05..0.95] */
 static const int    nmaster         = 1;    /* number of clients in master area */
-static const int resizehints =
+static const int    resizehints     = 0;    /* 1 means respect size hints in tiled resizals */
-    0; /* 1 means respect size hints in tiled resizals */
+static const int    lockfullscreen  = 1;    /* 1 will force focus on the fullscreen window */
-static const int lockfullscreen =
+static const int    refreshrate     = 120; /* refresh rate (per second) for client move/resize */
-    1; /* 1 will force focus on the fullscreen window */
-static const int refreshrate =
-    120; /* refresh rate (per second) for client move/resize */
 
 static const Layout layouts[] = {
     /* symbol       arrange function */
@@ -77,15 +68,12 @@ static const Layout layouts[] = {
 
 /* key definitions */
 #define MODKEY Mod1Mask
+
 #define TAGKEYS(KEY, TAG)                                                                       \
     &((Keychord){1, {{MODKEY,                           KEY}}, view,        {.ui = 1 << TAG}}), \
-      &((Keychord){                                                            \
+    &((Keychord){1, {{MODKEY | ControlMask,             KEY}}, toggleview,  {.ui = 1 << TAG}}), \
-          1, {{MODKEY | ControlMask, KEY}}, toggleview, {.ui = 1 << TAG}}),    \
     &((Keychord){1, {{MODKEY | ShiftMask,               KEY}}, tag,         {.ui = 1 << TAG}}), \
-      &((Keychord){1,                                                          \
+    &((Keychord){1, {{MODKEY | ControlMask | ShiftMask, KEY}}, toggletag,   {.ui = 1 << TAG}}),
-                   {{MODKEY | ControlMask | ShiftMask, KEY}},                  \
-                   toggletag,                                                  \
-                   {.ui = 1 << TAG}}),
 
 /* helper for spawning shell commands in the pre dwm-5.0 fashion */
 #define SHCMD(cmd)                                                             \
@@ -98,25 +86,25 @@ static const Layout layouts[] = {
 #define STATUSBAR "dwmblocks"
 
 /* commands */
-static char dmenumon[2] =
+static char dmenumon[2]         = "0"; /* component of dmenucmd, manipulated in spawn() */
-    "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[]   = {"dmenu_run", NULL};
 static const char *slockcmd[]   = {"slock", NULL};
 static const char *termcmd[]    = {TERMINAL, "-e", "tmux-worker", NULL};
+/*First arg only serves to match against key in rules*/
+static const char *scratchpadcmd[] = {"s", "st", "-t", "scratchpad", NULL};
 
 #include "movestack.c"
 #include "shift-tools.c"
 #include <X11/XF86keysym.h>
 
 static const Keychord *keychords[] = {
-    /* modifier                                             key chord function
+    // &((Keychord){1,        {{MODKEY, XK_}},                                     spawn,              {}}),
-       argument */
+    /*           key count  key chords                                          function            argument */
-    // &((Keychord){1, {{MODKEY,                                XK_}}, spawn, {}
+    &((Keychord){1,        {{MODKEY | ControlMask | ShiftMask, XK_apostrophe}}, quit,               {0}}),
-    // }),
-    &((Keychord){
-        1, {{MODKEY | ControlMask | ShiftMask, XK_apostrophe}}, quit, {0}}),
     &((Keychord){1,        {{MODKEY | ShiftMask, XK_apostrophe}},               quit,               {1}}),
 
+    &((Keychord){1,        {{MODKEY, XK_grave}},                                togglescratch,      {.v = scratchpadcmd }}),
+
     &((Keychord){1,        {{MODKEY, XK_apostrophe}},                           killclient,         {0}}),
 
     &((Keychord){1,        {{MODKEY, XK_a}},                                    spawn,              {.v = dmenucmd}}),
@@ -129,14 +117,8 @@ static const Keychord *keychords[] = {
     &((Keychord){1,        {{MODKEY | ShiftMask, XK_h}},                        shiftview,          {.i = -1}}),
     &((Keychord){1,        {{MODKEY | ControlMask, XK_l}},                      shiftboth,          {.i = +1}}),
     &((Keychord){1,        {{MODKEY | ControlMask, XK_h}},                      shiftboth,          {.i = -1}}),
-    &((Keychord){1,
+    &((Keychord){1,        {{MODKEY | ControlMask | ShiftMask, XK_l}},          shiftswaptags,      {.i = +1}}),
-                 {{MODKEY | ControlMask | ShiftMask, XK_l}},
+    &((Keychord){1,        {{MODKEY | ControlMask | ShiftMask, XK_h}},          shiftswaptags,      {.i = -1}}),
-                 shiftswaptags,
-                 {.i = +1}}),
-    &((Keychord){1,
-                 {{MODKEY | ControlMask | ShiftMask, XK_h}},
-                 shiftswaptags,
-                 {.i = -1}}),
 
     &((Keychord){1,        {{MODKEY, XK_j}},                                    focusstack,         {.i = +1}}),
     &((Keychord){1,        {{MODKEY, XK_k}},                                    focusstack,         {.i = -1}}),
@@ -149,12 +131,9 @@ static const Keychord *keychords[] = {
     &((Keychord){1,        {{MODKEY, XK_Return}},                               zoom,               {0}}),
     &((Keychord){1,        {{MODKEY, XK_Tab}},                                  view,               {0}}),
 
-    &((Keychord){
+    &((Keychord){2,        {{MODKEY, XK_w}, {MODKEY, XK_t}},                    setlayout,          {.v = &layouts[0]}}),
-        2, {{MODKEY, XK_w}, {MODKEY, XK_t}}, setlayout, {.v = &layouts[0]}}),
+    &((Keychord){2,        {{MODKEY, XK_w}, {MODKEY, XK_m}},                    setlayout,          {.v = &layouts[1]}}),
-    &((Keychord){
+    &((Keychord){2,        {{MODKEY, XK_w}, {MODKEY, XK_f}},                    setlayout,          {.v = &layouts[2]}}),
-        2, {{MODKEY, XK_w}, {MODKEY, XK_m}}, setlayout, {.v = &layouts[1]}}),
-    &((Keychord){
-        2, {{MODKEY, XK_w}, {MODKEY, XK_f}}, setlayout, {.v = &layouts[2]}}),
     &((Keychord){1,        {{MODKEY, XK_F11}},                                  fullscreen,         {0}}),
     &((Keychord){1,        {{MODKEY, XK_space}},                                setlayout,          {0}}),
     &((Keychord){1,        {{MODKEY | ShiftMask, XK_space}},                    togglefloating,     {0}}),
@@ -167,158 +146,60 @@ static const Keychord *keychords[] = {
     &((Keychord){1,        {{MODKEY | ShiftMask, XK_comma}},                    tagmon,             {.i = -1}}),
     &((Keychord){1,        {{MODKEY | ShiftMask, XK_period}},                   tagmon,             {.i = +1}}),
 
-    &((Keychord){1,
+    &((Keychord){1,        {{MODKEY | ShiftMask, XK_s}},                        spawn,              {.v = (const char *[]){"sysact", NULL}}}),
-                 {{MODKEY | ShiftMask, XK_s}},
-                 spawn,
-                 {.v = (const char *[]){"sysact", NULL}}}),
 
-    &((Keychord){1,
+    &((Keychord){1,        {{MODKEY | ShiftMask, XK_o}},                        spawn,              {.v = (const char *[]){"set-default-sink", NULL}}}),
-                 {{MODKEY | ShiftMask, XK_o}},
+    &((Keychord){1,        {{MODKEY | ShiftMask, XK_i}},                        spawn,              {.v = (const char *[]){"set-default-source", NULL}}}),
-                 spawn,
-                 {.v = (const char *[]){"set-default-sink", NULL}}}),
-    &((Keychord){1,
-                 {{MODKEY | ShiftMask, XK_i}},
-                 spawn,
-                 {.v = (const char *[]){"set-default-source", NULL}}}),
 
-    &((Keychord){2,
+    &((Keychord){2,        {{MODKEY, XK_m}, {MODKEY, XK_a}},                    spawn,              {.v = (const char *[]){"dmenumusic", NULL}}}),
-                 {{MODKEY, XK_m}, {MODKEY, XK_a}},
+    &((Keychord){2,        {{MODKEY, XK_m}, {MODKEY, XK_p}},                    spawn,              {.v = (const char *[]){"mpc", "toggle", NULL}}}),
-                 spawn,
+    &((Keychord){2,        {{MODKEY, XK_m}, {MODKEY, XK_l}},                    spawn,              {.v = (const char *[]){"mpc", "next", NULL}}}),
-                 {.v = (const char *[]){"dmenumusic", NULL}}}),
+    &((Keychord){2,        {{MODKEY, XK_m}, {MODKEY, XK_h}},                    spawn,              {.v = (const char *[]){"mpc", "prev", NULL}}}),
-    &((Keychord){2,
+    &((Keychord){1,        {{MODKEY, XF86XK_AudioPlay}},                        spawn,              {.v = (const char *[]){"mpc", "toggle", NULL}}}),
-                 {{MODKEY, XK_m}, {MODKEY, XK_p}},
+    &((Keychord){1,        {{MODKEY, XF86XK_AudioNext}},                        spawn,              {.v = (const char *[]){"mpc", "next", NULL}}}),
-                 spawn,
+    &((Keychord){1,        {{MODKEY, XF86XK_AudioPrev}},                        spawn,              {.v = (const char *[]){"mpc", "prev", NULL}}}),
-                 {.v = (const char *[]){"mpc", "toggle", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_m}, {MODKEY, XK_l}},
-                 spawn,
-                 {.v = (const char *[]){"mpc", "next", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_m}, {MODKEY, XK_h}},
-                 spawn,
-                 {.v = (const char *[]){"mpc", "prev", NULL}}}),
-    &((Keychord){1,
-                 {{MODKEY, XF86XK_AudioPlay}},
-                 spawn,
-                 {.v = (const char *[]){"mpc", "toggle", NULL}}}),
-    &((Keychord){1,
-                 {{MODKEY, XF86XK_AudioNext}},
-                 spawn,
-                 {.v = (const char *[]){"mpc", "next", NULL}}}),
-    &((Keychord){1,
-                 {{MODKEY, XF86XK_AudioPrev}},
-                 spawn,
-                 {.v = (const char *[]){"mpc", "prev", NULL}}}),
 
-    &((Keychord){2,
+    &((Keychord){2,        {{MODKEY, XK_o}, {MODKEY, XK_l}},                    spawn,              {.v = (const char *[]){TERMINAL, "-e", "lf", NULL}}}),
-                 {{MODKEY, XK_o}, {MODKEY, XK_l}},
+    &((Keychord){2,        {{MODKEY, XK_o}, {MODKEY, XK_f}},                    spawn,              {.v = (const char *[]){"firefox", NULL}}}),
-                 spawn,
+    &((Keychord){2,        {{MODKEY, XK_o}, {MODKEY, XK_n}},                    spawn,              {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}}),
-                 {.v = (const char *[]){TERMINAL, "-e", "lf", NULL}}}),
+    &((Keychord){2,        {{MODKEY, XK_o}, {MODKEY, XK_m}},                    spawn,              {.v = (const char *[]){TERMINAL, "-e", "gotop", NULL}}}),
-    &((Keychord){2,
+    &((Keychord){2,        {{MODKEY, XK_o}, {MODKEY, XK_t}},                    spawn,              {.v = (const char *[]){"thunar", NULL}}}),
-                 {{MODKEY, XK_o}, {MODKEY, XK_f}},
+    &((Keychord){2,        {{MODKEY, XK_o}, {MODKEY, XK_c}},                    spawn,              {.v = (const char *[]){"calcurse-select", NULL}}}),
-                 spawn,
-                 {.v = (const char *[]){"firefox", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_o}, {MODKEY, XK_n}},
-                 spawn,
-                 {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_o}, {MODKEY, XK_m}},
-                 spawn,
-                 {.v = (const char *[]){TERMINAL, "-e", "gotop", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_o}, {MODKEY, XK_t}},
-                 spawn,
-                 {.v = (const char *[]){"thunar", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_o}, {MODKEY, XK_c}},
-                 spawn,
-                 {.v = (const char *[]){"calcurse-select", NULL}}}),
 
-    &((Keychord){2,
+    &((Keychord){2,        {{MODKEY, XK_d}, {MODKEY, XK_h}},                    spawn,              {.v = (const char *[]){"dmenuhandler", NULL}}}),
-                 {{MODKEY, XK_d}, {MODKEY, XK_h}},
+    &((Keychord){2,        {{MODKEY, XK_d}, {MODKEY, XK_m}},                    spawn,              {.v = (const char *[]){"mounter", NULL}}}),
-                 spawn,
+    &((Keychord){2,        {{MODKEY, XK_d}, {MODKEY, XK_c}},                    spawn,              {.v = (const char *[]){"dmenumountcifs", NULL}}}),
-                 {.v = (const char *[]){"dmenuhandler", NULL}}}),
+    &((Keychord){2,        {{MODKEY, XK_d}, {MODKEY, XK_u}},                    spawn,              {.v = (const char *[]){"unmounter", NULL}}}),
-    &((Keychord){2,
+    &((Keychord){2,        {{MODKEY, XK_d}, {MODKEY, XK_s}},                    spawn,              {.v = (const char *[]){"dmenusearch", "duckduckgo", NULL}}}),
-                 {{MODKEY, XK_d}, {MODKEY, XK_m}},
+    &((Keychord){2,        {{MODKEY, XK_d}, {MODKEY, XK_l}},                    spawn,              {.v = (const char *[]){"linkhandler", NULL}}}),
-                 spawn,
-                 {.v = (const char *[]){"mounter", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_d}, {MODKEY, XK_c}},
-                 spawn,
-                 {.v = (const char *[]){"dmenumountcifs", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_d}, {MODKEY, XK_u}},
-                 spawn,
-                 {.v = (const char *[]){"unmounter", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_d}, {MODKEY, XK_s}},
-                 spawn,
-                 {.v = (const char *[]){"dmenusearch", "duckduckgo", NULL}}}),
-    &((Keychord){2,
-                 {{MODKEY, XK_d}, {MODKEY, XK_l}},
-                 spawn,
-                 {.v = (const char *[]){"linkhandler", NULL}}}),
 
-    &((Keychord){2,
+    &((Keychord){2,        {{MODKEY, XK_d}, {MODKEY, XK_b}},                    spawn,              SHCMD("dmenu-bluetooth -i -l 25")}),
-                 {{MODKEY, XK_d}, {MODKEY, XK_b}},
-                 spawn,
-                 SHCMD("dmenu-bluetooth -i -l 25")}),
 
-    &((Keychord){1,
+    &((Keychord){1,        {{MODKEY | ControlMask, XK_period}},                 spawn,              {.v = (const char *[]){"sd", NULL}}}),
-                 {{MODKEY | ControlMask, XK_period}},
-                 spawn,
-                 {.v = (const char *[]){"sd", NULL}}}),
 
-    &((Keychord){1,
+    &((Keychord){1,        {{MODKEY, XK_f}},                                    spawn,              {.v = (const char *[]){"screenlayout", NULL}}}),
-                 {{MODKEY, XK_f}},
-                 spawn,
-                 {.v = (const char *[]){"screenlayout", NULL}}}),
 
-    &((Keychord){1,
+    &((Keychord){1,        {{MODKEY, XK_F1}},                                   spawn,              {.v = (const char *[]){"kbswitcher", NULL}}}),
-                 {{MODKEY, XK_F1}},
-                 spawn,
-                 {.v = (const char *[]){"kbswitcher", NULL}}}),
 
-    &((Keychord){
+    &((Keychord){1,        {{0, XF86XK_AudioMute}},                             spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -37 $(pidof " "dwmblocks)")}),
-        1,
+    &((Keychord){1,        {{0, XF86XK_AudioRaiseVolume}},                      spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -37 $(pidof " "dwmblocks)")}),
-        {{0, XF86XK_AudioMute}},
+    &((Keychord){1,        {{0, XF86XK_AudioLowerVolume}},                      spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -37 $(pidof " "dwmblocks)")}),
-        spawn,
+    &((Keychord){1,        {{0, XF86XK_AudioMicMute}},                          spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -37 $(pidof " "dwmblocks)")}),
-        SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -37 $(pidof "
+    &((Keychord){1,        {{MODKEY, XK_v}},                                    spawn,              {.v = (const char *[]){"setvol", NULL}}}),
-              "dwmblocks)")}),
-    &((Keychord){
-        1,
-        {{0, XF86XK_AudioRaiseVolume}},
-        spawn,
-        SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -37 $(pidof "
-              "dwmblocks)")}),
-    &((Keychord){
-        1,
-        {{0, XF86XK_AudioLowerVolume}},
-        spawn,
-        SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -37 $(pidof "
-              "dwmblocks)")}),
-    &((Keychord){
-        1,
-        {{0, XF86XK_AudioMicMute}},
-        spawn,
-        SHCMD("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle; kill -37 $(pidof "
-              "dwmblocks)")}),
-    &((Keychord){
-        1, {{MODKEY, XK_v}}, spawn, {.v = (const char *[]){"setvol", NULL}}}),
 
-    &((Keychord){1,
+    &((Keychord){1,        {{0, XF86XK_MonBrightnessUp}},                       spawn,              {.v = (const char *[]){"mod_backlight", "up", NULL}}}),
-                 {{0, XF86XK_MonBrightnessUp}},
+    &((Keychord){1,        {{0, XF86XK_MonBrightnessDown}},                     spawn,              {.v = (const char *[]){"mod_backlight", "down", NULL}}}),
-                 spawn,
-                 {.v = (const char *[]){"mod_backlight", "up", NULL}}}),
-    &((Keychord){1,
-                 {{0, XF86XK_MonBrightnessDown}},
-                 spawn,
-                 {.v = (const char *[]){"mod_backlight", "down", NULL}}}),
 
-    TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) TAGKEYS(XK_4, 3)
+    TAGKEYS(XK_1, 0) 
-        TAGKEYS(XK_5, 4) TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7)
+    TAGKEYS(XK_2, 1) 
-            TAGKEYS(XK_9, 8)};
+    TAGKEYS(XK_3, 2) 
+    TAGKEYS(XK_4, 3) 
+    TAGKEYS(XK_5, 4) 
+    TAGKEYS(XK_6, 5) 
+    TAGKEYS(XK_7, 6) 
+    TAGKEYS(XK_8, 7) 
+    TAGKEYS(XK_9, 8)
+};
 
 /* button definitions */
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,

drw.c

@@ -1,18 +1,16 @@
 /* See LICENSE file for copyright and license details. */
+#include <X11/Xft/Xft.h>
+#include <X11/Xlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
 
 #include "drw.h"
 #include "util.h"
 
 #define UTF_INVALID 0xFFFD
 
-static int
+static int utf8decode(const char *s_in, long *u, int *err) {
-utf8decode(const char *s_in, long *u, int *err)
-{
   static const unsigned char lens[] = {
       /* 0XXXX */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
       /* 10XXX */ 0, 0, 0, 0, 0, 0, 0, 0, /* invalid */
@@ -21,8 +19,8 @@ utf8decode(const char *s_in, long *u, int *err)
       /* 11110 */ 4,
       /* 11111 */ 0, /* invalid */
   };
-	static const unsigned char leading_mask[] = { 0x7F, 0x1F, 0x0F, 0x07 };
+  static const unsigned char leading_mask[] = {0x7F, 0x1F, 0x0F, 0x07};
-	static const unsigned int overlong[] = { 0x0, 0x80, 0x0800, 0x10000 };
+  static const unsigned int overlong[] = {0x0, 0x80, 0x0800, 0x10000};
 
   const unsigned char *s = (const unsigned char *)s_in;
   int len = lens[*s >> 3];
@@ -46,9 +44,8 @@ utf8decode(const char *s_in, long *u, int *err)
   return len;
 }
 
-Drw *
+Drw *drw_create(Display *dpy, int screen, Window root, unsigned int w,
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
+                unsigned int h) {
-{
   Drw *drw = ecalloc(1, sizeof(Drw));
 
   drw->dpy = dpy;
@@ -63,9 +60,7 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
   return drw;
 }
 
-void
+void drw_resize(Drw *drw, unsigned int w, unsigned int h) {
-drw_resize(Drw *drw, unsigned int w, unsigned int h)
-{
   if (!drw)
     return;
 
@@ -73,12 +68,11 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
   drw->h = h;
   if (drw->drawable)
     XFreePixmap(drw->dpy, drw->drawable);
-	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
+  drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h,
+                                DefaultDepth(drw->dpy, drw->screen));
 }
 
-void
+void drw_free(Drw *drw) {
-drw_free(Drw *drw)
-{
   XFreePixmap(drw->dpy, drw->drawable);
   XFreeGC(drw->dpy, drw->gc);
   drw_fontset_free(drw->fonts);
@@ -88,9 +82,8 @@ drw_free(Drw *drw)
 /* This function is an implementation detail. Library users should use
  * drw_fontset_create instead.
  */
-static Fnt *
+static Fnt *xfont_create(Drw *drw, const char *fontname,
-xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
+                         FcPattern *fontpattern) {
-{
   Fnt *font;
   XftFont *xfont = NULL;
   FcPattern *pattern = NULL;
@@ -105,8 +98,9 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
       fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
       return NULL;
     }
-		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
+    if (!(pattern = FcNameParse((FcChar8 *)fontname))) {
-			fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
+      fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n",
+              fontname);
       XftFontClose(drw->dpy, xfont);
       return NULL;
     }
@@ -128,9 +122,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
   return font;
 }
 
-static void
+static void xfont_free(Fnt *font) {
-xfont_free(Fnt *font)
-{
   if (!font)
     return;
   if (font->pattern)
@@ -139,9 +131,7 @@ xfont_free(Fnt *font)
   free(font);
 }
 
-Fnt*
+Fnt *drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount) {
-drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
-{
   Fnt *cur, *ret = NULL;
   size_t i;
 
@@ -157,36 +147,30 @@ drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
   return (drw->fonts = ret);
 }
 
-void
+void drw_fontset_free(Fnt *font) {
-drw_fontset_free(Fnt *font)
-{
   if (font) {
     drw_fontset_free(font->next);
     xfont_free(font);
   }
 }
 
-void
+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname) {
-drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
-{
   if (!drw || !dest || !clrname)
     return;
 
   if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-	                       DefaultColormap(drw->dpy, drw->screen),
+                         DefaultColormap(drw->dpy, drw->screen), clrname, dest))
-	                       clrname, dest))
     die("error, cannot allocate color '%s'", clrname);
 }
 
 /* Create color schemes. */
-Clr *
+Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) {
-drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-{
   size_t i;
   Clr *ret;
 
   /* need at least two colors for a scheme */
-	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr))))
+  if (!drw || !clrnames || clrcount < 2 ||
+      !(ret = ecalloc(clrcount, sizeof(Clr))))
     return NULL;
 
   for (i = 0; i < clrcount; i++)
@@ -194,9 +178,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
   return ret;
 }
 
-void
+void drw_clr_free(Drw *drw, Clr *c) {
-drw_clr_free(Drw *drw, Clr *c)
-{
   if (!drw || !c)
     return;
 
@@ -205,9 +187,7 @@ drw_clr_free(Drw *drw, Clr *c)
                DefaultColormap(drw->dpy, drw->screen), c);
 }
 
-void
+void drw_scm_free(Drw *drw, Clr *scm, size_t clrcount) {
-drw_scm_free(Drw *drw, Clr *scm, size_t clrcount)
-{
   size_t i;
 
   if (!drw || !scm)
@@ -218,35 +198,30 @@ drw_scm_free(Drw *drw, Clr *scm, size_t clrcount)
   free(scm);
 }
 
-void
+void drw_setfontset(Drw *drw, Fnt *set) {
-drw_setfontset(Drw *drw, Fnt *set)
-{
   if (drw)
     drw->fonts = set;
 }
 
-void
+void drw_setscheme(Drw *drw, Clr *scm) {
-drw_setscheme(Drw *drw, Clr *scm)
-{
   if (drw)
     drw->scheme = scm;
 }
 
-void
+void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h,
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
+              int filled, int invert) {
-{
   if (!drw || !drw->scheme)
     return;
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
+  XSetForeground(drw->dpy, drw->gc,
+                 invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
   if (filled)
     XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
   else
     XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
 }
 
-int
+int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h,
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
+             unsigned int lpad, const char *text, int invert) {
-{
   int ty, ellipsis_x = 0;
   unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len, hash, h0, h1;
   XftDraw *d = NULL;
@@ -269,7 +244,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
   if (!render) {
     w = invert ? invert : ~invert;
   } else {
-		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
+    XSetForeground(drw->dpy, drw->gc,
+                   drw->scheme[invert ? ColFg : ColBg].pixel);
     XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
     if (w < lpad)
       return x + w;
@@ -292,7 +268,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
     while (*text) {
       utf8charlen = utf8decode(text, &utf8codepoint, &utf8err);
       for (curfont = drw->fonts; curfont; curfont = curfont->next) {
-				charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
+        charexists = charexists ||
+                     XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
         if (charexists) {
           drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
           if (ew + ellipsis_width <= w) {
@@ -332,7 +309,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
       if (render) {
         ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
         XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
-				                  usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
+                          usedfont->xfont, x, ty, (XftChar8 *)utf8str,
+                          utf8strlen);
       }
       x += ew;
       w -= ew;
@@ -386,14 +364,15 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
 
       if (match) {
         usedfont = xfont_create(drw, NULL, match);
-				if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
+        if (usedfont &&
+            XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
           for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
             ; /* NOP */
           curfont->next = usedfont;
         } else {
           xfont_free(usedfont);
           nomatches[nomatches[h0] ? h1 : h0] = utf8codepoint;
-no_match:
+        no_match:
           usedfont = drw->fonts;
         }
       }
@@ -405,9 +384,8 @@ no_match:
   return x + (render ? w : 0);
 }
 
-void
+void drw_map(Drw *drw, Window win, int x, int y, unsigned int w,
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
+             unsigned int h) {
-{
   if (!drw)
     return;
 
@@ -415,26 +393,22 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
   XSync(drw->dpy, False);
 }
 
-unsigned int
+unsigned int drw_fontset_getwidth(Drw *drw, const char *text) {
-drw_fontset_getwidth(Drw *drw, const char *text)
-{
   if (!drw || !drw->fonts || !text)
     return 0;
   return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
 }
 
-unsigned int
+unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text,
-drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
+                                        unsigned int n) {
-{
   unsigned int tmp = 0;
   if (drw && drw->fonts && text && n)
     tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
   return MIN(n, tmp);
 }
 
-void
+void drw_font_getexts(Fnt *font, const char *text, unsigned int len,
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
+                      unsigned int *w, unsigned int *h) {
-{
   XGlyphInfo ext;
 
   if (!font || !text)
@@ -447,9 +421,7 @@ drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w,
     *h = font->h;
 }
 
-Cur *
+Cur *drw_cur_create(Drw *drw, int shape) {
-drw_cur_create(Drw *drw, int shape)
-{
   Cur *cur;
 
   if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
@@ -460,13 +432,10 @@ drw_cur_create(Drw *drw, int shape)
   return cur;
 }
 
-void
+void drw_cur_free(Drw *drw, Cur *cursor) {
-drw_cur_free(Drw *drw, Cur *cursor)
-{
   if (!cursor)
     return;
 
   XFreeCursor(drw->dpy, cursor->cursor);
   free(cursor);
 }
-

dwm-allowkillrule-6.4.diff

@@ -0,0 +1,98 @@
+diff -up a/config.def.h b/config.def.h
+--- a/config.def.h	2022-10-04 19:38:18.000000000 +0200
++++ b/config.def.h	2023-05-06 22:19:27.298742237 +0200
+@@ -5,6 +5,7 @@ static const unsigned int borderpx  = 1;
+ static const unsigned int snap      = 32;       /* snap pixel */
+ static const int showbar            = 1;        /* 0 means no bar */
+ static const int topbar             = 1;        /* 0 means bottom bar */
++static const int allowkill          = 1;        /* allow killing clients by default? */
+ static const char *fonts[]          = { "monospace:size=10" };
+ static const char dmenufont[]       = "monospace:size=10";
+ static const char col_gray1[]       = "#222222";
+@@ -26,9 +27,9 @@ static const Rule rules[] = {
+ 	 *	WM_CLASS(STRING) = instance, class
+ 	 *	WM_NAME(STRING) = title
+ 	 */
+-	/* class      instance    title       tags mask     isfloating   monitor */
+-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
+-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
++	/* class      instance    title       tags mask     allowkill    isfloating   monitor */
++	{ "Gimp",     NULL,       NULL,       0,            1,           1,           -1 },
++	{ "Firefox",  NULL,       NULL,       1 << 8,       1,           0,           -1 },
+ };
+
+ /* layout(s) */
+@@ -78,6 +79,7 @@ static const Key keys[] = {
+ 	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+ 	{ MODKEY,                       XK_space,  setlayout,      {0} },
+ 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
++    { MODKEY,                       XK_q,      toggleallowkill,{0} },
+ 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+ 	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+ 	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
+diff -up a/dwm.c b/dwm.c
+--- a/dwm.c	2022-10-04 19:38:18.000000000 +0200
++++ b/dwm.c	2023-05-06 22:18:43.239357744 +0200
+@@ -93,6 +93,7 @@ struct Client {
+ 	int bw, oldbw;
+ 	unsigned int tags;
+ 	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
++    int allowkill;
+ 	Client *next;
+ 	Client *snext;
+ 	Monitor *mon;
+@@ -137,6 +138,7 @@ typedef struct {
+ 	const char *instance;
+ 	const char *title;
+ 	unsigned int tags;
++    int allowkill;
+ 	int isfloating;
+ 	int monitor;
+ } Rule;
+@@ -212,6 +214,7 @@ static void tagmon(const Arg *arg);
+ static void tile(Monitor *m);
+ static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
++static void toggleallowkill(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
+ static void unfocus(Client *c, int setfocus);
+@@ -288,6 +291,7 @@ applyrules(Client *c)
+ 	/* rule matching */
+ 	c->isfloating = 0;
+ 	c->tags = 0;
++    c->allowkill = allowkill;
+ 	XGetClassHint(dpy, c->win, &ch);
+ 	class    = ch.res_class ? ch.res_class : broken;
+ 	instance = ch.res_name  ? ch.res_name  : broken;
+@@ -300,6 +304,7 @@ applyrules(Client *c)
+ 		{
+ 			c->isfloating = r->isfloating;
+ 			c->tags |= r->tags;
++            c->allowkill = r->allowkill;
+ 			for (m = mons; m && m->num != r->monitor; m = m->next);
+ 			if (m)
+ 				c->mon = m;
+@@ -1006,7 +1011,7 @@ keypress(XEvent *e)
+ void
+ killclient(const Arg *arg)
+ {
+-	if (!selmon->sel)
++	if (!selmon->sel || !selmon->sel->allowkill)
+ 		return;
+ 	if (!sendevent(selmon->sel, wmatom[WMDelete])) {
+ 		XGrabServer(dpy);
+@@ -1704,6 +1709,13 @@ togglebar(const Arg *arg)
+ }
+
+ void
++toggleallowkill(const Arg *arg)
++{
++    if (!selmon->sel) return;
++    selmon->sel->allowkill = !selmon->sel->allowkill;
++}
++
++void
+ togglefloating(const Arg *arg)
+ {
+ 	if (!selmon->sel)

dwm-hide_vacant_tags-6.4.diff

@@ -0,0 +1,48 @@
+:100644 100644 f1d86b2 0000000 M	dwm.c
+
+diff --git a/dwm.c b/dwm.c
+index f1d86b2..d41cc14 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -433,9 +433,15 @@ buttonpress(XEvent *e)
+ 	}
+ 	if (ev->window == selmon->barwin) {
+ 		i = x = 0;
+-		do
++		unsigned int occ = 0;
++		for(c = m->clients; c; c=c->next)
++			occ |= c->tags == TAGMASK ? 0 : c->tags;
++		do {
++			/* Do not reserve space for vacant tags */
++			if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
++				continue;
+ 			x += TEXTW(tags[i]);
+-		while (ev->x >= x && ++i < LENGTH(tags));
++		} while (ev->x >= x && ++i < LENGTH(tags));
+ 		if (i < LENGTH(tags)) {
+ 			click = ClkTagBar;
+ 			arg.ui = 1 << i;
+@@ -715,19 +721,18 @@ drawbar(Monitor *m)
+ 	}
+ 
+ 	for (c = m->clients; c; c = c->next) {
+-		occ |= c->tags;
++		occ |= c->tags == TAGMASK ? 0 : c->tags;
+ 		if (c->isurgent)
+ 			urg |= c->tags;
+ 	}
+ 	x = 0;
+ 	for (i = 0; i < LENGTH(tags); i++) {
++		/* Do not draw vacant tags */
++		if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
++			continue;
+ 		w = TEXTW(tags[i]);
+ 		drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
+ 		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
+-		if (occ & 1 << i)
+-			drw_rect(drw, x + boxs, boxs, boxw, boxw,
+-				m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
+-				urg & 1 << i);
+ 		x += w;
+ 	}
+ 	w = TEXTW(m->ltsymbol);

dwm-namedscratchpads-6.5.diff

@@ -0,0 +1,148 @@
+diff --git a/config.def.h b/config.def.h
+index 9efa774..c3e236e 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -26,9 +26,10 @@ static const Rule rules[] = {
+ 	 *	WM_CLASS(STRING) = instance, class
+ 	 *	WM_NAME(STRING) = title
+ 	 */
+-	/* class      instance    title       tags mask     isfloating   monitor */
+-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
+-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
++	/* class      instance    title       tags mask     isfloating   monitor    scratch key */
++	{ "Gimp",     NULL,       NULL,       0,            1,           -1,        0  },
++	{ "firefox",  NULL,       NULL,       1 << 8,       0,           -1,        0  },
++	{ NULL,       NULL,   "scratchpad",   0,            1,           -1,       's' },
+ };
+ 
+ /* layout(s) */
+@@ -60,10 +61,14 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn()
+ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+ static const char *termcmd[]  = { "st", NULL };
+ 
++/*First arg only serves to match against key in rules*/
++static const char *scratchpadcmd[] = {"s", "st", "-t", "scratchpad", NULL};
++
+ static const Key keys[] = {
+ 	/* modifier                     key        function        argument */
+ 	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
+ 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
++	{ MODKEY,                       XK_grave,  togglescratch,  {.v = scratchpadcmd } },
+ 	{ MODKEY,                       XK_b,      togglebar,      {0} },
+ 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+ 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+diff --git a/dwm.c b/dwm.c
+index f1d86b2..be6a754 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -93,6 +93,7 @@ struct Client {
+ 	int bw, oldbw;
+ 	unsigned int tags;
+ 	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
++	char scratchkey;
+ 	Client *next;
+ 	Client *snext;
+ 	Monitor *mon;
+@@ -139,6 +140,7 @@ typedef struct {
+ 	unsigned int tags;
+ 	int isfloating;
+ 	int monitor;
++	const char scratchkey;
+ } Rule;
+ 
+ /* function declarations */
+@@ -206,11 +208,13 @@ static void setup(void);
+ static void seturgent(Client *c, int urg);
+ static void showhide(Client *c);
+ static void spawn(const Arg *arg);
++static void spawnscratch(const Arg *arg);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
+ static void tile(Monitor *m);
+ static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
++static void togglescratch(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
+ static void unfocus(Client *c, int setfocus);
+@@ -287,6 +291,7 @@ applyrules(Client *c)
+ 	/* rule matching */
+ 	c->isfloating = 0;
+ 	c->tags = 0;
++	c->scratchkey = 0;
+ 	XGetClassHint(dpy, c->win, &ch);
+ 	class    = ch.res_class ? ch.res_class : broken;
+ 	instance = ch.res_name  ? ch.res_name  : broken;
+@@ -299,6 +304,7 @@ applyrules(Client *c)
+ 		{
+ 			c->isfloating = r->isfloating;
+ 			c->tags |= r->tags;
++			c->scratchkey = r->scratchkey;
+ 			for (m = mons; m && m->num != r->monitor; m = m->next);
+ 			if (m)
+ 				c->mon = m;
+@@ -308,6 +314,7 @@ applyrules(Client *c)
+ 		XFree(ch.res_class);
+ 	if (ch.res_name)
+ 		XFree(ch.res_name);
++
+ 	c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
+ }
+ 
+@@ -1666,6 +1673,27 @@ spawn(const Arg *arg)
+ 	}
+ }
+ 
++void spawnscratch(const Arg *arg)
++{
++	struct sigaction sa;
++
++	if (fork() == 0) {
++		if (dpy)
++			close(ConnectionNumber(dpy));
++		setsid();
++
++		sigemptyset(&sa.sa_mask);
++		sa.sa_flags = 0;
++		sa.sa_handler = SIG_DFL;
++		sigaction(SIGCHLD, &sa, NULL);
++
++		execvp(((char **)arg->v)[1], ((char **)arg->v)+1);
++		fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[1]);
++		perror(" failed");
++		exit(EXIT_SUCCESS);
++	}
++}
++
+ void
+ tag(const Arg *arg)
+ {
+@@ -1735,6 +1763,28 @@ togglefloating(const Arg *arg)
+ 	arrange(selmon);
+ }
+ 
++void
++togglescratch(const Arg *arg)
++{
++	Client *c;
++	unsigned int found = 0;
++
++	for (c = selmon->clients; c && !(found = c->scratchkey == ((char**)arg->v)[0][0]); c = c->next);
++	if (found) {
++		c->tags = ISVISIBLE(c) ? 0 : selmon->tagset[selmon->seltags];
++		focus(NULL);
++		arrange(selmon);
++
++		if (ISVISIBLE(c)) {
++			focus(c);
++			restack(selmon);
++		}
++
++	} else{
++		spawnscratch(arg);
++	}
++}
++
+ void
+ toggletag(const Arg *arg)
+ {

dwm-steam-6.2.diff

@@ -0,0 +1,63 @@
+From 2550931c66e10e667ce56a6761cbadd12b331c52 Mon Sep 17 00:00:00 2001
+From: bakkeby <bakkeby@gmail.com>
+Date: Mon, 10 Aug 2020 16:45:00 +0200
+Subject: [PATCH] Steam patch
+
+Steam, and steam windows (games), trigger a ConfigureNotify request every time the window
+gets focus. More so, the configure event passed along from Steam tends to have the wrong
+x and y coordinates which can make the window, if floating, jump around the screen.
+
+This patch works around this age-old issue by ignoring the x and y co-ordinates for
+ConfigureNotify requests relating to Steam windows.
+---
+ dwm.c | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/dwm.c b/dwm.c
+index 4465af1..598d36d 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -93,6 +93,7 @@ struct Client {
+ 	int bw, oldbw;
+ 	unsigned int tags;
+ 	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
++	int issteam;
+ 	Client *next;
+ 	Client *snext;
+ 	Monitor *mon;
+@@ -291,6 +292,9 @@ applyrules(Client *c)
+ 	class    = ch.res_class ? ch.res_class : broken;
+ 	instance = ch.res_name  ? ch.res_name  : broken;
+
++	if (strstr(class, "Steam") || strstr(class, "steam_app_"))
++		c->issteam = 1;
++
+ 	for (i = 0; i < LENGTH(rules); i++) {
+ 		r = &rules[i];
+ 		if ((!r->title || strstr(c->name, r->title))
+@@ -588,13 +592,15 @@ configurerequest(XEvent *e)
+ 			c->bw = ev->border_width;
+ 		else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
+ 			m = c->mon;
+-			if (ev->value_mask & CWX) {
+-				c->oldx = c->x;
+-				c->x = m->mx + ev->x;
+-			}
+-			if (ev->value_mask & CWY) {
+-				c->oldy = c->y;
+-				c->y = m->my + ev->y;
++			if (!c->issteam) {
++				if (ev->value_mask & CWX) {
++					c->oldx = c->x;
++					c->x = m->mx + ev->x;
++				}
++				if (ev->value_mask & CWY) {
++					c->oldy = c->y;
++					c->y = m->my + ev->y;
++				}
+ 			}
+ 			if (ev->value_mask & CWWidth) {
+ 				c->oldw = c->w;
+--
+2.19.1
+

dwm.c

@@ -108,6 +108,9 @@ struct Client {
 	int bw, oldbw;
 	unsigned int tags;
 	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+    int allowkill;
+	int issteam;
+	char scratchkey;
 	Client *next;
 	Client *snext;
 	Monitor *mon;
@@ -159,8 +162,10 @@ typedef struct {
 	const char *instance;
 	const char *title;
 	unsigned int tags;
+    int allowkill;
 	int isfloating;
 	int monitor;
+	const char scratchkey;
 } Rule;
 
 typedef struct Systray   Systray;
@@ -246,11 +251,14 @@ static void sigterm(int unused);
 static void sigstatusbar(const Arg *arg);
 static void spawn(const Arg *arg);
 static Monitor *systraytomon(Monitor *m);
+static void spawnscratch(const Arg *arg);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
 static void tile(Monitor *m);
 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
+static void toggleallowkill(const Arg *arg);
+static void togglescratch(const Arg *arg);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unfocus(Client *c, int setfocus);
@@ -347,10 +355,15 @@ applyrules(Client *c)
 	/* rule matching */
 	c->isfloating = 0;
 	c->tags = 0;
+    c->allowkill = allowkill;
+	c->scratchkey = 0;
 	XGetClassHint(dpy, c->win, &ch);
 	class    = ch.res_class ? ch.res_class : broken;
 	instance = ch.res_name  ? ch.res_name  : broken;
 
+	if (strstr(class, "Steam") || strstr(class, "steam_app_"))
+		c->issteam = 1;
+
 	for (i = 0; i < LENGTH(rules); i++) {
 		r = &rules[i];
 		if ((!r->title || strstr(c->name, r->title))
@@ -359,6 +372,8 @@ applyrules(Client *c)
 		{
 			c->isfloating = r->isfloating;
 			c->tags |= r->tags;
+            c->allowkill = r->allowkill;
+			c->scratchkey = r->scratchkey;
 			for (m = mons; m && m->num != r->monitor; m = m->next);
 			if (m)
 				c->mon = m;
@@ -368,6 +383,7 @@ applyrules(Client *c)
 		XFree(ch.res_class);
 	if (ch.res_name)
 		XFree(ch.res_name);
+
 	c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
 }
 
@@ -513,9 +529,15 @@ buttonpress(XEvent *e)
 	}
 	if (ev->window == selmon->barwin) {
 		i = x = 0;
-		do
+		unsigned int occ = 0;
+		for(c = m->clients; c; c=c->next)
+			occ |= c->tags == TAGMASK ? 0 : c->tags;
+		do {
+			/* Do not reserve space for vacant tags */
+			if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+				continue;
 			x += TEXTW(tags[i]);
-		while (ev->x >= x && ++i < LENGTH(tags));
+		} while (ev->x >= x && ++i < LENGTH(tags));
 		if (i < LENGTH(tags)) {
 			click = ClkTagBar;
 			arg.ui = 1 << i;
@@ -745,6 +767,7 @@ configurerequest(XEvent *e)
 			c->bw = ev->border_width;
 		else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
 			m = c->mon;
+			if (!c->issteam) {
 				if (ev->value_mask & CWX) {
 					c->oldx = c->x;
 					c->x = m->mx + ev->x;
@@ -753,6 +776,7 @@ configurerequest(XEvent *e)
 					c->oldy = c->y;
 					c->y = m->my + ev->y;
 				}
+			}
 			if (ev->value_mask & CWWidth) {
 				c->oldw = c->w;
 				c->w = ev->width;
@@ -908,19 +932,18 @@ drawbar(Monitor *m)
 
 	resizebarwin(m);
 	for (c = m->clients; c; c = c->next) {
-		occ |= c->tags;
+		occ |= c->tags == TAGMASK ? 0 : c->tags;
 		if (c->isurgent)
 			urg |= c->tags;
 	}
 	x = 0;
 	for (i = 0; i < LENGTH(tags); i++) {
+		/* Do not draw vacant tags */
+		if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+			continue;
 		w = TEXTW(tags[i]);
 		drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
 		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
-		if (occ & 1 << i)
-			drw_rect(drw, x + boxs, boxs, boxw, boxw,
-				m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-				urg & 1 << i);
 		x += w;
 	}
 	w = TEXTW(m->ltsymbol);
@@ -1284,7 +1307,7 @@ keypress(XEvent *e)
 void
 killclient(const Arg *arg)
 {
-	if (!selmon->sel)
+	if (!selmon->sel || !selmon->sel->allowkill)
 		return;
 
 	if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
@@ -2085,6 +2108,27 @@ spawn(const Arg *arg)
 	}
 }
 
+void spawnscratch(const Arg *arg)
+{
+	struct sigaction sa;
+
+	if (fork() == 0) {
+		if (dpy)
+			close(ConnectionNumber(dpy));
+		setsid();
+
+		sigemptyset(&sa.sa_mask);
+		sa.sa_flags = 0;
+		sa.sa_handler = SIG_DFL;
+		sigaction(SIGCHLD, &sa, NULL);
+
+		execvp(((char **)arg->v)[1], ((char **)arg->v)+1);
+		fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[1]);
+		perror(" failed");
+		exit(EXIT_SUCCESS);
+	}
+}
+
 void
 tag(const Arg *arg)
 {
@@ -2151,6 +2195,13 @@ togglebar(const Arg *arg)
 	arrange(selmon);
 }
 
+void
+toggleallowkill(const Arg *arg)
+{
+    if (!selmon->sel) return;
+    selmon->sel->allowkill = !selmon->sel->allowkill;
+}
+
 void
 togglefloating(const Arg *arg)
 {
@@ -2165,6 +2216,28 @@ togglefloating(const Arg *arg)
 	arrange(selmon);
 }
 
+void
+togglescratch(const Arg *arg)
+{
+	Client *c;
+	unsigned int found = 0;
+
+	for (c = selmon->clients; c && !(found = c->scratchkey == ((char**)arg->v)[0][0]); c = c->next);
+	if (found) {
+		c->tags = ISVISIBLE(c) ? 0 : selmon->tagset[selmon->seltags];
+		focus(NULL);
+		arrange(selmon);
+
+		if (ISVISIBLE(c)) {
+			focus(c);
+			restack(selmon);
+		}
+
+	} else{
+		spawnscratch(arg);
+	}
+}
+
 void
 toggletag(const Arg *arg)
 {