diff options
| author | bakkeby <[email protected]> | 2020-03-20 16:45:20 +0100 |
|---|---|---|
| committer | bakkeby <[email protected]> | 2020-03-20 16:45:20 +0100 |
| commit | 873b856428e9695bd13a1df37e9eb38c20a3f52b (patch) | |
| tree | 0a858721de80a1ab4e0fcf8794716ab54a8538d6 | |
| parent | 2541d38d2ce2be00d39be16f69ae0e793d168aa1 (diff) | |
| download | dwm-flexipatch-873b856428e9695bd13a1df37e9eb38c20a3f52b.tar.gz dwm-flexipatch-873b856428e9695bd13a1df37e9eb38c20a3f52b.zip | |
FAKEFULLSCREEN_PATCH takes precedence over the FAKEFULLSCREEN_CLIENT_PATCH, ref. #13
| -rw-r--r-- | config.def.h | 2 | ||||
| -rw-r--r-- | dwm.c | 4 | ||||
| -rw-r--r-- | patch/include.c | 2 | ||||
| -rw-r--r-- | patch/include.h | 2 | ||||
| -rw-r--r-- | patch/togglefullscreen.c | 2 | ||||
| -rw-r--r-- | patches.def.h | 1 |
6 files changed, 7 insertions, 6 deletions
diff --git a/config.def.h b/config.def.h index 39f6983..308822a 100644 --- a/config.def.h +++ b/config.def.h @@ -795,7 +795,7 @@ static Key keys[] = { #if TOGGLEFULLSCREEN_PATCH { MODKEY, XK_y, togglefullscreen, {0} }, #endif // TOGGLEFULLSCREEN_PATCH - #if FAKEFULLSCREEN_CLIENT_PATCH + #if !FAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH { MODKEY|ShiftMask, XK_y, togglefakefullscreen, {0} }, #endif // FAKEFULLSCREEN_CLIENT_PATCH #if FULLSCREEN_PATCH @@ -159,7 +159,7 @@ struct Client { unsigned int switchtag; #endif // SWITCHTAG_PATCH int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; - #if FAKEFULLSCREEN_CLIENT_PATCH + #if !FAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH int fakefullscreen; #endif // FAKEFULLSCREEN_CLIENT_PATCH #if EXRESIZE_PATCH @@ -1745,7 +1745,7 @@ focus(Client *c) #if LOSEFULLSCREEN_PATCH Client *at; for (at = selmon->clients; at; at = at->next) - #if FAKEFULLSCREEN_CLIENT_PATCH + #if !FAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH if (at != c && at->isfullscreen && !at->fakefullscreen && ISVISIBLE(at)) setfullscreen(at, 0); #else diff --git a/patch/include.c b/patch/include.c index d8631fb..d7c3178 100644 --- a/patch/include.c +++ b/patch/include.c @@ -37,7 +37,7 @@ #if EXRESIZE_PATCH #include "exresize.c" #endif -#if FAKEFULLSCREEN_CLIENT_PATCH +#if !FAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH #include "fakefullscreenclient.c" #endif #if FOCUSADJACENTTAG_PATCH diff --git a/patch/include.h b/patch/include.h index dd36e37..aa77397 100644 --- a/patch/include.h +++ b/patch/include.h @@ -37,7 +37,7 @@ #if EXRESIZE_PATCH #include "exresize.h" #endif -#if FAKEFULLSCREEN_CLIENT_PATCH +#if !FAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH #include "fakefullscreenclient.h" #endif #if FOCUSADJACENTTAG_PATCH diff --git a/patch/togglefullscreen.c b/patch/togglefullscreen.c index 07d4062..0d08e72 100644 --- a/patch/togglefullscreen.c +++ b/patch/togglefullscreen.c @@ -4,7 +4,7 @@ togglefullscreen(const Arg *arg) if (!selmon->sel) return; - #if FAKEFULLSCREEN_CLIENT_PATCH + #if !FAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH if (selmon->sel->fakefullscreen) { selmon->sel->fakefullscreen = 0; if (selmon->sel->isfullscreen) { diff --git a/patches.def.h b/patches.def.h index 816f300..0e2cc92 100644 --- a/patches.def.h +++ b/patches.def.h @@ -172,6 +172,7 @@ /* Only allow clients to "fullscreen" into the space currently given to them. * As an example, this will allow you to view a fullscreen video in your browser on * one half of the screen, while having the other half available for other tasks. + * This patch takes precedence over the fakefullscreen client patch below. * https://dwm.suckless.org/patches/fakefullscreen/ */ #define FAKEFULLSCREEN_PATCH 0 |