diff options
| author | bakkeby <[email protected]> | 2020-08-24 15:03:55 +0200 |
|---|---|---|
| committer | bakkeby <[email protected]> | 2020-08-24 15:03:55 +0200 |
| commit | df57bdeb64a1673276ab6fb2ed00fd6c9ad3c2b1 (patch) | |
| tree | 0070900225cca2864bc367ebe14763dc363e6799 /patch | |
| parent | 7ce66bf122fd8b7288a5e0ddf0d0e312a0f08456 (diff) | |
| download | dwm-flexipatch-df57bdeb64a1673276ab6fb2ed00fd6c9ad3c2b1.tar.gz dwm-flexipatch-df57bdeb64a1673276ab6fb2ed00fd6c9ad3c2b1.zip | |
Identified and fixed a few more cross-compilation issues
Diffstat (limited to 'patch')
| -rw-r--r-- | patch/bar_flexwintitle.c | 9 | ||||
| -rw-r--r-- | patch/bar_status2d.c | 8 | ||||
| -rw-r--r-- | patch/vanitygaps.c | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/patch/bar_flexwintitle.c b/patch/bar_flexwintitle.c index 22b5b3c..8a460b2 100644 --- a/patch/bar_flexwintitle.c +++ b/patch/bar_flexwintitle.c @@ -258,12 +258,14 @@ flextitlecalculate( if (i < m->nmaster) clientsnmaster++; + #if FLEXTILE_DELUXE_LAYOUT else if (m->nstack) { if (clientsnstack < m->nstack) clientsnstack++; else clientsnstack2++; } + #endif // FLEXTILE_DELUXE_LAYOUT else if (i % 2) clientsnstack++; else @@ -366,7 +368,12 @@ flextitlecalculate( r = num % den; // weight rest width rw = r / n; // rest incr per client rr = r % n; // rest rest - if ((!center && !dualstack) || (center && n <= m->nmaster + (m->nstack ? m->nstack : 1))) { + #if FLEXTILE_DELUXE_LAYOUT + if ((!center && !dualstack) || (center && n <= m->nmaster + (m->nstack ? m->nstack : 1))) + #else + if ((!center && !dualstack) || (center && n <= m->nmaster + 1)) + #endif // FLEXTILE_DELUXE_LAYOUT + { clientsnstack += clientsnstack2; clientsnstack2 = 0; if (groupactive == GRP_STACK2) diff --git a/patch/bar_status2d.c b/patch/bar_status2d.c index 8122aa5..d7ae08f 100644 --- a/patch/bar_status2d.c +++ b/patch/bar_status2d.c @@ -15,11 +15,11 @@ int width_status2d_es(Bar *bar, BarWidthArg *a) { int width; - #if BAR_EXTRASTATUS_PATCH || BAR_STATUSCMD_PATCH + #if BAR_STATUSCMD_PATCH width = status2dtextlength(rawestext); #else width = status2dtextlength(estext); - #endif // #if BAR_EXTRASTATUS_PATCH | BAR_STATUSCMD_PATCH + #endif // BAR_STATUSCMD_PATCH return width ? width + lrpad : 0; } #endif // BAR_EXTRASTATUS_PATCH @@ -38,11 +38,11 @@ draw_status2d(Bar *bar, BarDrawArg *a) int draw_status2d_es(Bar *bar, BarDrawArg *a) { - #if BAR_EXTRASTATUS_PATCH || BAR_STATUSCMD_PATCH + #if BAR_STATUSCMD_PATCH return drawstatusbar(a->x, rawestext); #else return drawstatusbar(a->x, estext); - #endif // #if BAR_EXTRASTATUS_PATCH | BAR_STATUSCMD_PATCH + #endif // BAR_STATUSCMD_PATCH } #endif // BAR_EXTRASTATUS_PATCH diff --git a/patch/vanitygaps.c b/patch/vanitygaps.c index d8db675..7bf65b9 100644 --- a/patch/vanitygaps.c +++ b/patch/vanitygaps.c @@ -166,7 +166,7 @@ incrivgaps(const Arg *arg) ); } -#if CENTEREDMASTER_LAYOUT || CENTEREDFLOATINGMASTER_LAYOUT || COLUMNS_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || NROWGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT || TILE_LAYOUT || (VANITYGAPS_MONOCLE_PATCH && MONOCLE_LAYOUT) +#if DRAGMFACT_PATCH || CENTEREDMASTER_LAYOUT || CENTEREDFLOATINGMASTER_LAYOUT || COLUMNS_LAYOUT || DECK_LAYOUT || FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT || GAPPLESSGRID_LAYOUT || NROWGRID_LAYOUT || HORIZGRID_LAYOUT || BSTACK_LAYOUT || BSTACKHORIZ_LAYOUT || GRIDMODE_LAYOUT || FLEXTILE_DELUXE_LAYOUT || TILE_LAYOUT || (VANITYGAPS_MONOCLE_PATCH && MONOCLE_LAYOUT) static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc) { |