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

status2d: rawstext may not exist if neither statuscmd nor the extrabar patch is used

Browse Source
This commit is contained in:
bakkeby 2020-07-24 11:15:44 +02:00
parent 6eb24902f2
commit 2cf37aa492
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patch/bar_status2d.c
View File

@ -1,28 +1,44 @@
int int
width_status2d(Bar *bar, BarWidthArg *a) width_status2d(Bar *bar, BarWidthArg *a)
{ {
#if BAR_EXTRASTATUS_PATCH || BAR_STATUSCMD_PATCH
return status2dtextlength(rawstext) + lrpad; return status2dtextlength(rawstext) + lrpad;
#else
return status2dtextlength(stext) + lrpad;
#endif // #if BAR_EXTRASTATUS_PATCH | BAR_STATUSCMD_PATCH
} }
#if BAR_EXTRASTATUS_PATCH #if BAR_EXTRASTATUS_PATCH
int int
width_status2d_es(Bar *bar, BarWidthArg *a) width_status2d_es(Bar *bar, BarWidthArg *a)
{ {
return status2dtextlength(rawestext); #if BAR_EXTRASTATUS_PATCH || BAR_STATUSCMD_PATCH
return status2dtextlength(rawestext) + lrpad;
#else
return status2dtextlength(estext) + lrpad;
#endif // #if BAR_EXTRASTATUS_PATCH | BAR_STATUSCMD_PATCH
} }
#endif // BAR_EXTRASTATUS_PATCH #endif // BAR_EXTRASTATUS_PATCH
int int
draw_status2d(Bar *bar, BarDrawArg *a) draw_status2d(Bar *bar, BarDrawArg *a)
{ {
#if BAR_EXTRASTATUS_PATCH || BAR_STATUSCMD_PATCH
return drawstatusbar(a->x, rawstext); return drawstatusbar(a->x, rawstext);
#else
return drawstatusbar(a->x, stext);
#endif // #if BAR_EXTRASTATUS_PATCH | BAR_STATUSCMD_PATCH
} }
#if BAR_EXTRASTATUS_PATCH #if BAR_EXTRASTATUS_PATCH
int int
draw_status2d_es(Bar *bar, BarDrawArg *a) draw_status2d_es(Bar *bar, BarDrawArg *a)
{ {
#if BAR_EXTRASTATUS_PATCH || BAR_STATUSCMD_PATCH
return drawstatusbar(a->x, rawestext); return drawstatusbar(a->x, rawestext);
#else
return drawstatusbar(a->x, estext);
#endif // #if BAR_EXTRASTATUS_PATCH | BAR_STATUSCMD_PATCH
} }
#endif // BAR_EXTRASTATUS_PATCH #endif // BAR_EXTRASTATUS_PATCH