draw.c
changeset 123 61490330e90a
parent 93 c498da7520c7
child 124 75576e44c1d8
--- a/draw.c	Thu Jul 20 10:48:22 2006 +0200
+++ b/draw.c	Thu Jul 20 12:18:06 2006 +0200
@@ -14,6 +14,7 @@
 drawborder(void)
 {
 	XPoint points[5];
+
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	XSetForeground(dpy, dc.gc, dc.border);
 	points[0].x = dc.x;
@@ -33,6 +34,7 @@
 textnw(char *text, unsigned int len)
 {
 	XRectangle r;
+
 	if(dc.font.set) {
 		XmbTextExtents(dc.font.set, text, len, NULL, &r);
 		return r.width;
@@ -44,8 +46,8 @@
 drawtext(const char *text, Bool invert, Bool border)
 {
 	int x, y, w, h;
+	static char buf[256];
 	unsigned int len;
-	static char buf[256];
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
@@ -170,8 +172,8 @@
 unsigned long
 getcolor(const char *colstr)
 {
+	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
-	Colormap cmap = DefaultColormap(dpy, screen);
 
 	XAllocNamedColor(dpy, cmap, colstr, &color, &color);
 	return color.pixel;