made Fnt an anonymous struct

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index d747629..145df16 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,171 +1,71 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
+ * (C)opyright MMVI-MMVII Sander van Dijk <a dot h dot vandijk at gmail dot com>

  * See LICENSE file for license details.
  */
  * See LICENSE file for license details.
  */

-
-#include <stdio.h>
-#include <string.h>
-

 #include "dmenu.h"
 #include "dmenu.h"

+#include <string.h>

 
 

-static void
-drawborder(Display *dpy, Brush *b)
-{
-       XPoint points[5];
-       XSetLineAttributes(dpy, b->gc, 1, LineSolid, CapButt, JoinMiter);
-       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[2].y = b->h - 1;
-       points[3].x = -(b->w - 1);
-       points[3].y = 0;
-       points[4].x = 0;
-       points[4].y = -(b->h - 1);
-       XDrawLines(dpy, b->drawable, b->gc, points, 5, CoordModePrevious);
-}
+/* extern */

 
 void
 
 void

-draw(Display *dpy, Brush *b, Bool border, const char *text)
-{
-       unsigned int x, y, w, h, len;
+drawtext(const char *text, unsigned long col[ColLast]) {
+       int x, y, w, h;

        static char buf[256];
        static char buf[256];

+       unsigned int len, olen;

        XGCValues gcv;
        XGCValues gcv;

-       XRectangle r = { b->x, b->y, b->w, b->h };
-
-       XSetForeground(dpy, b->gc, b->bg);
-       XFillRectangles(dpy, b->drawable, b->gc, &r, 1);
-
-       w = 0;
-       if(border)
-               drawborder(dpy, b);
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };

 
 

+       XSetForeground(dpy, dc.gc, col[ColBG]);
+       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        if(!text)
                return;
        if(!text)
                return;

-
-       len = strlen(text);
-       if(len >= sizeof(buf))
-               len = sizeof(buf) - 1;
+       w = 0;
+       olen = len = strlen(text);
+       if(len >= sizeof buf)
+               len = sizeof buf - 1;

        memcpy(buf, text, len);
        buf[len] = 0;
        memcpy(buf, text, len);
        buf[len] = 0;

-
-       h = b->font.ascent + b->font.descent;
-       y = b->y + (b->h / 2) - (h / 2) + b->font.ascent;
-       x = b->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 */
        /* shorten text if necessary */

-       while(len && (w = textnw(&b->font, buf, len)) > b->w - h)
+       while(len && (w = textnw(buf, len)) > dc.w - h)

                buf[--len] = 0;
                buf[--len] = 0;

-
-       if(w > b->w)
+       if(len < olen) {
+               if(len > 1)
+                       buf[len - 1] = '.';
+               if(len > 2)
+                       buf[len - 2] = '.';
+               if(len > 3)
+                       buf[len - 3] = '.';
+       }
+       if(w > dc.w)

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

-
-       gcv.foreground = b->fg;
-       gcv.background = b->bg;
-       if(b->font.set) {
-               XChangeGC(dpy, b->gc, GCForeground | GCBackground, &gcv);
-               XmbDrawImageString(dpy, b->drawable, b->font.set, b->gc,
+       gcv.foreground = col[ColFG];
+       if(dc.font.set) {
+               XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,

                                x, y, buf, len);
        }
        else {
                                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 | GCFont, &gcv);
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);

        }
 }
 
        }
 }
 

-static unsigned long
-xloadcolors(Display *dpy, Colormap cmap, const char *colstr)
-{
-       XColor color;
-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
-       return color.pixel;
-}
-
-void
-loadcolors(Display *dpy, int screen, 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);
-}
-

 unsigned int
 unsigned int

-textnw(Fnt *font, char *text, unsigned int len)
-{
-       XRectangle r;
-       if(font->set) {
-               XmbTextExtents(font->set, text, len, NULL, &r);
-               return r.width;
-       }
-       return XTextWidth(font->xfont, text, len);
+textw(const char *text) {
+       return textnw(text, strlen(text)) + dc.font.height;

 }
 
 unsigned int
 }
 
 unsigned int

-textw(Fnt *font, char *text)
-{
-       return textnw(font, text, strlen(text));
-}
-
-unsigned int
-texth(Fnt *font)
-{
-       return font->height + 4;
-}
-
-void
-loadfont(Display *dpy, Fnt *font, const char *fontstr)
-{
-       char **missing, *def;
-       int n;
-
-       missing = NULL;
-       def = "?";
-       setlocale(LC_ALL, "");
-       if(font->set)
-               XFreeFontSet(dpy, font->set);
-       font->set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-       if(missing) {
-               while(n--)
-                       fprintf(stderr, "missing fontset: %s\n", missing[n]);
-               XFreeStringList(missing);
-               if(font->set) {
-                       XFreeFontSet(dpy, font->set);
-                       font->set = NULL;
-               }
-       }
-       if(font->set) {
-               XFontSetExtents *font_extents;
-               XFontStruct **xfonts;
-               char **font_names;
-               unsigned int i;
+textnw(const char *text, unsigned int len) {
+       XRectangle r;

 
 

-               font->ascent = font->descent = 0;
-               font_extents = XExtentsOfFontSet(font->set);
-               n = XFontsOfFontSet(font->set, &xfonts, &font_names);
-               for(i = 0, font->ascent = 0, font->descent = 0; i < n; i++) {
-                       if(font->ascent < (*xfonts)->ascent)
-                               font->ascent = (*xfonts)->ascent;
-                       if(font->descent < (*xfonts)->descent)
-                               font->descent = (*xfonts)->descent;
-                       xfonts++;
-               }
-       }
-       else {
-               if(font->xfont)
-                       XFreeFont(dpy, font->xfont);
-               font->xfont = NULL;
-               font->xfont = XLoadQueryFont(dpy, fontstr);
-               if (!font->xfont)
-                       font->xfont = XLoadQueryFont(dpy, "fixed");
-               if (!font->xfont)
-                       eprint("error, cannot load 'fixed' font\n");
-               font->ascent = font->xfont->ascent;
-               font->descent = font->xfont->descent;
+       if(dc.font.set) {
+               XmbTextExtents(dc.font.set, text, len, NULL, &r);
+               return r.width;

        }
        }

-       font->height = font->ascent + font->descent;
+       return XTextWidth(dc.font.xfont, text, len);

 }
 }