new stuff, fixed several issues

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index b89c365..68ece01 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -15,16 +15,16 @@ drawborder(Display *dpy, Brush *b)
        XPoint points[5];
        XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);
        XSetForeground(dpy, b->gc, b->border);
        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[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);
 }
 
        XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
 }
 


@@ -34,10 +34,12 @@ draw(Display *dpy, Brush *b, Bool border, const char *text)
        unsigned int x, y, w, h, len;
        static char buf[256];
        XGCValues gcv;
        unsigned int x, y, w, h, len;
        static char buf[256];
        XGCValues gcv;

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

 
        XSetForeground(dpy, b->gc, b->bg);
 
        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);
 
        if(border)
                drawborder(dpy, b);
 


@@ -51,14 +53,14 @@ draw(Display *dpy, Brush *b, Bool border, const char *text)
        buf[len] = 0;
 
        h = b->font.ascent + b->font.descent;
        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 */
 
        /* 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 */
 
        gcv.foreground = b->fg;
                return; /* too long */
 
        gcv.foreground = b->fg;


@@ -94,20 +96,26 @@ loadcolors(Display *dpy, int screen, Brush *b,
 }
 
 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 textwidth_l(font, text, strlen(text));
+       return textnw(font, text, strlen(text));
+}
+
+unsigned int
+texth(Fnt *font)
+{
+       return font->height + 4;

 }
 
 void
 }
 
 void


@@ -116,7 +124,7 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr)
        char **missing, *def;
        int n;
 
        char **missing, *def;
        int n;
 

-       missing = 0;
+       missing = NULL;

        def = "?";
        setlocale(LC_ALL, "");
        if(font->set)
        def = "?";
        setlocale(LC_ALL, "");
        if(font->set)


@@ -128,7 +136,7 @@ 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) {
                }
        }
        if(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");


@@ -162,9 +170,3 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr)
        }
        font->height = font->ascent + font->descent;
 }
        }
        font->height = font->ascent + font->descent;
 }

-
-unsigned int
-labelheight(Fnt *font)
-{
-       return font->height + 4;
-}