new stuff (some warning elimination)

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 85ff41b..1046322 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -6,77 +6,81 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

-#include "draw.h"
-#include "util.h"
+#include <X11/Xlocale.h>
+
+#include "wm.h"

 
 static void
 
 static void

-drawborder(Display *dpy, Brush *b)
+drawborder(Brush *b)

 {
        XPoint points[5];
        XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);
 {
        XPoint points[5];
        XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);

-       XSetForeground(dpy, b->gc, b->color.border);
-       points[0].x = b->rect.x;
-       points[0].y = b->rect.y;
-       points[1].x = b->rect.width - 1;
+       XSetForeground(dpy, b->gc, b->border);
+       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[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[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
        XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
 }
 
 void

-draw(Display *dpy, Brush *b)
+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;
        static char buf[256];
        XGCValues gcv;

+       XRectangle r = { b->x, b->y, b->w, b->h };

 
 

-       XSetForeground(dpy, b->gc, b->color.bg);
-       XFillRectangles(dpy, b->drawable, b->gc, &b->rect, 1);
+       XSetForeground(dpy, b->gc, b->bg);
+       XFillRectangles(dpy, b->drawable, b->gc, &r, 1);

 
 

-       if(b->border)
-               drawborder(dpy, b);
+       w = 0;
+       if(border)
+               drawborder(b);

 
 

-       if(!b->text)
+       if(!text)

                return;
 
                return;
 

-       len = strlen(b->text);
+       len = strlen(text);

        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;

-       memcpy(buf, b->text, len);
+       memcpy(buf, text, len);

        buf[len] = 0;
 
        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);
+       h = b->font.ascent + b->font.descent;
+       y = b->y + (b->h / 2) - (h / 2) + b->font.ascent;
+       x = b->x + (h / 2);

 
        /* shorten text if necessary */
 
        /* 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;
 
                buf[--len] = 0;
 

-       if(w > b->rect.width)
+       if(w > b->w)

                return; /* too long */
 
                return; /* too long */
 

-       gcv.foreground = b->color.fg;
-       gcv.background = b->color.bg;
-       if(b->font->set) {
+       gcv.foreground = b->fg;
+       gcv.background = b->bg;
+       if(b->font.set) {

                XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv);
                XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv);

-               XmbDrawImageString(dpy, b->drawable, b->font->set, b->gc,
+               XmbDrawImageString(dpy, b->drawable, b->font.set, b->gc,

                                x, y, buf, len);
        }
        else {
                                x, y, buf, len);
        }
        else {

-               gcv.font = b->font->xfont->fid;
+               gcv.font = b->font.xfont->fid;

                XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv);
                XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len);
        }
 }
 
 static unsigned long
                XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv);
                XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len);
        }
 }
 
 static unsigned long

-xloadcolor(Display *dpy, Colormap cmap, const char *colstr)
+xloadcolors(Colormap cmap, const char *colstr)

 {
        XColor color;
        XAllocNamedColor(dpy, cmap, colstr, &color, &color);
 {
        XColor color;
        XAllocNamedColor(dpy, cmap, colstr, &color, &color);


@@ -84,40 +88,45 @@ xloadcolor(Display *dpy, Colormap cmap, const char *colstr)
 }
 
 void
 }
 
 void

-loadcolor(Display *dpy, int screen, Color *c,
+loadcolors(int scr, Brush *b,

                const char *bg, const char *fg, const char *border)
 {
                const char *bg, const char *fg, const char *border)
 {

-       Colormap cmap = DefaultColormap(dpy, screen);
-       c->bg = xloadcolor(dpy, cmap, bg);
-       c->fg = xloadcolor(dpy, cmap, fg);
-       c->border = xloadcolor(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
 }
 
 unsigned int

-textwidth_l(Fnt *font, char *text, unsigned int len)
+textnw(Fnt *font, char *text, unsigned int len)

 {
 {

+       XRectangle r;

        if(font->set) {
        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
                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
 }
 
 void

-loadfont(Display *dpy, Fnt *font, const char *fontstr)
+loadfont(Fnt *font, const char *fontstr)

 {
        char **missing, *def;
 {
        char **missing, *def;

-       int n;
+       int i, n;

 
 

-       missing = 0;
-       def = "?";
+       missing = NULL;

        setlocale(LC_ALL, "");
        if(font->set)
                XFreeFontSet(dpy, font->set);
        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);
                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;
                }
        }
        if(font->set) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;

-               unsigned int i;

 
                font->ascent = font->descent = 0;
                font_extents = XExtentsOfFontSet(font->set);
 
                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);
        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");
                font->xfont = XLoadQueryFont(dpy, fontstr);
                if (!font->xfont)
                        font->xfont = XLoadQueryFont(dpy, "fixed");


@@ -160,4 +168,5 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr)
                font->ascent = font->xfont->ascent;
                font->descent = font->xfont->descent;
        }
                font->ascent = font->xfont->ascent;
                font->descent = font->xfont->descent;
        }

+       font->height = font->ascent + font->descent;

 }
 }