From c280129cef4ff2e8667b8700c9bdf671fdd7c8ef Mon Sep 17 00:00:00 2001
From: Bert Münnich <ber.t@posteo.de>
Date: Sat, 6 Aug 2016 15:27:58 +0200
Subject: Use Xft for font loading and text drawing

---
 window.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'window.h')

diff --git a/window.h b/window.h
index 31bd898..f5f9df0 100644
--- a/window.h
+++ b/window.h
@@ -21,6 +21,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include <X11/Xft/Xft.h>
 
 #include "types.h"
 
@@ -59,9 +60,9 @@ typedef struct {
 	Window xwin;
 	win_env_t env;
 
-	unsigned long bgcol;
-	unsigned long fscol;
-	unsigned long selcol;
+	XftColor bgcol;
+	XftColor fscol;
+	XftColor selcol;
 
 	int x;
 	int y;
@@ -81,8 +82,8 @@ typedef struct {
 		unsigned int h;
 		win_bar_t l;
 		win_bar_t r;
-		unsigned long bgcol;
-		unsigned long fgcol;
+		XftColor bgcol;
+		XftColor fgcol;
 	} bar;
 } win_t;
 
@@ -101,7 +102,7 @@ void win_clear(win_t*);
 void win_draw(win_t*);
 void win_draw_rect(win_t*, int, int, int, int, bool, int, unsigned long);
 
-int win_textwidth(const char*, unsigned int, bool);
+int win_textwidth(const win_env_t*, const char*, unsigned int, bool);
 
 void win_set_title(win_t*, const char*);
 void win_set_cursor(win_t*, cursor_t);
-- 
cgit v1.2.3