it* My version of sent Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/sent-sdk.git URL:git://git.codevoid.de/sent-sdk.git codevoid.de 70 1Log /git/sent-sdk/log.gph codevoid.de 70 1Files /git/sent-sdk/files.gph codevoid.de 70 1Refs /git/sent-sdk/refs.gph codevoid.de 70 1README /git/sent-sdk/file/README.md.gph codevoid.de 70 1LICENSE /git/sent-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 27a904c1dd40d185dd5123ca354f6080e853ec92 /git/sent-sdk/commit/27a904c1dd40d185dd5123ca354f6080e853ec92.gph codevoid.de 70 1parent 268d1968ea951b3eb2d1411a9e0d7c0fcb23217b /git/sent-sdk/commit/268d1968ea951b3eb2d1411a9e0d7c0fcb23217b.gph codevoid.de 70 hAuthor: Markus Teich URL:mailto:markus.teich@stusta.mhn.de codevoid.de 70 iDate: Sat, 21 May 2016 21:39:58 +0200 Err codevoid.de 70 i Err codevoid.de 70 iimport new drw and util from libsl. Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M config.def.h | 6 ++++-- Err codevoid.de 70 i M drw.c | 310 ++++++++++++++++--------------- Err codevoid.de 70 i M drw.h | 28 ++++++++++------------------ Err codevoid.de 70 i M sent.c | 85 ++++++++++++------------------- Err codevoid.de 70 i M util.c | 24 ++++++++++++++++++++---- Err codevoid.de 70 i M util.h | 3 ++- Err codevoid.de 70 i Err codevoid.de 70 i6 files changed, 227 insertions(+), 229 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/config.def.h b/config.def.h /git/sent-sdk/file/config.def.h.gph codevoid.de 70 it@@ -8,8 +8,10 @@ static char *fontfallbacks[] = { Err codevoid.de 70 i #define NUMFONTSCALES 42 Err codevoid.de 70 i #define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */ Err codevoid.de 70 i Err codevoid.de 70 i-static const char *fgcol = "#000000"; Err codevoid.de 70 i-static const char *bgcol = "#FFFFFF"; Err codevoid.de 70 i+static const char *colors[] = { Err codevoid.de 70 i+ "#000000", /* foreground color */ Err codevoid.de 70 i+ "#FFFFFF", /* background color */ Err codevoid.de 70 i+}; Err codevoid.de 70 i Err codevoid.de 70 i static const float linespacing = 1.4; Err codevoid.de 70 i Err codevoid.de 70 1diff --git a/drw.c b/drw.c /git/sent-sdk/file/drw.c.gph codevoid.de 70 it@@ -9,9 +9,7 @@ Err codevoid.de 70 i #include "util.h" Err codevoid.de 70 i Err codevoid.de 70 i #define UTF_INVALID 0xFFFD Err codevoid.de 70 i-#define UTF_SIZ 4 Err codevoid.de 70 i- Err codevoid.de 70 i-static void drw_xfont_free(Fnt *font); Err codevoid.de 70 i+#define UTF_SIZ 4 Err codevoid.de 70 i Err codevoid.de 70 i static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; Err codevoid.de 70 i static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; Err codevoid.de 70 it@@ -19,50 +17,54 @@ static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000 Err codevoid.de 70 i static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; Err codevoid.de 70 i Err codevoid.de 70 i static long Err codevoid.de 70 i-utf8decodebyte(const char c, size_t *i) { Err codevoid.de 70 i- for(*i = 0; *i < (UTF_SIZ + 1); ++(*i)) Err codevoid.de 70 i- if(((unsigned char)c & utfmask[*i]) == utfbyte[*i]) Err codevoid.de 70 i+utf8decodebyte(const char c, size_t *i) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) Err codevoid.de 70 i+ if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) Err codevoid.de 70 i return (unsigned char)c & ~utfmask[*i]; Err codevoid.de 70 i return 0; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i static size_t Err codevoid.de 70 i-utf8validate(long *u, size_t i) { Err codevoid.de 70 i- if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) Err codevoid.de 70 i+utf8validate(long *u, size_t i) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) Err codevoid.de 70 i *u = UTF_INVALID; Err codevoid.de 70 i- for(i = 1; *u > utfmax[i]; ++i) Err codevoid.de 70 i+ for (i = 1; *u > utfmax[i]; ++i) Err codevoid.de 70 i ; Err codevoid.de 70 i return i; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i static size_t Err codevoid.de 70 i-utf8decode(const char *c, long *u, size_t clen) { Err codevoid.de 70 i+utf8decode(const char *c, long *u, size_t clen) Err codevoid.de 70 i+{ Err codevoid.de 70 i size_t i, j, len, type; Err codevoid.de 70 i long udecoded; Err codevoid.de 70 i Err codevoid.de 70 i *u = UTF_INVALID; Err codevoid.de 70 i- if(!clen) Err codevoid.de 70 i+ if (!clen) Err codevoid.de 70 i return 0; Err codevoid.de 70 i udecoded = utf8decodebyte(c[0], &len); Err codevoid.de 70 i- if(!BETWEEN(len, 1, UTF_SIZ)) Err codevoid.de 70 i+ if (!BETWEEN(len, 1, UTF_SIZ)) Err codevoid.de 70 i return 1; Err codevoid.de 70 i- for(i = 1, j = 1; i < clen && j < len; ++i, ++j) { Err codevoid.de 70 i+ for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { Err codevoid.de 70 i udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); Err codevoid.de 70 i- if(type != 0) Err codevoid.de 70 i+ if (type) Err codevoid.de 70 i return j; Err codevoid.de 70 i } Err codevoid.de 70 i- if(j < len) Err codevoid.de 70 i+ if (j < len) Err codevoid.de 70 i return 0; Err codevoid.de 70 i *u = udecoded; Err codevoid.de 70 i utf8validate(u, len); Err codevoid.de 70 i+ Err codevoid.de 70 i return len; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i Drw * Err codevoid.de 70 i-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) { Err codevoid.de 70 i- Drw *drw = (Drw *)calloc(1, sizeof(Drw)); Err codevoid.de 70 i- if(!drw) Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ Drw *drw = ecalloc(1, sizeof(Drw)); Err codevoid.de 70 i+ Err codevoid.de 70 i drw->dpy = dpy; Err codevoid.de 70 i drw->screen = screen; Err codevoid.de 70 i drw->root = root; Err codevoid.de 70 it@@ -71,22 +73,26 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h Err codevoid.de 70 i drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); Err codevoid.de 70 i drw->gc = XCreateGC(dpy, root, 0, NULL); Err codevoid.de 70 i XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); Err codevoid.de 70 i+ Err codevoid.de 70 i return drw; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_resize(Drw *drw, unsigned int w, unsigned int h) { Err codevoid.de 70 i- if(!drw) Err codevoid.de 70 i+drw_resize(Drw *drw, unsigned int w, unsigned int h) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (!drw) Err codevoid.de 70 i return; Err codevoid.de 70 i+ Err codevoid.de 70 i drw->w = w; Err codevoid.de 70 i drw->h = h; Err codevoid.de 70 i- if(drw->drawable != 0) Err codevoid.de 70 i+ if (drw->drawable) Err codevoid.de 70 i XFreePixmap(drw->dpy, drw->drawable); Err codevoid.de 70 i drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_free(Drw *drw) { Err codevoid.de 70 i+drw_free(Drw *drw) Err codevoid.de 70 i+{ Err codevoid.de 70 i XFreePixmap(drw->dpy, drw->drawable); Err codevoid.de 70 i XFreeGC(drw->dpy, drw->gc); Err codevoid.de 70 i free(drw); Err codevoid.de 70 it@@ -96,119 +102,123 @@ drw_free(Drw *drw) { Err codevoid.de 70 i * drw_fontset_create instead. Err codevoid.de 70 i */ Err codevoid.de 70 i static Fnt * Err codevoid.de 70 i-drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) { Err codevoid.de 70 i+xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) Err codevoid.de 70 i+{ Err codevoid.de 70 i Fnt *font; Err codevoid.de 70 i- Err codevoid.de 70 i- if (!(fontname || fontpattern)) Err codevoid.de 70 i- die("No font specified.\n"); Err codevoid.de 70 i- Err codevoid.de 70 i- if (!(font = (Fnt *)calloc(1, sizeof(Fnt)))) Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i+ XftFont *xfont = NULL; Err codevoid.de 70 i+ FcPattern *pattern = NULL; Err codevoid.de 70 i Err codevoid.de 70 i if (fontname) { Err codevoid.de 70 i /* Using the pattern found at font->xfont->pattern does not yield the Err codevoid.de 70 i * same substitution results as using the pattern returned by Err codevoid.de 70 i * FcNameParse; using the latter results in the desired fallback Err codevoid.de 70 i- * behaviour whereas the former just results in Err codevoid.de 70 i- * missing-character-rectangles being drawn, at least with some fonts. Err codevoid.de 70 i- */ Err codevoid.de 70 i- if (!(font->xfont = XftFontOpenName(drw->dpy, drw->screen, fontname)) || Err codevoid.de 70 i- !(font->pattern = FcNameParse((const FcChar8 *) fontname))) { Err codevoid.de 70 i- if (font->xfont) { Err codevoid.de 70 i- XftFontClose(drw->dpy, font->xfont); Err codevoid.de 70 i- font->xfont = NULL; Err codevoid.de 70 i- } Err codevoid.de 70 i- fprintf(stderr, "error, cannot load font: '%s'\n", fontname); Err codevoid.de 70 i+ * behaviour whereas the former just results in missing-character Err codevoid.de 70 i+ * rectangles being drawn, at least with some fonts. */ Err codevoid.de 70 i+ if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) { Err codevoid.de 70 i+ fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname); Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i+ } Err codevoid.de 70 i+ if (!(pattern = FcNameParse((FcChar8 *) fontname))) { Err codevoid.de 70 i+ fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname); Err codevoid.de 70 i+ XftFontClose(drw->dpy, xfont); Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i } Err codevoid.de 70 i } else if (fontpattern) { Err codevoid.de 70 i- if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { Err codevoid.de 70 i- fprintf(stderr, "error, cannot load font pattern.\n"); Err codevoid.de 70 i- } else { Err codevoid.de 70 i- font->pattern = NULL; Err codevoid.de 70 i+ if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) { Err codevoid.de 70 i+ fprintf(stderr, "error, cannot load font from pattern.\n"); Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i } Err codevoid.de 70 i+ } else { Err codevoid.de 70 i+ die("no font specified.\n"); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i- if (!font->xfont) { Err codevoid.de 70 i- free(font); Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i- } Err codevoid.de 70 i- Err codevoid.de 70 i- font->ascent = font->xfont->ascent; Err codevoid.de 70 i- font->descent = font->xfont->descent; Err codevoid.de 70 i- font->h = font->ascent + font->descent; Err codevoid.de 70 i+ font = ecalloc(1, sizeof(Fnt)); Err codevoid.de 70 i+ font->xfont = xfont; Err codevoid.de 70 i+ font->pattern = pattern; Err codevoid.de 70 i+ font->h = xfont->ascent + xfont->descent; Err codevoid.de 70 i font->dpy = drw->dpy; Err codevoid.de 70 i+ Err codevoid.de 70 i return font; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-void Err codevoid.de 70 i-drw_xfont_free(Fnt *font) { Err codevoid.de 70 i- if(!font) Err codevoid.de 70 i+static void Err codevoid.de 70 i+xfont_free(Fnt *font) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (!font) Err codevoid.de 70 i return; Err codevoid.de 70 i- if(font->pattern) Err codevoid.de 70 i+ if (font->pattern) Err codevoid.de 70 i FcPatternDestroy(font->pattern); Err codevoid.de 70 i XftFontClose(font->dpy, font->xfont); Err codevoid.de 70 i free(font); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i Fnt* Err codevoid.de 70 i-drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) { Err codevoid.de 70 i- Fnt *ret = NULL; Err codevoid.de 70 i- Fnt *cur = NULL; Err codevoid.de 70 i- ssize_t i; Err codevoid.de 70 i- for (i = fontcount - 1; i >= 0; i--) { Err codevoid.de 70 i- if ((cur = drw_font_xcreate(drw, fonts[i], NULL))) { Err codevoid.de 70 i+drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ Fnt *cur, *ret = NULL; Err codevoid.de 70 i+ size_t i; Err codevoid.de 70 i+ Err codevoid.de 70 i+ if (!drw || !fonts) Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i+ Err codevoid.de 70 i+ for (i = 1; i <= fontcount; i++) { Err codevoid.de 70 i+ if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) { Err codevoid.de 70 i cur->next = ret; Err codevoid.de 70 i ret = cur; Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i- return ret; Err codevoid.de 70 i+ return (drw->fonts = ret); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_fontset_free(Fnt *font) { Err codevoid.de 70 i- Fnt *nf = font; Err codevoid.de 70 i- Err codevoid.de 70 i- while ((font = nf)) { Err codevoid.de 70 i- nf = font->next; Err codevoid.de 70 i- drw_xfont_free(font); Err codevoid.de 70 i+drw_fontset_free(Fnt *font) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (font) { Err codevoid.de 70 i+ drw_fontset_free(font->next); Err codevoid.de 70 i+ xfont_free(font); Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-Scm * Err codevoid.de 70 i-drw_scm_create(Drw *drw, const char *fgname, const char *bgname) { Err codevoid.de 70 i- Scm *scm; Err codevoid.de 70 i- Colormap cmap; Err codevoid.de 70 i- Visual *vis; Err codevoid.de 70 i- Err codevoid.de 70 i- if (!drw || !(scm = (Scm *)calloc(1, sizeof(Scm)))) Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i+void Err codevoid.de 70 i+drw_clr_create(Drw *drw, Clr *dest, const char *clrname) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (!drw || !dest || !clrname) Err codevoid.de 70 i+ return; Err codevoid.de 70 i Err codevoid.de 70 i- cmap = DefaultColormap(drw->dpy, drw->screen); Err codevoid.de 70 i- vis = DefaultVisual(drw->dpy, drw->screen); Err codevoid.de 70 i- if (!XftColorAllocName(drw->dpy, vis, cmap, fgname, &scm->fg.rgb)) Err codevoid.de 70 i- die("error, cannot allocate color '%s'\n", fgname); Err codevoid.de 70 i- if (!XftColorAllocName(drw->dpy, vis, cmap, bgname, &scm->bg.rgb)) Err codevoid.de 70 i- die("error, cannot allocate color '%s'\n", bgname); Err codevoid.de 70 i- scm->fg.pix = scm->fg.rgb.pixel; Err codevoid.de 70 i- scm->bg.pix = scm->bg.rgb.pixel; Err codevoid.de 70 i- return scm; Err codevoid.de 70 i+ if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), Err codevoid.de 70 i+ DefaultColormap(drw->dpy, drw->screen), Err codevoid.de 70 i+ clrname, dest)) Err codevoid.de 70 i+ die("error, cannot allocate color '%s'\n", clrname); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-void Err codevoid.de 70 i-drw_scm_free(Scm *scm) { Err codevoid.de 70 i- if (scm) Err codevoid.de 70 i- free(scm); Err codevoid.de 70 i+/* Wrapper to create color schemes. The caller has to call free(3) on the Err codevoid.de 70 i+ * returned color scheme when done using it. */ Err codevoid.de 70 i+Clr * Err codevoid.de 70 i+drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ size_t i; Err codevoid.de 70 i+ Clr *ret; Err codevoid.de 70 i+ Err codevoid.de 70 i+ /* need at least two colors for a scheme */ Err codevoid.de 70 i+ if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i+ Err codevoid.de 70 i+ for (i = 0; i < clrcount; i++) Err codevoid.de 70 i+ drw_clr_create(drw, &ret[i], clrnames[i]); Err codevoid.de 70 i+ return ret; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_setfontset(Drw *drw, Fnt *set) { Err codevoid.de 70 i+drw_setfontset(Drw *drw, Fnt *set) Err codevoid.de 70 i+{ Err codevoid.de 70 i if (drw) Err codevoid.de 70 i drw->fonts = set; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_setscheme(Drw *drw, Scm *scm) { Err codevoid.de 70 i- if (drw && scm) Err codevoid.de 70 i+drw_setscheme(Drw *drw, Clr *scm) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (drw) Err codevoid.de 70 i drw->scheme = scm; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 it@@ -217,24 +227,23 @@ drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int Err codevoid.de 70 i { Err codevoid.de 70 i if (!drw || !drw->scheme) Err codevoid.de 70 i return; Err codevoid.de 70 i- XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg.pix : drw->scheme->fg.pix); Err codevoid.de 70 i+ XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); Err codevoid.de 70 i if (filled) Err codevoid.de 70 i XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); Err codevoid.de 70 i else Err codevoid.de 70 i- XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); Err codevoid.de 70 i+ XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i int Err codevoid.de 70 i-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) { Err codevoid.de 70 i+drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) Err codevoid.de 70 i+{ Err codevoid.de 70 i char buf[1024]; Err codevoid.de 70 i- int tx, ty, th; Err codevoid.de 70 i- unsigned int ew = 0; Err codevoid.de 70 i- Colormap cmap; Err codevoid.de 70 i- Visual *vis; Err codevoid.de 70 i- XftDraw *d; Err codevoid.de 70 i+ int ty; Err codevoid.de 70 i+ unsigned int ew; Err codevoid.de 70 i+ XftDraw *d = NULL; Err codevoid.de 70 i Fnt *usedfont, *curfont, *nextfont; Err codevoid.de 70 i size_t i, len; Err codevoid.de 70 i- int utf8strlen, utf8charlen, render; Err codevoid.de 70 i+ int utf8strlen, utf8charlen, render = x || y || w || h; Err codevoid.de 70 i long utf8codepoint = 0; Err codevoid.de 70 i const char *utf8str; Err codevoid.de 70 i FcCharSet *fccharset; Err codevoid.de 70 it@@ -243,23 +252,19 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex Err codevoid.de 70 i XftResult result; Err codevoid.de 70 i int charexists = 0; Err codevoid.de 70 i Err codevoid.de 70 i- if (!(render = x || y || w || h)) { Err codevoid.de 70 i- w = ~w; Err codevoid.de 70 i- } Err codevoid.de 70 i- Err codevoid.de 70 i- if (!drw || !drw->scheme) { Err codevoid.de 70 i+ if (!drw || (render && !drw->scheme) || !text || !drw->fonts) Err codevoid.de 70 i return 0; Err codevoid.de 70 i- } else if (render) { Err codevoid.de 70 i- XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg.pix : drw->scheme->bg.pix); Err codevoid.de 70 i- XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); Err codevoid.de 70 i- } Err codevoid.de 70 i Err codevoid.de 70 i- if (!text || !drw->fonts) { Err codevoid.de 70 i- return 0; Err codevoid.de 70 i- } else if (render) { Err codevoid.de 70 i- cmap = DefaultColormap(drw->dpy, drw->screen); Err codevoid.de 70 i- vis = DefaultVisual(drw->dpy, drw->screen); Err codevoid.de 70 i- d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap); Err codevoid.de 70 i+ if (!render) { Err codevoid.de 70 i+ w = ~w; Err codevoid.de 70 i+ } else { Err codevoid.de 70 i+ XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); Err codevoid.de 70 i+ XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); Err codevoid.de 70 i+ d = XftDrawCreate(drw->dpy, drw->drawable, Err codevoid.de 70 i+ DefaultVisual(drw->dpy, drw->screen), Err codevoid.de 70 i+ DefaultColormap(drw->dpy, drw->screen)); Err codevoid.de 70 i+ x += lpad; Err codevoid.de 70 i+ w -= lpad; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i usedfont = drw->fonts; Err codevoid.de 70 it@@ -282,32 +287,30 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i- if (!charexists || nextfont) { Err codevoid.de 70 i+ if (!charexists || nextfont) Err codevoid.de 70 i break; Err codevoid.de 70 i- } else { Err codevoid.de 70 i+ else Err codevoid.de 70 i charexists = 0; Err codevoid.de 70 i- } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i if (utf8strlen) { Err codevoid.de 70 i drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL); Err codevoid.de 70 i /* shorten text if necessary */ Err codevoid.de 70 i- for(len = MIN(utf8strlen, (sizeof buf) - 1); len && (ew > w - drw->fonts->h || w < drw->fonts->h); len--) Err codevoid.de 70 i+ for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) Err codevoid.de 70 i drw_font_getexts(usedfont, utf8str, len, &ew, NULL); Err codevoid.de 70 i Err codevoid.de 70 i if (len) { Err codevoid.de 70 i memcpy(buf, utf8str, len); Err codevoid.de 70 i buf[len] = '\0'; Err codevoid.de 70 i- if(len < utf8strlen) Err codevoid.de 70 i- for(i = len; i && i > len - 3; buf[--i] = '.'); Err codevoid.de 70 i+ if (len < utf8strlen) Err codevoid.de 70 i+ for (i = len; i && i > len - 3; buf[--i] = '.') Err codevoid.de 70 i+ ; /* NOP */ Err codevoid.de 70 i Err codevoid.de 70 i if (render) { Err codevoid.de 70 i- th = usedfont->ascent + usedfont->descent; Err codevoid.de 70 i- ty = y + (h / 2) - (th / 2) + usedfont->ascent; Err codevoid.de 70 i- tx = x + (h / 2); Err codevoid.de 70 i- XftDrawStringUtf8(d, invert ? &drw->scheme->bg.rgb : &drw->scheme->fg.rgb, usedfont->xfont, tx, ty, (XftChar8 *)buf, len); Err codevoid.de 70 i+ ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; Err codevoid.de 70 i+ XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], Err codevoid.de 70 i+ usedfont->xfont, x, ty, (XftChar8 *)buf, len); Err codevoid.de 70 i } Err codevoid.de 70 i- Err codevoid.de 70 i x += ew; Err codevoid.de 70 i w -= ew; Err codevoid.de 70 i } Err codevoid.de 70 it@@ -320,18 +323,15 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex Err codevoid.de 70 i usedfont = nextfont; Err codevoid.de 70 i } else { Err codevoid.de 70 i /* Regardless of whether or not a fallback font is found, the Err codevoid.de 70 i- * character must be drawn. Err codevoid.de 70 i- */ Err codevoid.de 70 i+ * character must be drawn. */ Err codevoid.de 70 i charexists = 1; Err codevoid.de 70 i Err codevoid.de 70 i fccharset = FcCharSetCreate(); Err codevoid.de 70 i FcCharSetAddChar(fccharset, utf8codepoint); Err codevoid.de 70 i Err codevoid.de 70 i if (!drw->fonts->pattern) { Err codevoid.de 70 i- /* Refer to the comment in drw_font_xcreate for more Err codevoid.de 70 i- * information. Err codevoid.de 70 i- */ Err codevoid.de 70 i- die("The first font in the cache must be loaded from a font string.\n"); Err codevoid.de 70 i+ /* Refer to the comment in xfont_create for more information. */ Err codevoid.de 70 i+ die("the first font in the cache must be loaded from a font string.\n"); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i fcpattern = FcPatternDuplicate(drw->fonts->pattern); Err codevoid.de 70 it@@ -346,47 +346,50 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex Err codevoid.de 70 i FcPatternDestroy(fcpattern); Err codevoid.de 70 i Err codevoid.de 70 i if (match) { Err codevoid.de 70 i- usedfont = drw_font_xcreate(drw, NULL, match); Err codevoid.de 70 i+ usedfont = xfont_create(drw, NULL, match); Err codevoid.de 70 i if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { Err codevoid.de 70 i for (curfont = drw->fonts; curfont->next; curfont = curfont->next) Err codevoid.de 70 i- ; /* just find the end of the linked list */ Err codevoid.de 70 i+ ; /* NOP */ Err codevoid.de 70 i curfont->next = usedfont; Err codevoid.de 70 i } else { Err codevoid.de 70 i- drw_xfont_free(usedfont); Err codevoid.de 70 i+ xfont_free(usedfont); Err codevoid.de 70 i usedfont = drw->fonts; Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i- Err codevoid.de 70 i- if (render) { Err codevoid.de 70 i+ if (d) Err codevoid.de 70 i XftDrawDestroy(d); Err codevoid.de 70 i- } Err codevoid.de 70 i Err codevoid.de 70 i- return x; Err codevoid.de 70 i+ return x + (render ? w : 0); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) { Err codevoid.de 70 i- if(!drw) Err codevoid.de 70 i+drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (!drw) Err codevoid.de 70 i return; Err codevoid.de 70 i+ Err codevoid.de 70 i XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); Err codevoid.de 70 i XSync(drw->dpy, False); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i unsigned int Err codevoid.de 70 i-drw_fontset_getwidth(Drw *drw, const char *text) { Err codevoid.de 70 i+drw_fontset_getwidth(Drw *drw, const char *text) Err codevoid.de 70 i+{ Err codevoid.de 70 i if (!drw || !drw->fonts || !text) Err codevoid.de 70 i return 0; Err codevoid.de 70 i- return drw_text(drw, 0, 0, 0, 0, text, 0); Err codevoid.de 70 i+ return drw_text(drw, 0, 0, 0, 0, 0, text, 0); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) { Err codevoid.de 70 i+drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) Err codevoid.de 70 i+{ Err codevoid.de 70 i XGlyphInfo ext; Err codevoid.de 70 i Err codevoid.de 70 i- if(!font || !text) Err codevoid.de 70 i+ if (!font || !text) Err codevoid.de 70 i return; Err codevoid.de 70 i+ Err codevoid.de 70 i XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); Err codevoid.de 70 i if (w) Err codevoid.de 70 i *w = ext.xOff; Err codevoid.de 70 it@@ -395,19 +398,24 @@ drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i Cur * Err codevoid.de 70 i-drw_cur_create(Drw *drw, int shape) { Err codevoid.de 70 i+drw_cur_create(Drw *drw, int shape) Err codevoid.de 70 i+{ Err codevoid.de 70 i Cur *cur; Err codevoid.de 70 i Err codevoid.de 70 i- if(!drw || !(cur = (Cur *)calloc(1, sizeof(Cur)))) Err codevoid.de 70 i+ if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) Err codevoid.de 70 i return NULL; Err codevoid.de 70 i+ Err codevoid.de 70 i cur->cursor = XCreateFontCursor(drw->dpy, shape); Err codevoid.de 70 i+ Err codevoid.de 70 i return cur; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-drw_cur_free(Drw *drw, Cur *cursor) { Err codevoid.de 70 i- if(!drw || !cursor) Err codevoid.de 70 i+drw_cur_free(Drw *drw, Cur *cursor) Err codevoid.de 70 i+{ Err codevoid.de 70 i+ if (!cursor) Err codevoid.de 70 i return; Err codevoid.de 70 i+ Err codevoid.de 70 i XFreeCursor(drw->dpy, cursor->cursor); Err codevoid.de 70 i free(cursor); Err codevoid.de 70 i } Err codevoid.de 70 1diff --git a/drw.h b/drw.h /git/sent-sdk/file/drw.h.gph codevoid.de 70 it@@ -1,27 +1,19 @@ Err codevoid.de 70 i /* See LICENSE file for copyright and license details. */ Err codevoid.de 70 i-#define DRW_FONT_CACHE_SIZE 32 Err codevoid.de 70 i Err codevoid.de 70 i typedef struct { Err codevoid.de 70 i Cursor cursor; Err codevoid.de 70 i } Cur; Err codevoid.de 70 i Err codevoid.de 70 i-typedef struct Fnt Fnt; Err codevoid.de 70 i-struct Fnt { Err codevoid.de 70 i+typedef struct Fnt { Err codevoid.de 70 i Display *dpy; Err codevoid.de 70 i- int ascent; Err codevoid.de 70 i- int descent; Err codevoid.de 70 i unsigned int h; Err codevoid.de 70 i XftFont *xfont; Err codevoid.de 70 i FcPattern *pattern; Err codevoid.de 70 i- Fnt *next; Err codevoid.de 70 i-}; Err codevoid.de 70 i+ struct Fnt *next; Err codevoid.de 70 i+} Fnt; Err codevoid.de 70 i Err codevoid.de 70 i-typedef struct { Err codevoid.de 70 i- struct { Err codevoid.de 70 i- unsigned long pix; Err codevoid.de 70 i- XftColor rgb; Err codevoid.de 70 i- } fg, bg; Err codevoid.de 70 i-} Scm; Err codevoid.de 70 i+enum { ColFg, ColBg }; /* Clr scheme index */ Err codevoid.de 70 i+typedef XftColor Clr; Err codevoid.de 70 i Err codevoid.de 70 i typedef struct { Err codevoid.de 70 i unsigned int w, h; Err codevoid.de 70 it@@ -30,7 +22,7 @@ typedef struct { Err codevoid.de 70 i Window root; Err codevoid.de 70 i Drawable drawable; Err codevoid.de 70 i GC gc; Err codevoid.de 70 i- Scm *scheme; Err codevoid.de 70 i+ Clr *scheme; Err codevoid.de 70 i Fnt *fonts; Err codevoid.de 70 i } Drw; Err codevoid.de 70 i Err codevoid.de 70 it@@ -46,8 +38,8 @@ unsigned int drw_fontset_getwidth(Drw *drw, const char *text); Err codevoid.de 70 i void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); Err codevoid.de 70 i Err codevoid.de 70 i /* Colorscheme abstraction */ Err codevoid.de 70 i-Scm *drw_scm_create(Drw *drw, const char *fgname, const char *bgname); Err codevoid.de 70 i-void drw_scm_free(Scm *scm); Err codevoid.de 70 i+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); Err codevoid.de 70 i+Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); Err codevoid.de 70 i Err codevoid.de 70 i /* Cursor abstraction */ Err codevoid.de 70 i Cur *drw_cur_create(Drw *drw, int shape); Err codevoid.de 70 it@@ -55,11 +47,11 @@ void drw_cur_free(Drw *drw, Cur *cursor); Err codevoid.de 70 i Err codevoid.de 70 i /* Drawing context manipulation */ Err codevoid.de 70 i void drw_setfontset(Drw *drw, Fnt *set); Err codevoid.de 70 i-void drw_setscheme(Drw *drw, Scm *scm); Err codevoid.de 70 i+void drw_setscheme(Drw *drw, Clr *scm); Err codevoid.de 70 i Err codevoid.de 70 i /* Drawing functions */ Err codevoid.de 70 i void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); Err codevoid.de 70 i-int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert); Err codevoid.de 70 i+int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert); Err codevoid.de 70 i Err codevoid.de 70 i /* Map functions */ Err codevoid.de 70 i void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); Err codevoid.de 70 1diff --git a/sent.c b/sent.c /git/sent-sdk/file/sent.c.gph codevoid.de 70 it@@ -20,6 +20,7 @@ Err codevoid.de 70 i #include Err codevoid.de 70 i Err codevoid.de 70 i #include "arg.h" Err codevoid.de 70 i+#include "util.h" Err codevoid.de 70 i #include "drw.h" Err codevoid.de 70 i Err codevoid.de 70 i char *argv0; Err codevoid.de 70 it@@ -96,7 +97,6 @@ static void ffdraw(Image *img); Err codevoid.de 70 i Err codevoid.de 70 i static void getfontsize(Slide *s, unsigned int *width, unsigned int *height); Err codevoid.de 70 i static void cleanup(); Err codevoid.de 70 i-static void die(const char *, ...); Err codevoid.de 70 i static void load(FILE *fp); Err codevoid.de 70 i static void advance(const Arg *arg); Err codevoid.de 70 i static void quit(const Arg *arg); Err codevoid.de 70 it@@ -123,7 +123,7 @@ static int idx = 0; Err codevoid.de 70 i static int slidecount = 0; Err codevoid.de 70 i static XWindow xw; Err codevoid.de 70 i static Drw *d = NULL; Err codevoid.de 70 i-static Scm *sc; Err codevoid.de 70 i+static Clr *sc; Err codevoid.de 70 i static Fnt *fonts[NUMFONTSCALES]; Err codevoid.de 70 i static int running = 1; Err codevoid.de 70 i Err codevoid.de 70 it@@ -141,18 +141,18 @@ filter(int fd, const char *cmd) Err codevoid.de 70 i int fds[2]; Err codevoid.de 70 i Err codevoid.de 70 i if (pipe(fds) < 0) Err codevoid.de 70 i- die("Unable to create pipe:"); Err codevoid.de 70 i+ die("sent: Unable to create pipe:"); Err codevoid.de 70 i Err codevoid.de 70 i switch (fork()) { Err codevoid.de 70 i case -1: Err codevoid.de 70 i- die("Unable to fork:"); Err codevoid.de 70 i+ die("sent: Unable to fork:"); Err codevoid.de 70 i case 0: Err codevoid.de 70 i dup2(fd, 0); Err codevoid.de 70 i dup2(fds[1], 1); Err codevoid.de 70 i close(fds[0]); Err codevoid.de 70 i close(fds[1]); Err codevoid.de 70 i execlp("sh", "sh", "-c", cmd, (char *)0); Err codevoid.de 70 i- die("execlp sh -c '%s':", cmd); Err codevoid.de 70 i+ die("sent: execlp sh -c '%s':", cmd); Err codevoid.de 70 i } Err codevoid.de 70 i close(fds[1]); Err codevoid.de 70 i return fds[0]; Err codevoid.de 70 it@@ -182,13 +182,13 @@ ffopen(char *filename) Err codevoid.de 70 i return NULL; Err codevoid.de 70 i Err codevoid.de 70 i if ((fd = open(filename, O_RDONLY)) < 0) { Err codevoid.de 70 i- die("Unable to open file %s:", filename); Err codevoid.de 70 i+ die("sent: Unable to open file %s:", filename); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i tmpfd = fd; Err codevoid.de 70 i fd = filter(fd, bin); Err codevoid.de 70 i if (fd < 0) Err codevoid.de 70 i- die("Unable to filter %s:", filename); Err codevoid.de 70 i+ die("sent: Unable to filter %s:", filename); Err codevoid.de 70 i close(tmpfd); Err codevoid.de 70 i Err codevoid.de 70 i if (read(fd, hdr, 16) != 16) Err codevoid.de 70 it@@ -231,26 +231,26 @@ ffread(Image *img) Err codevoid.de 70 i free(img->buf); Err codevoid.de 70 i /* internally the image is stored in 888 format */ Err codevoid.de 70 i if (!(img->buf = malloc(3 * img->bufwidth * img->bufheight))) Err codevoid.de 70 i- die("Unable to malloc buffer for image."); Err codevoid.de 70 i+ die("sent: Unable to malloc buffer for image.\n"); Err codevoid.de 70 i Err codevoid.de 70 i /* scratch buffer to read row by row */ Err codevoid.de 70 i rowlen = img->bufwidth * 2 * strlen("RGBA"); Err codevoid.de 70 i row = malloc(rowlen); Err codevoid.de 70 i if (!row) { Err codevoid.de 70 i- die("Unable to malloc buffer for image row."); Err codevoid.de 70 i+ die("sent: Unable to malloc buffer for image row.\n"); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i /* extract window background color channels for transparency */ Err codevoid.de 70 i- bg_r = (sc->bg.pix >> 16) % 256; Err codevoid.de 70 i- bg_g = (sc->bg.pix >> 8) % 256; Err codevoid.de 70 i- bg_b = (sc->bg.pix >> 0) % 256; Err codevoid.de 70 i+ bg_r = (sc[ColBg].pixel >> 16) % 256; Err codevoid.de 70 i+ bg_g = (sc[ColBg].pixel >> 8) % 256; Err codevoid.de 70 i+ bg_b = (sc[ColBg].pixel >> 0) % 256; Err codevoid.de 70 i Err codevoid.de 70 i for (off = 0, y = 0; y < img->bufheight; y++) { Err codevoid.de 70 i nbytes = 0; Err codevoid.de 70 i while (nbytes < rowlen) { Err codevoid.de 70 i count = read(img->fd, (char *)row + nbytes, rowlen - nbytes); Err codevoid.de 70 i if (count < 0) Err codevoid.de 70 i- die("Unable to read from pipe:"); Err codevoid.de 70 i+ die("sent: Unable to read from pipe:"); Err codevoid.de 70 i nbytes += count; Err codevoid.de 70 i } Err codevoid.de 70 i for (x = 0; x < rowlen / 2; x += 4) { Err codevoid.de 70 it@@ -284,17 +284,17 @@ ffprepare(Image *img) Err codevoid.de 70 i height = img->bufheight * xw.uw / img->bufwidth; Err codevoid.de 70 i Err codevoid.de 70 i if (depth < 24) Err codevoid.de 70 i- die("Display depths <24 not supported."); Err codevoid.de 70 i+ die("sent: Display depths <24 not supported.\n"); Err codevoid.de 70 i Err codevoid.de 70 i if (!(img->ximg = XCreateImage(xw.dpy, CopyFromParent, depth, ZPixmap, 0, Err codevoid.de 70 i NULL, width, height, 32, 0))) Err codevoid.de 70 i- die("Unable to create XImage."); Err codevoid.de 70 i+ die("sent: Unable to create XImage.\n"); Err codevoid.de 70 i Err codevoid.de 70 i if (!(img->ximg->data = malloc(img->ximg->bytes_per_line * height))) Err codevoid.de 70 i- die("Unable to alloc data section for XImage."); Err codevoid.de 70 i+ die("sent: Unable to alloc data section for XImage.\n"); Err codevoid.de 70 i Err codevoid.de 70 i if (!XInitImage(img->ximg)) Err codevoid.de 70 i- die("Unable to init XImage."); Err codevoid.de 70 i+ die("sent: Unable to init XImage.\n"); Err codevoid.de 70 i Err codevoid.de 70 i ffscale(img); Err codevoid.de 70 i img->state |= SCALED; Err codevoid.de 70 it@@ -364,7 +364,6 @@ getfontsize(Slide *s, unsigned int *width, unsigned int *height) Err codevoid.de 70 i *width = curw; Err codevoid.de 70 i } Err codevoid.de 70 i *height = fonts[j]->h * lfac; Err codevoid.de 70 i- *width += fonts[j]->h; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 it@@ -374,7 +373,7 @@ cleanup() Err codevoid.de 70 i Err codevoid.de 70 i for (i = 0; i < NUMFONTSCALES; i++) Err codevoid.de 70 i drw_fontset_free(fonts[i]); Err codevoid.de 70 i- drw_scm_free(sc); Err codevoid.de 70 i+ free(sc); Err codevoid.de 70 i drw_free(d); Err codevoid.de 70 i Err codevoid.de 70 i XDestroyWindow(xw.dpy, xw.win); Err codevoid.de 70 it@@ -394,27 +393,6 @@ cleanup() Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 i-die(const char *fmt, ...) Err codevoid.de 70 i-{ Err codevoid.de 70 i- va_list ap; Err codevoid.de 70 i- Err codevoid.de 70 i- fputs("sent: ", stderr); Err codevoid.de 70 i- Err codevoid.de 70 i- va_start(ap, fmt); Err codevoid.de 70 i- vfprintf(stderr, fmt, ap); Err codevoid.de 70 i- va_end(ap); Err codevoid.de 70 i- Err codevoid.de 70 i- if (fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') { Err codevoid.de 70 i- fputc(' ', stderr); Err codevoid.de 70 i- perror(NULL); Err codevoid.de 70 i- } else { Err codevoid.de 70 i- fputc('\n', stderr); Err codevoid.de 70 i- } Err codevoid.de 70 i- Err codevoid.de 70 i- exit(1); Err codevoid.de 70 i-} Err codevoid.de 70 i- Err codevoid.de 70 i-void Err codevoid.de 70 i load(FILE *fp) Err codevoid.de 70 i { Err codevoid.de 70 i static size_t size = 0; Err codevoid.de 70 it@@ -433,7 +411,7 @@ load(FILE *fp) Err codevoid.de 70 i Err codevoid.de 70 i if ((slidecount+1) * sizeof(*slides) >= size) Err codevoid.de 70 i if (!(slides = realloc(slides, (size += BUFSIZ)))) Err codevoid.de 70 i- die("Unable to realloc %u bytes:", size); Err codevoid.de 70 i+ die("sent: Unable to realloc %u bytes:", size); Err codevoid.de 70 i Err codevoid.de 70 i /* read one slide */ Err codevoid.de 70 i maxlines = 0; Err codevoid.de 70 it@@ -446,12 +424,12 @@ load(FILE *fp) Err codevoid.de 70 i if (s->linecount >= maxlines) { Err codevoid.de 70 i maxlines = 2 * s->linecount + 1; Err codevoid.de 70 i if (!(s->lines = realloc(s->lines, maxlines * sizeof(s->lines[0])))) Err codevoid.de 70 i- die("Unable to realloc %u bytes:", maxlines * sizeof(s->lines[0])); Err codevoid.de 70 i+ die("sent: Unable to realloc %u bytes:", maxlines * sizeof(s->lines[0])); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i blen = strlen(buf); Err codevoid.de 70 i if (!(s->lines[s->linecount] = strdup(buf))) Err codevoid.de 70 i- die("Unable to strdup:"); Err codevoid.de 70 i+ die("sent: Unable to strdup:"); Err codevoid.de 70 i if (s->lines[s->linecount][blen-1] == '\n') Err codevoid.de 70 i s->lines[s->linecount][blen-1] = '\0'; Err codevoid.de 70 i Err codevoid.de 70 it@@ -543,6 +521,7 @@ xdraw() Err codevoid.de 70 i (xw.h - height) / 2 + i * linespacing * d->fonts->h, Err codevoid.de 70 i width, Err codevoid.de 70 i d->fonts->h, Err codevoid.de 70 i+ 0, Err codevoid.de 70 i slides[idx].lines[i], Err codevoid.de 70 i 0); Err codevoid.de 70 i drw_map(d, xw.win, 0, 0, xw.w, xw.h); Err codevoid.de 70 it@@ -564,7 +543,7 @@ xhints() Err codevoid.de 70 i XSizeHints *sizeh = NULL; Err codevoid.de 70 i Err codevoid.de 70 i if (!(sizeh = XAllocSizeHints())) Err codevoid.de 70 i- die("Unable to alloc size hints."); Err codevoid.de 70 i+ die("sent: Unable to alloc size hints.\n"); Err codevoid.de 70 i Err codevoid.de 70 i sizeh->flags = PSize; Err codevoid.de 70 i sizeh->height = xw.h; Err codevoid.de 70 it@@ -580,7 +559,7 @@ xinit() Err codevoid.de 70 i XTextProperty prop; Err codevoid.de 70 i Err codevoid.de 70 i if (!(xw.dpy = XOpenDisplay(NULL))) Err codevoid.de 70 i- die("Unable to open display."); Err codevoid.de 70 i+ die("sent: Unable to open display.\n"); Err codevoid.de 70 i xw.scr = XDefaultScreen(xw.dpy); Err codevoid.de 70 i xw.vis = XDefaultVisual(xw.dpy, xw.scr); Err codevoid.de 70 i resize(DisplayWidth(xw.dpy, xw.scr), DisplayHeight(xw.dpy, xw.scr)); Err codevoid.de 70 it@@ -599,10 +578,10 @@ xinit() Err codevoid.de 70 i XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1); Err codevoid.de 70 i Err codevoid.de 70 i if (!(d = drw_create(xw.dpy, xw.scr, xw.win, xw.w, xw.h))) Err codevoid.de 70 i- die("Unable to create drawing context."); Err codevoid.de 70 i- sc = drw_scm_create(d, fgcol, bgcol); Err codevoid.de 70 i+ die("sent: Unable to create drawing context.\n"); Err codevoid.de 70 i+ sc = drw_scm_create(d, colors, 2); Err codevoid.de 70 i drw_setscheme(d, sc); Err codevoid.de 70 i- XSetWindowBackground(xw.dpy, xw.win, sc->bg.pix); Err codevoid.de 70 i+ XSetWindowBackground(xw.dpy, xw.win, sc[ColBg].pixel); Err codevoid.de 70 i Err codevoid.de 70 i xloadfonts(); Err codevoid.de 70 i Err codevoid.de 70 it@@ -623,16 +602,16 @@ xloadfonts() Err codevoid.de 70 i Err codevoid.de 70 i for (j = 0; j < LEN(fontfallbacks); j++) { Err codevoid.de 70 i if (!(fstrs[j] = malloc(MAXFONTSTRLEN))) Err codevoid.de 70 i- die("Unable to malloc fstrs."); Err codevoid.de 70 i+ die("sent: Unable to malloc fstrs.\n"); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i for (i = 0; i < NUMFONTSCALES; i++) { Err codevoid.de 70 i for (j = 0; j < LEN(fontfallbacks); j++) { Err codevoid.de 70 i if (MAXFONTSTRLEN < snprintf(fstrs[j], MAXFONTSTRLEN, "%s:size=%d", fontfallbacks[j], FONTSZ(i))) Err codevoid.de 70 i- die("Font string too long."); Err codevoid.de 70 i+ die("sent: Font string too long.\n"); Err codevoid.de 70 i } Err codevoid.de 70 i if (!(fonts[i] = drw_fontset_create(d, (const char**)fstrs, LEN(fstrs)))) Err codevoid.de 70 i- die("Unable to load any font for size %d.", FONTSZ(i)); Err codevoid.de 70 i+ die("sent: Unable to load any font for size %d.\n", FONTSZ(i)); Err codevoid.de 70 i Err codevoid.de 70 .