Simplified Pango integration by settling on common function signatures.

2020-08-22 20:31:17 +02:00
parent 46ebaea58f
commit 81f44b036c
13 changed files with 22 additions and 118 deletions
--- a/patch/bar_statuscmd.c
+++ b/patch/bar_statuscmd.c
@ -35,11 +35,9 @@ click_statuscmd_text(Arg *arg, int rel_x, char *text)
 			text[i] = '\0';
 			#if BAR_STATUS2D_PATCH && !BAR_BAR_STATUSCOLORS_PATCH
 			x += status2dtextlength(text);
-			#elif BAR_PANGO_PATCH
-			x += TEXTWM(text) - lrpad;
 			#else
-			x += TEXTW(text) - lrpad;
-			#endif // STATUS2D_PATCH
+			x += TEXTWM(text) - lrpad;
+			#endif // BAR_STATUS2D_PATCH
 			text[i] = ch;
 			text += i+1;
 			i = -1;