added logo+description

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index 85ff41b..455c137 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -6,77 +6,81 @@
 #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(void)
 {
        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;
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       XSetForeground(dpy, dc.gc, dc.border);
+       points[0].x = dc.x;
+       points[0].y = dc.y;
+       points[1].x = dc.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 = dc.h - 1;
+       points[3].x = -(dc.w - 1);
        points[3].y = 0;
        points[4].x = 0;
-       points[4].y = -(b->rect.height - 1);
-       XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
+       points[4].y = -(dc.h - 1);
+       XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
 }
 
 void
-draw(Display *dpy, Brush *b)
+draw(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 = { dc.x, dc.y, dc.w, dc.h };
 
-       XSetForeground(dpy, b->gc, b->color.bg);
-       XFillRectangles(dpy, b->drawable, b->gc, &b->rect, 1);
+       XSetForeground(dpy, dc.gc, dc.bg);
+       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 
-       if(b->border)
-               drawborder(dpy, b);
+       w = 0;
+       if(border)
+               drawborder();
 
-       if(!b->text)
+       if(!text)
                return;
 
-       len = strlen(b->text);
+       len = strlen(text);
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
-       memcpy(buf, b->text, len);
+       memcpy(buf, text, len);
        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 = dc.font.ascent + dc.font.descent;
+       y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+       x = dc.x + (h / 2);
 
        /* shorten text if necessary */
-       while(len && (w = textwidth_l(b->font, buf, len)) > b->rect.width - h)
+       while(len && (w = textnw(&dc.font, buf, len)) > dc.w - h)
                buf[--len] = 0;
 
-       if(w > b->rect.width)
+       if(w > dc.w)
                return; /* too long */
 
-       gcv.foreground = b->color.fg;
-       gcv.background = b->color.bg;
-       if(b->font->set) {
-               XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv);
-               XmbDrawImageString(dpy, b->drawable, b->font->set, b->gc,
+       gcv.foreground = dc.fg;
+       gcv.background = dc.bg;
+       if(dc.font.set) {
+               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
+               XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
                                x, y, buf, len);
        }
        else {
-               gcv.font = b->font->xfont->fid;
-               XChangeGC(dpy, b->gc, GCForeground | GCBackground | GCFont, &gcv);
-               XDrawImageString(dpy, b->drawable, b->gc, x, y, buf, len);
+               gcv.font = dc.font.xfont->fid;
+               XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
+               XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
        }
 }
 
 static unsigned long
-xloadcolor(Display *dpy, Colormap cmap, const char *colstr)
+xinitcolors(Colormap cmap, const char *colstr)
 {
        XColor color;
        XAllocNamedColor(dpy, cmap, colstr, &color, &color);
@@ -84,40 +88,44 @@ xloadcolor(Display *dpy, Colormap cmap, const char *colstr)
 }
 
 void
-loadcolor(Display *dpy, int screen, Color *c,
-               const char *bg, const char *fg, const char *border)
+initcolors(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);
+       dc.bg = xinitcolors(cmap, bg);
+       dc.fg = xinitcolors(cmap, fg);
+       dc.border = xinitcolors(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)
+initfont(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 +136,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,13 +158,14 @@ 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");
                if (!font->xfont)
-                       error("error, cannot load 'fixed' font\n");
+                       error("error, cannot init 'fixed' font\n");
                font->ascent = font->xfont->ascent;
                font->descent = font->xfont->descent;
        }
+       font->height = font->ascent + font->descent;
 }