osama/dwm
1
0
Fork 0
mirror of https://github.com/mintycube/dwm.git synced 2024-10-22 14:05:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fakefullscreen vs fakefullscreenclient compatibility, let fakefullscreen take precedence

Browse Source
This commit is contained in:
bakkeby 2021-05-13 14:25:26 +02:00
parent 0b5bc76eef
commit 7fe81a6280
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -83,7 +83,7 @@ static const int showsystray = 1; /* 0 means no systray */
static int tagindicatortype = INDICATOR_TOP_LEFT_SQUARE; static int tagindicatortype = INDICATOR_TOP_LEFT_SQUARE;
static int tiledindicatortype = INDICATOR_NONE; static int tiledindicatortype = INDICATOR_NONE;
static int floatindicatortype = INDICATOR_TOP_LEFT_SQUARE; static int floatindicatortype = INDICATOR_TOP_LEFT_SQUARE;
#if FAKEFULLSCREEN_CLIENT_PATCH #if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
static int fakefsindicatortype = INDICATOR_PLUS; static int fakefsindicatortype = INDICATOR_PLUS;
static int floatfakefsindicatortype = INDICATOR_PLUS_AND_LARGER_SQUARE; static int floatfakefsindicatortype = INDICATOR_PLUS_AND_LARGER_SQUARE;
#endif // FAKEFULLSCREEN_CLIENT_PATCH #endif // FAKEFULLSCREEN_CLIENT_PATCH

14
dwm.c
View File

@ -502,7 +502,7 @@ typedef struct {
int iscentered; int iscentered;
#endif // CENTER_PATCH #endif // CENTER_PATCH
int isfloating; int isfloating;
#if SELECTIVEFAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH #if SELECTIVEFAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
int isfakefullscreen; int isfakefullscreen;
#endif // SELECTIVEFAKEFULLSCREEN_PATCH #endif // SELECTIVEFAKEFULLSCREEN_PATCH
#if ISPERMANENT_PATCH #if ISPERMANENT_PATCH
@ -539,7 +539,7 @@ typedef struct {
#else #else
#define PERMANENT #define PERMANENT
#endif // ISPERMANENT_PATCH #endif // ISPERMANENT_PATCH
#if SELECTIVEFAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH #if SELECTIVEFAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
#define FAKEFULLSCREEN , .isfakefullscreen = 1 #define FAKEFULLSCREEN , .isfakefullscreen = 1
#else #else
#define FAKEFULLSCREEN #define FAKEFULLSCREEN
@ -846,7 +846,7 @@ applyrules(Client *c)
#if ISPERMANENT_PATCH #if ISPERMANENT_PATCH
c->ispermanent = r->ispermanent; c->ispermanent = r->ispermanent;
#endif // ISPERMANENT_PATCH #endif // ISPERMANENT_PATCH
#if SELECTIVEFAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH #if SELECTIVEFAKEFULLSCREEN_PATCH && FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
c->fakefullscreen = r->isfakefullscreen; c->fakefullscreen = r->isfakefullscreen;
#endif // SELECTIVEFAKEFULLSCREEN_PATCH #endif // SELECTIVEFAKEFULLSCREEN_PATCH
#if SWALLOW_PATCH #if SWALLOW_PATCH
@ -1308,7 +1308,7 @@ clientmessage(XEvent *e)
if (cme->message_type == netatom[NetWMState]) { if (cme->message_type == netatom[NetWMState]) {
if (cme->data.l[1] == netatom[NetWMFullscreen] if (cme->data.l[1] == netatom[NetWMFullscreen]
|| cme->data.l[2] == netatom[NetWMFullscreen]) { || cme->data.l[2] == netatom[NetWMFullscreen]) {
#if FAKEFULLSCREEN_CLIENT_PATCH #if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
if (c->fakefullscreen == 2 && c->isfullscreen) if (c->fakefullscreen == 2 && c->isfullscreen)
c->fakefullscreen = 3; c->fakefullscreen = 3;
#endif // FAKEFULLSCREEN_CLIENT_PATCH #endif // FAKEFULLSCREEN_CLIENT_PATCH
@ -2002,7 +2002,7 @@ focusstack(const Arg *arg)
#if LOSEFULLSCREEN_PATCH #if LOSEFULLSCREEN_PATCH
if (!selmon->sel) if (!selmon->sel)
return; return;
#elif FAKEFULLSCREEN_CLIENT_PATCH #elif FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
if (!selmon->sel || (selmon->sel->isfullscreen && !selmon->sel->fakefullscreen)) if (!selmon->sel || (selmon->sel->isfullscreen && !selmon->sel->fakefullscreen))
return; return;
#else #else
@ -2539,7 +2539,7 @@ movemouse(const Arg *arg)
if (!(c = selmon->sel)) if (!(c = selmon->sel))
return; return;
#if !FAKEFULLSCREEN_PATCH #if !FAKEFULLSCREEN_PATCH
#if FAKEFULLSCREEN_CLIENT_PATCH #if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
if (c->isfullscreen && c->fakefullscreen != 1) /* no support moving fullscreen windows by mouse */ if (c->isfullscreen && c->fakefullscreen != 1) /* no support moving fullscreen windows by mouse */
return; return;
#else #else
@ -2803,7 +2803,7 @@ resizeclient(Client *c, int x, int y, int w, int h)
c->mon->nmaster == 0))) c->mon->nmaster == 0)))
#endif //FLEXTILE_DELUXE_LAYOUT #endif //FLEXTILE_DELUXE_LAYOUT
) )
#if FAKEFULLSCREEN_CLIENT_PATCH #if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
&& (c->fakefullscreen == 1 || !c->isfullscreen) && (c->fakefullscreen == 1 || !c->isfullscreen)
#else #else
&& !c->isfullscreen && !c->isfullscreen

2
patch/bar_indicators.c
View File

@ -96,7 +96,7 @@ drawindicator(Monitor *m, Client *c, unsigned int occ, int x, int y, int w, int
void void
drawstateindicator(Monitor *m, Client *c, unsigned int occ, int x, int y, int w, int h, unsigned int tag, int filled, int invert) drawstateindicator(Monitor *m, Client *c, unsigned int occ, int x, int y, int w, int h, unsigned int tag, int filled, int invert)
{ {
#if FAKEFULLSCREEN_CLIENT_PATCH #if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
if (c->fakefullscreen && c->isfloating) if (c->fakefullscreen && c->isfloating)
drawindicator(m, c, occ, x, y, w, h, tag, filled, invert, floatfakefsindicatortype); drawindicator(m, c, occ, x, y, w, h, tag, filled, invert, floatfakefsindicatortype);
else if (c->fakefullscreen) else if (c->fakefullscreen)

2
patch/togglefullscreen.c
View File

@ -5,7 +5,7 @@ togglefullscreen(const Arg *arg)
if (!c) if (!c)
return; return;
#if FAKEFULLSCREEN_CLIENT_PATCH #if FAKEFULLSCREEN_CLIENT_PATCH && !FAKEFULLSCREEN_PATCH
if (c->fakefullscreen == 1) { // fake fullscreen --> fullscreen if (c->fakefullscreen == 1) { // fake fullscreen --> fullscreen
c->fakefullscreen = 2; c->fakefullscreen = 2;
setfullscreen(c, 1); setfullscreen(c, 1);