From dfd84f9bf3b9d949412a73bc62a43109b340d395 Mon Sep 17 00:00:00 2001
From: Anselm R. Garbe
Date: Wed, 12 Jul 2006 15:17:22 +0200
Subject: simplified several portions of code through replacing rect structs
 with x,y,h,w counterparts (much more readable)

---
 draw.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'draw.h')

diff --git a/draw.h b/draw.h
index 6c3d886..4cd6fb1 100644
--- a/draw.h
+++ b/draw.h
@@ -20,7 +20,7 @@ struct Fnt {
 struct Brush {
 	GC gc;
 	Drawable drawable;
-	XRectangle rect;
+	int x, y, w, h;
 	Fnt font;
 	unsigned long bg;
 	unsigned long fg;
@@ -31,6 +31,6 @@ extern void draw(Display *dpy, Brush *b, Bool border, const char *text);
 extern void loadcolors(Display *dpy, int screen, Brush *b,
 		const char *bg, const char *fg, const char *bo);
 extern void loadfont(Display *dpy, Fnt *font, const char *fontstr);
-extern unsigned int textwidth_l(Fnt *font, char *text, unsigned int len);
-extern unsigned int textwidth(Fnt *font, char *text);
-extern unsigned int labelheight(Fnt *font);
+extern unsigned int textnw(Fnt *font, char *text, unsigned int len);
+extern unsigned int textw(Fnt *font, char *text);
+extern unsigned int texth(Fnt *font);
-- 
cgit v1.2.3