Xinqi Bao's Git

projects / dmenu.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Makefile: package config.def.h on make dist
[dmenu.git] / drw.c
diff --git a/drw.c b/drw.c
index 0423873..80e3c39 100644 (file)
--- a/drw.c
+++ b/drw.c
@@ -9,7 +9,7 @@
 #include "util.h"
 
 #define UTF_INVALID 0xFFFD
 #include "util.h"
 
 #define UTF_INVALID 0xFFFD
-#define UTF_SIZ 4
+#define UTF_SIZ     4
 
 static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 
 static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
@@ -17,50 +17,55 @@ static const long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000
 static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
 static long
 static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
 static long
-utf8decodebyte(const char c, size_t *i) {
-       for(*i = 0; *i < (UTF_SIZ + 1); ++(*i))
-               if(((unsigned char)c & utfmask[*i]) == utfbyte[*i])
+utf8decodebyte(const char c, size_t *i)
+{
+       for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
+               if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
                        return (unsigned char)c & ~utfmask[*i];
        return 0;
 }
 
 static size_t
                        return (unsigned char)c & ~utfmask[*i];
        return 0;
 }
 
 static size_t
-utf8validate(long *u, size_t i) {
-       if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
+utf8validate(long *u, size_t i)
+{
+       if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
                *u = UTF_INVALID;
                *u = UTF_INVALID;
-       for(i = 1; *u > utfmax[i]; ++i)
+       for (i = 1; *u > utfmax[i]; ++i)
                ;
        return i;
 }
 
 static size_t
                ;
        return i;
 }
 
 static size_t
-utf8decode(const char *c, long *u, size_t clen) {
+utf8decode(const char *c, long *u, size_t clen)
+{
        size_t i, j, len, type;
        long udecoded;
 
        *u = UTF_INVALID;
        size_t i, j, len, type;
        long udecoded;
 
        *u = UTF_INVALID;
-       if(!clen)
+       if (!clen)
                return 0;
        udecoded = utf8decodebyte(c[0], &len);
                return 0;
        udecoded = utf8decodebyte(c[0], &len);
-       if(!BETWEEN(len, 1, UTF_SIZ))
+       if (!BETWEEN(len, 1, UTF_SIZ))
                return 1;
                return 1;
-       for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+       for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
                udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
                udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
-               if(type != 0)
+               if (type)
                        return j;
        }
                        return j;
        }
-       if(j < len)
+       if (j < len)
                return 0;
        *u = udecoded;
        utf8validate(u, len);
                return 0;
        *u = udecoded;
        utf8validate(u, len);
+
        return len;
 }
 
 Drw *
        return len;
 }
 
 Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) {
-       Drw *drw = (Drw *)calloc(1, sizeof(Drw));
-       if(!drw)
-               return NULL;
+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
+{
+       Drw *drw;
+
+       drw = ecalloc(1, sizeof(Drw));
        drw->dpy = dpy;
        drw->screen = screen;
        drw->root = root;
        drw->dpy = dpy;
        drw->screen = screen;
        drw->root = root;
@@ -70,27 +75,27 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
        drw->gc = XCreateGC(dpy, root, 0, NULL);
        drw->fontcount = 0;
        XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
        drw->gc = XCreateGC(dpy, root, 0, NULL);
        drw->fontcount = 0;
        XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
+
        return drw;
 }
 
 void
        return drw;
 }
 
 void
-drw_resize(Drw *drw, unsigned int w, unsigned int h) {
-       if(!drw)
-               return;
+drw_resize(Drw *drw, unsigned int w, unsigned int h)
+{
        drw->w = w;
        drw->h = h;
        drw->w = w;
        drw->h = h;
-       if(drw->drawable != 0)
+       if (drw->drawable)
                XFreePixmap(drw->dpy, drw->drawable);
        drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
 }
 
 void
                XFreePixmap(drw->dpy, drw->drawable);
        drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
 }
 
 void
-drw_free(Drw *drw) {
+drw_free(Drw *drw)
+{
        size_t i;
 
        size_t i;
 
-       for (i = 0; i < drw->fontcount; i++) {
+       for (i = 0; i < drw->fontcount; i++)
                drw_font_free(drw->fonts[i]);
                drw_font_free(drw->fonts[i]);
-       }
        XFreePixmap(drw->dpy, drw->drawable);
        XFreeGC(drw->dpy, drw->gc);
        free(drw);
        XFreePixmap(drw->dpy, drw->drawable);
        XFreeGC(drw->dpy, drw->gc);
        free(drw);
@@ -100,14 +105,11 @@ drw_free(Drw *drw) {
  * drw_font_create instead.
  */
 static Fnt *
  * drw_font_create instead.
  */
 static Fnt *
-drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) {
+drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
+{
        Fnt *font;
        Fnt *font;
-
-       if (!(fontname || fontpattern))
-               die("No font specified.\n");
-
-       if (!(font = (Fnt *)calloc(1, sizeof(Fnt))))
-               return NULL;
+       XftFont *xfont = NULL;
+       FcPattern *pattern = NULL;
 
        if (fontname) {
                /* Using the pattern found at font->xfont->pattern does not yield same
 
        if (fontname) {
                /* Using the pattern found at font->xfont->pattern does not yield same
@@ -116,41 +118,44 @@ drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) {
                 * behaviour whereas the former just results in
                 * missing-character-rectangles being drawn, at least with some fonts.
                 */
                 * behaviour whereas the former just results in
                 * missing-character-rectangles being drawn, at least with some fonts.
                 */
-               if (!(font->xfont = XftFontOpenName(drw->dpy, drw->screen, fontname)) ||
-                   !(font->pattern = FcNameParse((FcChar8 *) fontname))) {
-                       if (font->xfont) {
-                               XftFontClose(drw->dpy, font->xfont);
-                               font->xfont = NULL;
-                       }
+               if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
+                       fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
+                       return NULL;
+               }
+               if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
                        fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
                        fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
+                       XftFontClose(drw->dpy, xfont);
+                       return NULL;
                }
        } else if (fontpattern) {
                }
        } else if (fontpattern) {
-               if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
+               if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
                        fprintf(stderr, "error, cannot load font pattern.\n");
                        fprintf(stderr, "error, cannot load font pattern.\n");
-               } else {
-                       font->pattern = NULL;
+                       return NULL;
                }
                }
+       } else {
+               die("no font specified.\n");
        }
 
        }
 
-       if (!font->xfont) {
-               free(font);
-               return NULL;
-       }
-
-       font->ascent = font->xfont->ascent;
-       font->descent = font->xfont->descent;
+       font = ecalloc(1, sizeof(Fnt));
+       font->xfont = xfont;
+       font->pattern = pattern;
+       font->ascent = xfont->ascent;
+       font->descent = xfont->descent;
        font->h = font->ascent + font->descent;
        font->dpy = drw->dpy;
        font->h = font->ascent + font->descent;
        font->dpy = drw->dpy;
+
        return font;
 }
 
 Fnt*
        return font;
 }
 
 Fnt*
-drw_font_create(Drw *drw, const char *fontname) {
+drw_font_create(Drw *drw, const char *fontname)
+{
        return drw_font_xcreate(drw, fontname, NULL);
 }
 
 void
        return drw_font_xcreate(drw, fontname, NULL);
 }
 
 void
-drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) {
+drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount)
+{
        size_t i;
        Fnt *font;
 
        size_t i;
        Fnt *font;
 
@@ -164,65 +169,62 @@ drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) {
 }
 
 void
 }
 
 void
-drw_font_free(Fnt *font) {
-       if(!font)
+drw_font_free(Fnt *font)
+{
+       if (!font)
                return;
                return;
-       if(font->pattern)
+       if (font->pattern)
                FcPatternDestroy(font->pattern);
        XftFontClose(font->dpy, font->xfont);
        free(font);
 }
 
 Clr *
                FcPatternDestroy(font->pattern);
        XftFontClose(font->dpy, font->xfont);
        free(font);
 }
 
 Clr *
-drw_clr_create(Drw *drw, const char *clrname) {
+drw_clr_create(Drw *drw, const char *clrname)
+{
        Clr *clr;
        Clr *clr;
-       Colormap cmap;
-       Visual *vis;
-
-       if(!drw)
-               return NULL;
-       clr = (Clr *)calloc(1, sizeof(Clr));
-       if(!clr)
-               return NULL;
-       cmap = DefaultColormap(drw->dpy, drw->screen);
-       vis = DefaultVisual(drw->dpy, drw->screen);
-       if(!XftColorAllocName(drw->dpy, vis, cmap, clrname, &clr->rgb))
+
+       clr = ecalloc(1, sizeof(Clr));
+       if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
+                              DefaultColormap(drw->dpy, drw->screen),
+                              clrname, &clr->rgb))
                die("error, cannot allocate color '%s'\n", clrname);
        clr->pix = clr->rgb.pixel;
                die("error, cannot allocate color '%s'\n", clrname);
        clr->pix = clr->rgb.pixel;
+
        return clr;
 }
 
 void
        return clr;
 }
 
 void
-drw_clr_free(Clr *clr) {
+drw_clr_free(Clr *clr)
+{
        free(clr);
 }
 
 void
        free(clr);
 }
 
 void
-drw_setscheme(Drw *drw, ClrScheme *scheme) {
-       if(!drw)
-               return;
+drw_setscheme(Drw *drw, ClrScheme *scheme)
+{
        drw->scheme = scheme;
 }
 
 void
        drw->scheme = scheme;
 }
 
 void
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) {
-       if(!drw || !drw->scheme)
+drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
+{
+       if (!drw->scheme)
                return;
        XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
                return;
        XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
-       if(filled)
+       if (filled)
                XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
                XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
-       else if(empty)
+       else if (empty)
                XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
 }
 
 int
                XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
 }
 
 int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) {
+drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert)
+{
        char buf[1024];
        int tx, ty, th;
        Extnts tex;
        char buf[1024];
        int tx, ty, th;
        Extnts tex;
-       Colormap cmap;
-       Visual *vis;
-       XftDraw *d;
+       XftDraw *d = NULL;
        Fnt *curfont, *nextfont;
        size_t i, len;
        int utf8strlen, utf8charlen, render;
        Fnt *curfont, *nextfont;
        size_t i, len;
        int utf8strlen, utf8charlen, render;
@@ -234,23 +236,18 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
        XftResult result;
        int charexists = 0;
 
        XftResult result;
        int charexists = 0;
 
+       if (!drw->scheme || !drw->fontcount)
+               return 0;
+
        if (!(render = x || y || w || h)) {
                w = ~w;
        if (!(render = x || y || w || h)) {
                w = ~w;
-       }
-
-       if (!drw || !drw->scheme) {
-               return 0;
-       } else if (render) {
-               XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->pix : drw->scheme->bg->pix);
+       } else {
+               XSetForeground(drw->dpy, drw->gc, invert ?
+                              drw->scheme->fg->pix : drw->scheme->bg->pix);
                XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
                XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-       }
-
-       if (!text || !drw->fontcount) {
-               return 0;
-       } else if (render) {
-               cmap = DefaultColormap(drw->dpy, drw->screen);
-               vis = DefaultVisual(drw->dpy, drw->screen);
-               d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap);
+               d = XftDrawCreate(drw->dpy, drw->drawable,
+                                 DefaultVisual(drw->dpy, drw->screen),
+                                 DefaultColormap(drw->dpy, drw->screen));
        }
 
        curfont = drw->fonts[0];
        }
 
        curfont = drw->fonts[0];
@@ -273,24 +270,23 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
                                }
                        }
 
                                }
                        }
 
-                       if (!charexists || (nextfont && nextfont != curfont)) {
+                       if (!charexists || (nextfont && nextfont != curfont))
                                break;
                                break;
-                       } else {
+                       else
                                charexists = 0;
                                charexists = 0;
-                       }
                }
 
                if (utf8strlen) {
                        drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
                        /* shorten text if necessary */
                }
 
                if (utf8strlen) {
                        drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
                        /* shorten text if necessary */
-                       for(len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
+                       for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
                                drw_font_getexts(curfont, utf8str, len, &tex);
 
                        if (len) {
                                memcpy(buf, utf8str, len);
                                buf[len] = '\0';
                                drw_font_getexts(curfont, utf8str, len, &tex);
 
                        if (len) {
                                memcpy(buf, utf8str, len);
                                buf[len] = '\0';
-                               if(len < utf8strlen)
-                                       for(i = len; i && i > len - 3; buf[--i] = '.');
+                               if (len < utf8strlen)
+                                       for (i = len; i && i > len - 3; buf[--i] = '.');
 
                                if (render) {
                                        th = curfont->ascent + curfont->descent;
 
                                if (render) {
                                        th = curfont->ascent + curfont->descent;
@@ -298,7 +294,6 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
                                        tx = x + (h / 2);
                                        XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
                                }
                                        tx = x + (h / 2);
                                        XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
                                }
-
                                x += tex.w;
                                w -= tex.w;
                        }
                                x += tex.w;
                                w -= tex.w;
                        }
@@ -315,18 +310,16 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
                         */
                        charexists = 1;
 
                         */
                        charexists = 1;
 
-                       if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
+                       if (drw->fontcount >= DRW_FONT_CACHE_SIZE)
                                continue;
                                continue;
-                       }
 
                        fccharset = FcCharSetCreate();
                        FcCharSetAddChar(fccharset, utf8codepoint);
 
                        if (!drw->fonts[0]->pattern) {
                                /* Refer to the comment in drw_font_xcreate for more
 
                        fccharset = FcCharSetCreate();
                        FcCharSetAddChar(fccharset, utf8codepoint);
 
                        if (!drw->fonts[0]->pattern) {
                                /* Refer to the comment in drw_font_xcreate for more
-                                * information.
-                                */
-                               die("The first font in the cache must be loaded from a font string.\n");
+                                * information. */
+                               die("the first font in the cache must be loaded from a font string.\n");
                        }
 
                        fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
                        }
 
                        fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
@@ -345,68 +338,60 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
                                if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
                                        drw->fonts[drw->fontcount++] = curfont;
                                } else {
                                if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
                                        drw->fonts[drw->fontcount++] = curfont;
                                } else {
-                                       if (curfont) {
-                                               drw_font_free(curfont);
-                                       }
+                                       drw_font_free(curfont);
                                        curfont = drw->fonts[0];
                                }
                        }
                }
        }
                                        curfont = drw->fonts[0];
                                }
                        }
                }
        }
-
-       if (render) {
+       if (d)
                XftDrawDestroy(d);
                XftDrawDestroy(d);
-       }
 
        return x;
 }
 
 void
 
        return x;
 }
 
 void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) {
-       if(!drw)
-               return;
+drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
+{
        XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
        XSync(drw->dpy, False);
 }
 
        XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
        XSync(drw->dpy, False);
 }
 
-
 void
 void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex) {
+drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
+{
        XGlyphInfo ext;
 
        XGlyphInfo ext;
 
-       if(!font || !text)
-               return;
        XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
        tex->h = font->h;
        tex->w = ext.xOff;
 }
 
 unsigned int
        XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
        tex->h = font->h;
        tex->w = ext.xOff;
 }
 
 unsigned int
-drw_font_getexts_width(Fnt *font, const char *text, unsigned int len) {
+drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
+{
        Extnts tex;
 
        Extnts tex;
 
-       if(!font)
-               return -1;
        drw_font_getexts(font, text, len, &tex);
        drw_font_getexts(font, text, len, &tex);
+
        return tex.w;
 }
 
 Cur *
        return tex.w;
 }
 
 Cur *
-drw_cur_create(Drw *drw, int shape) {
+drw_cur_create(Drw *drw, int shape)
+{
        Cur *cur;
 
        Cur *cur;
 
-       if(!drw)
-               return NULL;
-       cur = (Cur *)calloc(1, sizeof(Cur));
-       if (!cur)
-               return NULL;
+       cur = ecalloc(1, sizeof(Cur));
        cur->cursor = XCreateFontCursor(drw->dpy, shape);
        cur->cursor = XCreateFontCursor(drw->dpy, shape);
+
        return cur;
 }
 
 void
        return cur;
 }
 
 void
-drw_cur_free(Drw *drw, Cur *cursor) {
-       if(!drw || !cursor)
+drw_cur_free(Drw *drw, Cur *cursor)
+{
+       if (!cursor)
                return;
        XFreeCursor(drw->dpy, cursor->cursor);
        free(cursor);
                return;
        XFreeCursor(drw->dpy, cursor->cursor);
        free(cursor);