X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=draw.c;h=1046322c7bc003acc3673c843afcb105bad25c54;hb=d7e17087ed2fc5eed57efa03e81460e3e41f7238;hp=cf7f14e202c91c5d440ea53f3852be56a8147280;hpb=39677ec76616fe4165ef92afb14db2bef2488e30;p=dwm.git

diff --git a/draw.c b/draw.c
index cf7f14e..1046322 100644
--- a/draw.c
+++ b/draw.c
@@ -6,40 +6,44 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "draw.h"
-#include "util.h"
+#include <X11/Xlocale.h>
+
+#include "wm.h"
 
 static void
-drawborder(Display *dpy, Brush *b)
+drawborder(Brush *b)
 {
 	XPoint points[5];
 	XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);
 	XSetForeground(dpy, b->gc, b->border);
-	points[0].x = b->rect.x;
-	points[0].y = b->rect.y;
-	points[1].x = b->rect.width - 1;
+	points[0].x = b->x;
+	points[0].y = b->y;
+	points[1].x = b->w - 1;
 	points[1].y = 0;
 	points[2].x = 0;
-	points[2].y = b->rect.height - 1;
-	points[3].x = -(b->rect.width - 1);
+	points[2].y = b->h - 1;
+	points[3].x = -(b->w - 1);
 	points[3].y = 0;
 	points[4].x = 0;
-	points[4].y = -(b->rect.height - 1);
+	points[4].y = -(b->h - 1);
 	XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
 }
 
 void
-draw(Display *dpy, Brush *b, Bool border, const char *text)
+draw(Brush *b, Bool border, const char *text)
 {
-	unsigned int x, y, w, h, len;
+	int x, y, w, h;
+	unsigned int len;
 	static char buf[256];
 	XGCValues gcv;
+	XRectangle r = { b->x, b->y, b->w, b->h };
 
 	XSetForeground(dpy, b->gc, b->bg);
-	XFillRectangles(dpy, b->drawable, b->gc, &b->rect, 1);
+	XFillRectangles(dpy, b->drawable, b->gc, &r, 1);
 
+	w = 0;
 	if(border)
-		drawborder(dpy, b);
+		drawborder(b);
 
 	if(!text)
 		return;
@@ -51,14 +55,14 @@ draw(Display *dpy, Brush *b, Bool border, const char *text)
 	buf[len] = 0;
 
 	h = b->font.ascent + b->font.descent;
-	y = b->rect.y + (b->rect.height / 2) - (h / 2) + b->font.ascent;
-	x = b->rect.x + (h / 2);
+	y = b->y + (b->h / 2) - (h / 2) + b->font.ascent;
+	x = b->x + (h / 2);
 
 	/* shorten text if necessary */
-	while(len && (w = textwidth_l(&b->font, buf, len)) > b->rect.width - h)
+	while(len && (w = textnw(&b->font, buf, len)) > b->w - h)
 		buf[--len] = 0;
 
-	if(w > b->rect.width)
+	if(w > b->w)
 		return; /* too long */
 
 	gcv.foreground = b->fg;
@@ -76,7 +80,7 @@ draw(Display *dpy, Brush *b, Bool border, const char *text)
 }
 
 static unsigned long
-xloadcolors(Display *dpy, Colormap cmap, const char *colstr)
+xloadcolors(Colormap cmap, const char *colstr)
 {
 	XColor color;
 	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
@@ -84,40 +88,45 @@ xloadcolors(Display *dpy, Colormap cmap, const char *colstr)
 }
 
 void
-loadcolors(Display *dpy, int screen, Brush *b,
+loadcolors(int scr, Brush *b,
 		const char *bg, const char *fg, const char *border)
 {
-	Colormap cmap = DefaultColormap(dpy, screen);
-	b->bg = xloadcolors(dpy, cmap, bg);
-	b->fg = xloadcolors(dpy, cmap, fg);
-	b->border = xloadcolors(dpy, cmap, border);
+	Colormap cmap = DefaultColormap(dpy, scr);
+	b->bg = xloadcolors(cmap, bg);
+	b->fg = xloadcolors(cmap, fg);
+	b->border = xloadcolors(cmap, border);
 }
 
 unsigned int
-textwidth_l(Fnt *font, char *text, unsigned int len)
+textnw(Fnt *font, char *text, unsigned int len)
 {
+	XRectangle r;
 	if(font->set) {
-		XRectangle r;
-		XmbTextExtents(font->set, text, len, 0, &r);
+		XmbTextExtents(font->set, text, len, NULL, &r);
 		return r.width;
 	}
 	return XTextWidth(font->xfont, text, len);
 }
 
 unsigned int
-textwidth(Fnt *font, char *text)
+textw(Fnt *font, char *text)
+{
+	return textnw(font, text, strlen(text));
+}
+
+unsigned int
+texth(Fnt *font)
 {
-	return textwidth_l(font, text, strlen(text));
+	return font->height + 4;
 }
 
 void
-loadfont(Display *dpy, Fnt *font, const char *fontstr)
+loadfont(Fnt *font, const char *fontstr)
 {
 	char **missing, *def;
-	int n;
+	int i, n;
 
-	missing = 0;
-	def = "?";
+	missing = NULL;
 	setlocale(LC_ALL, "");
 	if(font->set)
 		XFreeFontSet(dpy, font->set);
@@ -128,14 +137,13 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr)
 		XFreeStringList(missing);
 		if(font->set) {
 			XFreeFontSet(dpy, font->set);
-			font->set = 0;
+			font->set = NULL;
 		}
 	}
 	if(font->set) {
 		XFontSetExtents *font_extents;
 		XFontStruct **xfonts;
 		char **font_names;
-		unsigned int i;
 
 		font->ascent = font->descent = 0;
 		font_extents = XExtentsOfFontSet(font->set);
@@ -151,7 +159,7 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr)
 	else {
 		if(font->xfont)
 			XFreeFont(dpy, font->xfont);
-		font->xfont = 0;
+		font->xfont = NULL;
 		font->xfont = XLoadQueryFont(dpy, fontstr);
 		if (!font->xfont)
 			font->xfont = XLoadQueryFont(dpy, "fixed");