Minor refactoring of warp and fullscreen patches, getting rid of MONOCLE_LAYOUT_POS setting

This commit is contained in:
bakkeby
2020-08-27 06:26:48 +02:00
parent f45acf8795
commit e952cc9a81
5 changed files with 31 additions and 17 deletions

20
dwm.c
View File

@@ -2591,6 +2591,9 @@ restack(Monitor *m)
Client *c;
XEvent ev;
XWindowChanges wc;
#if WARP_PATCH && FLEXTILE_DELUXE_LAYOUT
int n;
#endif // WARP_PATCH
drawbar(m);
if (!m->sel)
@@ -2608,8 +2611,21 @@ restack(Monitor *m)
}
XSync(dpy, False);
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
#if WARP_PATCH
if (m == selmon && (m->tagset[m->seltags] & m->sel->tags) && selmon->lt[selmon->sellt] != &layouts[MONOCLE_LAYOUT_POS])
#if WARP_PATCH && (FLEXTILE_DELUXE_LAYOUT || MONOCLE_LAYOUT)
#if FLEXTILE_DELUXE_LAYOUT
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
#endif // FLEXTILE_DELUXE_LAYOUT
if (m == selmon && (m->tagset[m->seltags] & m->sel->tags) && (
#if MONOCLE_LAYOUT && FLEXTILE_DELUXE_LAYOUT
(m->lt[m->sellt]->arrange != &monocle
&& !(m->ltaxis[MASTER] == MONOCLE && (abs(m->ltaxis[LAYOUT] == NO_SPLIT || !m->nmaster || n <= m->nmaster))))
#elif MONOCLE_LAYOUT
m->lt[m->sellt]->arrange == &monocle
#else
!(m->ltaxis[MASTER] == MONOCLE && (abs(m->ltaxis[LAYOUT] == NO_SPLIT || !m->nmaster || n <= m->nmaster)))
#endif // FLEXTILE_DELUXE_LAYOUT
|| m->sel->isfloating)
)
warp(m->sel);
#endif // WARP_PATCH
}