From 0384d1f892e8c0cf35669eb5e8516ebf9e245615 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Wed, 19 Jan 2022 11:56:41 +0100
Subject: [PATCH] dwm 6.3 upgrade.

---
 _suckless/dwm/config.def.h | 8 +++-----
 _suckless/dwm/config.h     | 1 +
 _suckless/dwm/config.mk    | 2 +-
 _suckless/dwm/dwm.c        | 9 +++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/_suckless/dwm/config.def.h b/_suckless/dwm/config.def.h
index c62848d..533b08e 100644
--- a/_suckless/dwm/config.def.h
+++ b/_suckless/dwm/config.def.h
@@ -51,11 +51,8 @@ static const Rule rules[] = {
 	/* class     instance  title           tags mask  isfloating  isterminal  noswallow  monitor */
 	{ "Gimp",    NULL,     NULL,           0,         1,          0,           0,        -1 },
 	{ "Firefox", NULL,     NULL,           1 << 8,    0,          0,          -1,        -1 },
-	{ "St",      NULL,     NULL,           0,         1,           0,        -1 },
-	{ NULL,      NULL,     "Event Tester", 0,         0,           1,        -1 }, /* xev */
-	{ NULL,		  "spterm",		NULL,		SPTAG(0),		1,			 -1 },
-	{ NULL,		  "spfm",		NULL,		SPTAG(1),		1,			 -1 },
-	{ NULL,		  "keepassxc",	NULL,		SPTAG(2),		0,			 -1 },
+	{ "St",      NULL,     NULL,           0,         0,          1,           0,        -1 },
+	{ NULL,      NULL,     "Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
 };
 
 /* layout(s) */
@@ -63,6 +60,7 @@ static const float mfact     = 0.55; /* factor of master area size [0.05..0.95]
 static const int nmaster     = 1;    /* number of clients in master area */
 static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
 static const int attachbelow = 1;    /* 1 means attach after the currently active window */
+static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
 
 static const Layout layouts[] = {
 	/* symbol     arrange function */
diff --git a/_suckless/dwm/config.h b/_suckless/dwm/config.h
index eb5ff1f..a8a74fe 100644
--- a/_suckless/dwm/config.h
+++ b/_suckless/dwm/config.h
@@ -63,6 +63,7 @@ static const float mfact     = 0.55; /* factor of master area size [0.05..0.95]
 static const int nmaster     = 1;    /* number of clients in master area */
 static const int resizehints = 0;    /* 1 means respect size hints in tiled resizals */
 static const int attachbelow = 1;    /* 1 means attach after the currently active window */
+static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
 
 static const Layout layouts[] = {
   /* symbol     arrange function */
diff --git a/_suckless/dwm/config.mk b/_suckless/dwm/config.mk
index ff9e508..b574d96 100644
--- a/_suckless/dwm/config.mk
+++ b/_suckless/dwm/config.mk
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 6.2
+VERSION = 6.3
 
 # Customize below to fit your system
 
diff --git a/_suckless/dwm/dwm.c b/_suckless/dwm/dwm.c
index acbc068..24033c1 100644
--- a/_suckless/dwm/dwm.c
+++ b/_suckless/dwm/dwm.c
@@ -582,6 +582,8 @@ buttonpress(XEvent *e)
 			arg.ui = 1 << i;
 		} else if (ev->x < x + blw)
 			click = ClkLtSymbol;
+//    } else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
+//			click = ClkStatusText;
 		else
 			click = ClkStatusText;
 	} else if ((c = wintoclient(ev->window))) {
@@ -1009,7 +1011,6 @@ void
 drawbar(Monitor *m)
 {
   int x, w, tw = 0, stw = 0;
-
   unsigned int i, occ = 0, urg = 0;
   Client *c;
 
@@ -1043,8 +1044,8 @@ drawbar(Monitor *m)
 	x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
 
 	if ((w = m->ww - tw - stw - x) > bh) {
-			drw_setscheme(drw, scheme[SchemeNorm]);
-			drw_rect(drw, x, 0, w, bh, 1, 1);
+    drw_setscheme(drw, scheme[SchemeNorm]);
+		drw_rect(drw, x, 0, w, bh, 1, 1);
 	}
 	drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
 }
@@ -1150,7 +1151,7 @@ focusstack(const Arg *arg)
 {
 	Client *c = NULL, *i;
 
-	if (!selmon->sel || selmon->sel->isfullscreen)
+	if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
 		return;
 	if (arg->i > 0) {
 		for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);