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

Identified and fixed a few more cross-compilation issues related to prior refactoring / simplification

Browse Source
This commit is contained in:
bakkeby 2020-08-24 00:26:26 +02:00
parent 939a407e25
commit 7ce66bf122
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drw.c
View File

@ -618,11 +618,11 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
} }
unsigned int unsigned int
drw_fontset_getwidth(Drw *drw, const char *text, Bool ignored) drw_fontset_getwidth(Drw *drw, const char *text, Bool markup)
{ {
if (!drw || !drw->fonts || !text) if (!drw || !drw->fonts || !text)
return 0; return 0;
return drw_text(drw, 0, 0, 0, 0, 0, text, 0, ignored); return drw_text(drw, 0, 0, 0, 0, 0, text, 0, markup);
} }
#if BAR_PANGO_PATCH #if BAR_PANGO_PATCH

2
patch/bar_powerline_status.c
View File

@ -102,7 +102,7 @@ drawpowerlinestatus(int xpos, char *stext)
drw_setscheme(drw, nxtscheme); drw_setscheme(drw, nxtscheme);
w = TEXTW(bs+2); w = TEXTW(bs+2);
drw_text(drw, x - w, 0, w, bh, lrpad / 2, bs+2, 0); drw_text(drw, x - w, 0, w, bh, lrpad / 2, bs+2, 0, False);
x -= w; x -= w;
bp = *bs; bp = *bs;

4
patch/bar_powerline_tags.c
View File

@ -61,8 +61,8 @@ draw_pwrl_tags(Bar *bar, BarDrawArg *a)
#endif // BAR_POWERLINE_TAGS_SLASH_PATCH #endif // BAR_POWERLINE_TAGS_SLASH_PATCH
x += plw; x += plw;
drw_setscheme(drw, nxtscheme); drw_setscheme(drw, nxtscheme);
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], invert); drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], invert, False);
drawindicator(m, NULL, occ, x, w, i, -1, invert, tagindicatortype); drawindicator(bar->mon, NULL, occ, x, w, i, -1, invert, tagindicatortype);
x += w; x += w;
prevscheme = nxtscheme; prevscheme = nxtscheme;
} }

6
patch/bar_statuscolors.c
View File

@ -12,11 +12,7 @@ textw_wosc(char *s)
} }
ctmp = *ts; ctmp = *ts;
*ts = '\0'; *ts = '\0';
#if BAR_PANGO_PATCH sw += drw_fontset_getwidth(drw, tp, True);
sw += drw_font_getwidth(drw, tp, True);
#else
sw += drw_fontset_getwidth(drw, tp);
#endif // BAR_PANGO_PATCH
*ts = ctmp; *ts = ctmp;
if (ctmp == '\0') if (ctmp == '\0')
break; break;

2
patch/bar_tabgroups.c
View File

@ -59,7 +59,7 @@ bartabdraw(Monitor *m, Client *c, int unused, int x, int w, int groupactive, Arg
pad = (w - TEXTW(c->name) + lrpad) / 2; pad = (w - TEXTW(c->name) + lrpad) / 2;
#endif // BAR_CENTEREDWINDOWNAME_PATCH #endif // BAR_CENTEREDWINDOWNAME_PATCH
drw_text(drw, x, 0, w, bh, pad, c->name, 0); drw_text(drw, x, 0, w, bh, pad, c->name, 0, False);
if (c->isfloating) if (c->isfloating)
drawindicator(m, c, 1, x, w, 0, 0, c->isfixed, floatindicatortype); drawindicator(m, c, 1, x, w, 0, 0, c->isfixed, floatindicatortype);