Upgrading to 67d76b and removing alwaysfullscreen patch as it has been merged into mainstream dwm 6.2

README.md

@@ -1,4 +1,4 @@
-This dwm 6.2 (bb2e72, 2020-07-08) side project has a different take on dwm patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more. Due to the complexity of some of the patches dwm-flexipatch has diverged from mainstream dwm by making some core patches non-optional for maintenance reasons. For the classic dwm-flexipatch build refer to branch [dwm-flexipatch-1.0](https://github.com/bakkeby/dwm-flexipatch/tree/dwm-flexipatch-1.0).
+This dwm 6.2 (67d76b, 2021-03-29) side project has a different take on dwm patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more. Due to the complexity of some of the patches dwm-flexipatch has diverged from mainstream dwm by making some core patches non-optional for maintenance reasons. For the classic dwm-flexipatch build refer to branch [dwm-flexipatch-1.0](https://github.com/bakkeby/dwm-flexipatch/tree/dwm-flexipatch-1.0).
 
 For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/dwm-flexipatch/blob/master/patches.def.h):
 ```c
@@ -15,6 +15,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
 
 ### Changelog:
 
+2021-03-29 - Removed alwaysfullscreen patch (merged into dwm 6.2)
+
 2021-03-09 - Added the tab patch and the LG3D patch
 
 2021-02-11 - Added the riodraw and focusdir patches
@@ -195,8 +197,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
    - [alttagsdecoration](https://dwm.suckless.org/patches/alttagsdecoration/)
       - provides the ability to use alternative text for tags which contain at least one window
 
-   - [alwaysfullscreen](https://dwm.suckless.org/patches/alwaysfullscreen/)
-      - prevents the focus to drift from the active fullscreen client when using focusstack\(\)
+   - [~alwaysfullscreen~](https://dwm.suckless.org/patches/alwaysfullscreen/)
+      - ~prevents the focus to drift from the active fullscreen client when using focusstack\(\)~
 
    - [anybar](https://dwm.suckless.org/patches/anybar/)
       - enables dwm to manage external status bars such as lemonbar and polybar

dwm.c

@@ -1952,12 +1952,13 @@ focusstack(const Arg *arg)
 {
 	Client *c = NULL, *i;
 
+	#if LOSEFULLSCREEN_PATCH
 	if (!selmon->sel)
 		return;
-	#if ALWAYSFULLSCREEN_PATCH
-	if (selmon->sel->isfullscreen)
+	#else
+	if (!selmon->sel || selmon->sel->isfullscreen)
 		return;
-	#endif // ALWAYSFULLSCREEN_PATCH
+	#endif // LOSEFULLSCREEN_PATCH
 	#if BAR_WINTITLEACTIONS_PATCH
 	if (arg->i > 0) {
 		for (c = selmon->sel->next; c && (!ISVISIBLE(c) || (arg->i == 1 && HIDDEN(c))); c = c->next);

patch/stacker.c

@@ -7,10 +7,10 @@ focusstack(const Arg *arg)
 	if (i < 0)
  		return;
 
-	#if ALWAYSFULLSCREEN_PATCH
+ 	#if !LOSEFULLSCREEN_PATCH
 	if (!selmon->sel || selmon->sel->isfullscreen)
 		return;
-	#endif // ALWAYSFULLSCREEN_PATCH
+	#endif // LOSEFULLSCREEN_PATCH
 
 	#if BAR_WINTITLEACTIONS_PATCH
 	for (p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c) || HIDDEN(c));

patches.def.h

@@ -346,12 +346,6 @@
  */
 #define ASPECTRESIZE_PATCH 0
 
-/* This patch prevents the focus to drift from the active fullscreen client when
- * using focusstack().
- * https://dwm.suckless.org/patches/alwaysfullscreen/
- */
-#define ALWAYSFULLSCREEN_PATCH 0
-
 /* This patch adds new clients above the selected client, instead of always
  * becoming the new master. This behaviour is known from Xmonad.
  * This patch takes precedence over ATTACHASIDE_PATCH.