update config

6 files changed, 24 insertions, 8 deletions

diff --git a/config.h b/config.h
index 88c8b81..7f10630 100644
--- a/config.h
+++ b/config.h
@@ -7,7 +7,7 @@
 /* appearance */
 static const unsigned int borderpx  = 2;        /* border pixel of windows */
 static const unsigned int snap      = 16;       /* snap pixel */
-static const unsigned int gappx     = 5;        /* gaps between windows */
+static const unsigned int gappx     = 4;        /* gaps between windows */
 static const int swallowfloating    = 1;        /* 1 means swallow floating windows by default */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
@@ -43,6 +43,7 @@ static const Rule rules[] = {
     { "steam",       "steamwebhelper", "Steam",        0,         0,          0,          0,         -1 },
     { "steam",       NULL,         "Steam Settings",   0,         1,          0,          0,         -1 },
     { "qemu-system-x86_64","qemu-system-x86_64",NULL,  0,         1,          0,          0,         -1 },
+    { "steam_proton","steam_proton","Unreal Tournament 2004",  0, 1,          0,          0,         -1 },
     { "Virt-manager",NULL,             NULL,           0,         0,          0,          0,         -1 },
     { "qBittorrent", NULL,             NULL,           0,         1,          0,          0,         -1 },
     { "qBittorrent", "qbittorrent",    NULL,           0,         0,          0,          0,         -1 },
@@ -94,15 +95,16 @@ static const Key keys[] = {
     { MODKEY,             XK_b,               togglebar,      {0} },
     { MODKEY,             XK_j,               focusstackvis,  {.i = +1 } },
     { MODKEY,             XK_k,               focusstackvis,  {.i = -1 } },
-    { MODKEY,             XK_i,               incnmaster,     {.i = +1 } },
-    { MODKEY,             XK_u,               incnmaster,     {.i = -1 } },
+    { MODKEY|ShiftMask,   XK_Left,            incnmaster,     {.i = +1 } },
+    { MODKEY|ShiftMask,   XK_Right,           incnmaster,     {.i = -1 } },
     { MODKEY|ControlMask, XK_h,               setmfact,       {.f = -0.05} },
     { MODKEY|ControlMask, XK_l,               setmfact,       {.f = +0.05} },
     { Mod1Mask,           XK_Tab,             zoom,           {0} },
     { MODKEY,             XK_Tab,             view,           {0} },
     { MODKEY,             XK_q,               killclient,     {0} },
     { MODKEY,             XK_t,               setlayout,      {.v = &layouts[0]} }, 
-    { MODKEY|ShiftMask,   XK_t,               setlayout,      {.v = &layouts[2]} },
+    { MODKEY|ShiftMask,   XK_f,               setlayout,      {.v = &layouts[1]} },
+    { MODKEY,             XK_m,               setlayout,      {.v = &layouts[2]} },
     { MODKEY|ShiftMask,   XK_Return,          setlayout,      {0} },
     { MODKEY,             XK_Return,          togglefloating, {0} },
     { MODKEY,             XK_grave,           view,           {.ui = ~0 } },
@@ -145,12 +147,12 @@ static const Key keys[] = {
     { 0,                            XF86XK_AudioMute,             spawn,          SHCMD("dwmvol toggle") },
     { 0,                            XF86XK_MonBrightnessUp,       spawn,          SHCMD("dwmlight up") },
     { 0,                            XF86XK_MonBrightnessDown,     spawn,          SHCMD("dwmlight down") },
-    { MODKEY,                       XK_F11,                       spawn,          SHCMD("dwmstats") },
-    { MODKEY,                       XK_F12,                       spawn,          SHCMD("dwmext") },
+    { MODKEY,                       XK_F2,                        spawn,          SHCMD("dwmstats") },
+    { MODKEY,                       XK_F1,                        spawn,          SHCMD("dwmext") },
     { MODKEY,                       XK_F8,                        spawn,          SHCMD("dwmnet") },
     { MODKEY,                       XK_s,                         spawn,          SHCMD("steam") },
     { Mod1Mask|ControlMask,         XK_Delete,                    spawn,          SHCMD("slock") },
-    { MODKEY,                       XK_w,                         spawn,          SHCMD(BROWSER) },
+    { MODKEY,                       XK_w,                         spawn,          SHCMD("browse "BROWSER) },
     { MODKEY,                       XK_c,                         spawn,          SHCMD("cliphist add") },
     { MODKEY,                       XK_v,                         spawn,          SHCMD("cliphist sel") },
     { MODKEY,                       XK_x,                         spawn,          SHCMD("xkill") },
@@ -161,7 +163,6 @@ static const Key keys[] = {
     { MODKEY|ShiftMask,             XK_r,                         quit,           {1} },
 
     /* Unused keys */
-    // { MODKEY,                       XK_f,         setlayout,      {.v = &layouts[1]} },
 };
 
 /* button definitions */
diff --git a/drw.o b/drw.o
index 6b6988b..61fab3d 100644
--- a/drw.o
+++ b/drw.o
diff --git a/dwm b/dwm
index 1a992e4..824bdac 100644
--- a/dwm
+++ b/dwm
diff --git a/dwm.c b/dwm.c
index 074022d..d426047 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1591,6 +1591,16 @@ resizeclient(Client *c, int x, int y, int w, int h)
 	c->oldw = c->w; c->w = wc.width = w;
 	c->oldh = c->h; c->h = wc.height = h;
 	wc.border_width = c->bw;
+    /* Hide border if only 1 client on screen */
+    if (((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
+        || &monocle == c->mon->lt[c->mon->sellt]->arrange)
+        && !c->isfullscreen && !c->isfloating
+        && NULL != c->mon->lt[c->mon->sellt]->arrange) {
+            c->w = wc.width += c->bw * 2;
+            c->h = wc.height += c->bw * 2;
+            wc.border_width = 0;
+    }
+
 	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
 	configure(c);
 	XSync(dpy, False);
@@ -2069,6 +2079,11 @@ tile(Monitor *m)
 	Client *c;
 
 	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+    if (n == 1)
+        m->gappx = 0;
+    else
+     m->gappx = gappx;
+
 	if (n == 0)
 		return;
 
diff --git a/dwm.o b/dwm.o
index 6f4dc07..33b7a3c 100644
--- a/dwm.o
+++ b/dwm.o
diff --git a/util.o b/util.o
index 73d04fa..c97c2fa 100644
--- a/util.o
+++ b/util.o