new stuff (some warning elimination)

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index c148362..1046322 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -6,11 +6,12 @@
 #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);
@@ -29,9 +30,10 @@ drawborder(Display *dpy, Brush *b)
 }
 
 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 };
@@ -39,8 +41,9 @@ draw(Display *dpy, Brush *b, Bool border, const char *text)
        XSetForeground(dpy, b->gc, b->bg);
        XFillRectangles(dpy, b->drawable, b->gc, &r, 1);
 
+       w = 0;
        if(border)
-               drawborder(dpy, b);
+               drawborder(b);
 
        if(!text)
                return;
@@ -77,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);
@@ -85,13 +88,13 @@ 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
@@ -118,13 +121,12 @@ texth(Fnt *font)
 }
 
 void
-loadfont(Display *dpy, Fnt *font, const char *fontstr)
+loadfont(Fnt *font, const char *fontstr)
 {
        char **missing, *def;
-       int n;
+       int i, n;
 
        missing = NULL;
-       def = "?";
        setlocale(LC_ALL, "");
        if(font->set)
                XFreeFontSet(dpy, font->set);
@@ -142,7 +144,6 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr)
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
-               unsigned int i;
 
                font->ascent = font->descent = 0;
                font_extents = XExtentsOfFontSet(font->set);