mirror of
https://github.com/mintycube/dwm.git
synced 2024-10-22 12:05:45 +00:00
Minor refactoring of warp and fullscreen patches, getting rid of MONOCLE_LAYOUT_POS setting
This commit is contained in:
parent
f45acf8795
commit
e952cc9a81
@ -674,9 +674,6 @@ static const int decorhints = 1; /* 1 means respect decoration hints */
|
||||
#define FORCE_VSPLIT 1
|
||||
#endif
|
||||
|
||||
/* Position of the monocle layout in the layouts variable, used by warp and fullscreen patches */
|
||||
#define MONOCLE_LAYOUT_POS 2
|
||||
|
||||
#if FLEXTILE_DELUXE_LAYOUT
|
||||
static const Layout layouts[] = {
|
||||
/* symbol arrange function, { nmaster, nstack, layout, master axis, stack axis, secondary stack axis } */
|
||||
|
20
dwm.c
20
dwm.c
@ -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
|
||||
}
|
||||
|
@ -3,9 +3,11 @@ Layout *last_layout;
|
||||
void
|
||||
fullscreen(const Arg *arg)
|
||||
{
|
||||
int monocle_pos;
|
||||
if (selmon->showbar || last_layout == NULL) {
|
||||
for (monocle_pos = 0, last_layout = (Layout *)layouts; !last_layout->arrange || last_layout->arrange != &monocle; monocle_pos++, last_layout++ );
|
||||
for (last_layout = (Layout *)layouts; last_layout != selmon->lt[selmon->sellt]; last_layout++);
|
||||
setlayout(&((Arg) { .v = &layouts[MONOCLE_LAYOUT_POS] }));
|
||||
setlayout(&((Arg) { .v = &layouts[monocle_pos] }));
|
||||
} else {
|
||||
setlayout(&((Arg) { .v = last_layout }));
|
||||
}
|
||||
|
@ -503,7 +503,6 @@
|
||||
|
||||
/* Applies the monocle layout with the focused client on top and hides the bar. When pressed
|
||||
* again it shows the bar and restores the layout that was active before going fullscreen.
|
||||
* NB: This patch assumes that the third layout is monocle and that the bar is shown.
|
||||
* https://dwm.suckless.org/patches/fullscreen/
|
||||
*/
|
||||
#define FULLSCREEN_PATCH 0
|
||||
|
Loading…
x
Reference in New Issue
Block a user