removed useless newlines

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 4e079e5..14bb801 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dmenu.h"
  * See LICENSE file for license details.
  */
 #include "dmenu.h"


@@ -10,8 +9,7 @@
 /* static */
 
 static unsigned int
 /* static */
 
 static unsigned int

-textnw(const char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {

        XRectangle r;
 
        if(dc.font.set) {
        XRectangle r;
 
        if(dc.font.set) {


@@ -24,65 +22,64 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
 /* extern */
 
 void

-drawtext(const char *text, Bool invert)
-{
+drawtext(const char *text, unsigned long col[ColLast]) {

        int x, y, w, h;
        static char buf[256];
        int x, y, w, h;
        static char buf[256];

-       unsigned int len;
+       unsigned int len, olen;

        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 

-       XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
+       XSetForeground(dpy, dc.gc, col[ColBG]);

        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

-       w = 0;
-

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

-
-       len = strlen(text);
+       w = 0;
+       olen = len = strlen(text);

        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
        buf[len] = 0;
        if(len >= sizeof(buf))
                len = sizeof(buf) - 1;
        memcpy(buf, text, len);
        buf[len] = 0;

-

        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.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 = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;
        /* shorten text if necessary */
        while(len && (w = textnw(buf, len)) > dc.w - h)
                buf[--len] = 0;

-
+       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 */
        if(w > dc.w)
                return; /* too long */

-
-       gcv.foreground = invert ? dc.bg : dc.fg;
-       gcv.background = invert ? dc.fg : dc.bg;
+       gcv.foreground = col[ColFG];

        if(dc.font.set) {
        if(dc.font.set) {

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground, &gcv);
-               XmbDrawImageString(dpy, dc.drawable, dc.font.set, dc.gc,
+               XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc,

                                x, y, buf, len);
        }
        else {
                gcv.font = dc.font.xfont->fid;
                                x, y, buf, len);
        }
        else {
                gcv.font = dc.font.xfont->fid;

-               XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
-               XDrawImageString(dpy, dc.drawable, dc.gc, x, y, buf, len);
+               XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv);
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);

        }
 }
 
 unsigned long
        }
 }
 
 unsigned long

-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {

        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 

-       XAllocNamedColor(dpy, cmap, colstr, &color, &color);
+       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+               eprint("error, cannot allocate color '%s'\n", colstr);

        return color.pixel;
 }
 
 void
        return color.pixel;
 }
 
 void

-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {

        char **missing, *def;
        int i, n;
 
        char **missing, *def;
        int i, n;
 


@@ -102,7 +99,6 @@ setfont(const char *fontstr)
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;

-

                dc.font.ascent = dc.font.descent = 0;
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
                dc.font.ascent = dc.font.descent = 0;
                font_extents = XExtentsOfFontSet(dc.font.set);
                n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);


@@ -130,7 +126,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
 }
 
 unsigned int

-textw(const char *text)
-{
+textw(const char *text) {

        return textnw(text, strlen(text)) + dc.font.height;
 }
        return textnw(text, strlen(text)) + dc.font.height;
 }