Major refactoring in preparation for bar modules

1 files changed, 23 insertions, 23 deletions

diff --git a/drw.h b/drw.h
index ae46f9a..8a1812f 100644
--- a/drw.h
+++ b/drw.h
@@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
 
-#if PANGO_PATCH
+#if BAR_PANGO_PATCH
 #include <pango/pango.h>
 #include <pango/pangoxft.h>
-#endif // PANGO_PATCH
+#endif // BAR_PANGO_PATCH
 
 typedef struct {
 	Cursor cursor;
@@ -12,13 +12,13 @@ typedef struct {
 typedef struct Fnt {
 	Display *dpy;
 	unsigned int h;
-	#if PANGO_PATCH
+	#if BAR_PANGO_PATCH
 	PangoLayout *layout;
 	#else
 	XftFont *xfont;
 	FcPattern *pattern;
 	struct Fnt *next;
-	#endif // PANGO_PATCH
+	#endif // BAR_PANGO_PATCH
 } Fnt;
 
 #if FLOAT_BORDER_COLOR_PATCH
@@ -33,32 +33,32 @@ typedef struct {
 	Display *dpy;
 	int screen;
 	Window root;
-	#if ALPHA_PATCH
+	#if BAR_ALPHA_PATCH
 	Visual *visual;
 	unsigned int depth;
 	Colormap cmap;
-	#endif // ALPHA_PATCH
+	#endif // BAR_ALPHA_PATCH
 	Drawable drawable;
 	GC gc;
 	Clr *scheme;
-	#if PANGO_PATCH
+	#if BAR_PANGO_PATCH
 	Fnt *font;
 	#else
 	Fnt *fonts;
-	#endif // PANGO_PATCH
+	#endif // BAR_PANGO_PATCH
 } Drw;
 
 /* Drawable abstraction */
-#if ALPHA_PATCH
+#if BAR_ALPHA_PATCH
 Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap);
 #else
 Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
-#endif // ALPHA_PATCH
+#endif // BAR_ALPHA_PATCH
 void drw_resize(Drw *drw, unsigned int w, unsigned int h);
 void drw_free(Drw *drw);
 
 /* Fnt abstraction */
-#if PANGO_PATCH
+#if BAR_PANGO_PATCH
 Fnt *drw_font_create(Drw* drw, const char font[]);
 void drw_font_free(Fnt* set);
 unsigned int drw_font_getwidth(Drw *drw, const char *text, Bool markup);
@@ -68,33 +68,33 @@ Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
 void drw_fontset_free(Fnt* set);
 unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
 void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
-#endif // PANGO_PATCH
+#endif // BAR_PANGO_PATCH
 
 /* Colorscheme abstraction */
 void drw_clr_create(
 	Drw *drw,
 	Clr *dest,
-	#if VTCOLORS_PATCH
+	#if BAR_VTCOLORS_PATCH
 	const char clrname[]
 	#else
 	const char *clrname
-	#endif // VTCOLORS_PATCH
-	#if ALPHA_PATCH
+	#endif // BAR_VTCOLORS_PATCH
+	#if BAR_ALPHA_PATCH
 	, unsigned int alpha
-	#endif // ALPHA_PATCH
+	#endif // BAR_ALPHA_PATCH
 );
 Clr *drw_scm_create(
 	Drw *drw,
-	#if VTCOLORS_PATCH
+	#if BAR_VTCOLORS_PATCH
 	char clrnames[][8],
 	#elif XRDB_PATCH
 	char *clrnames[],
 	#else
 	const char *clrnames[],
-	#endif // VTCOLORS_PATCH / XRDB_PATCH
-	#if ALPHA_PATCH
+	#endif // BAR_VTCOLORS_PATCH / XRDB_PATCH
+	#if BAR_ALPHA_PATCH
 	const unsigned int alphas[],
-	#endif // ALPHA_PATCH
+	#endif // BAR_ALPHA_PATCH
 	size_t clrcount
 );
 
@@ -105,16 +105,16 @@ void drw_cur_free(Drw *drw, Cur *cursor);
 /* Drawing context manipulation */
 #if !PANGO_PATCH
 void drw_setfontset(Drw *drw, Fnt *set);
-#endif // PANGO_PATCH
+#endif // BAR_PANGO_PATCH
 void drw_setscheme(Drw *drw, Clr *scm);
 
 /* Drawing functions */
 void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
-#if PANGO_PATCH
+#if BAR_PANGO_PATCH
 int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup);
 #else
 int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
-#endif // PANGO_PATCH
+#endif // BAR_PANGO_PATCH
 
 /* Map functions */
 void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);