isync latest drw.{c,h} changes from dmenu - dwm - dynamic window manager Err parazyd.org 70 hgit clone https://git.parazyd.org/dwm URL:https://git.parazyd.org/dwm parazyd.org 70 1Log /git/dwm/log.gph parazyd.org 70 1Files /git/dwm/files.gph parazyd.org 70 1Refs /git/dwm/refs.gph parazyd.org 70 1README /git/dwm/file/README.gph parazyd.org 70 1LICENSE /git/dwm/file/LICENSE.gph parazyd.org 70 i--- Err parazyd.org 70 1commit d3f93c7c1a13a2a78f04fb41ad1935525df948db /git/dwm/commit/d3f93c7c1a13a2a78f04fb41ad1935525df948db.gph parazyd.org 70 1parent cd0773cee9bad694dc9a6b1355a32bbe61abadff /git/dwm/commit/cd0773cee9bad694dc9a6b1355a32bbe61abadff.gph parazyd.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org parazyd.org 70 iDate: Tue, 10 May 2022 19:07:56 +0200 Err parazyd.org 70 i Err parazyd.org 70 isync latest drw.{c,h} changes from dmenu Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M drw.c | 88 ++++++++++++++++++++----------- Err parazyd.org 70 i M drw.h | 1 + Err parazyd.org 70 i Err parazyd.org 70 i2 files changed, 59 insertions(+), 30 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/drw.c b/drw.c /git/dwm/file/drw.c.gph parazyd.org 70 i@@ -251,12 +251,10 @@ drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int Err parazyd.org 70 i int Err parazyd.org 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 parazyd.org 70 i { Err parazyd.org 70 i- char buf[1024]; Err parazyd.org 70 i- int ty; Err parazyd.org 70 i- unsigned int ew; Err parazyd.org 70 i+ int i, ty, ellipsis_x = 0; Err parazyd.org 70 i+ unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; Err parazyd.org 70 i XftDraw *d = NULL; Err parazyd.org 70 i Fnt *usedfont, *curfont, *nextfont; Err parazyd.org 70 i- size_t i, len; Err parazyd.org 70 i int utf8strlen, utf8charlen, render = x || y || w || h; Err parazyd.org 70 i long utf8codepoint = 0; Err parazyd.org 70 i const char *utf8str; Err parazyd.org 70 i@@ -264,13 +262,17 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp Err parazyd.org 70 i FcPattern *fcpattern; Err parazyd.org 70 i FcPattern *match; Err parazyd.org 70 i XftResult result; Err parazyd.org 70 i- int charexists = 0; Err parazyd.org 70 i+ int charexists = 0, overflow = 0; Err parazyd.org 70 i+ /* keep track of a couple codepoints for which we have no match. */ Err parazyd.org 70 i+ enum { nomatches_len = 64 }; Err parazyd.org 70 i+ static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches; Err parazyd.org 70 i+ static unsigned int ellipsis_width = 0; Err parazyd.org 70 i Err parazyd.org 70 i- if (!drw || (render && !drw->scheme) || !text || !drw->fonts) Err parazyd.org 70 i+ if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) Err parazyd.org 70 i return 0; Err parazyd.org 70 i Err parazyd.org 70 i if (!render) { Err parazyd.org 70 i- w = ~w; Err parazyd.org 70 i+ w = invert ? invert : ~invert; Err parazyd.org 70 i } else { Err parazyd.org 70 i XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); Err parazyd.org 70 i XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); Err parazyd.org 70 i@@ -282,8 +284,10 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i usedfont = drw->fonts; Err parazyd.org 70 i+ if (!ellipsis_width && render) Err parazyd.org 70 i+ ellipsis_width = drw_fontset_getwidth(drw, "..."); Err parazyd.org 70 i while (1) { Err parazyd.org 70 i- utf8strlen = 0; Err parazyd.org 70 i+ ew = ellipsis_len = utf8strlen = 0; Err parazyd.org 70 i utf8str = text; Err parazyd.org 70 i nextfont = NULL; Err parazyd.org 70 i while (*text) { Err parazyd.org 70 i@@ -291,9 +295,27 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp Err parazyd.org 70 i for (curfont = drw->fonts; curfont; curfont = curfont->next) { Err parazyd.org 70 i charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint); Err parazyd.org 70 i if (charexists) { Err parazyd.org 70 i- if (curfont == usedfont) { Err parazyd.org 70 i+ drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL); Err parazyd.org 70 i+ if (ew + ellipsis_width <= w) { Err parazyd.org 70 i+ /* keep track where the ellipsis still fits */ Err parazyd.org 70 i+ ellipsis_x = x + ew; Err parazyd.org 70 i+ ellipsis_w = w - ew; Err parazyd.org 70 i+ ellipsis_len = utf8strlen; Err parazyd.org 70 i+ } Err parazyd.org 70 i+ Err parazyd.org 70 i+ if (ew + tmpw > w) { Err parazyd.org 70 i+ overflow = 1; Err parazyd.org 70 i+ /* called from drw_fontset_getwidth_clamp(): Err parazyd.org 70 i+ * it wants the width AFTER the overflow Err parazyd.org 70 i+ */ Err parazyd.org 70 i+ if (!render) Err parazyd.org 70 i+ x += tmpw; Err parazyd.org 70 i+ else Err parazyd.org 70 i+ utf8strlen = ellipsis_len; Err parazyd.org 70 i+ } else if (curfont == usedfont) { Err parazyd.org 70 i utf8strlen += utf8charlen; Err parazyd.org 70 i text += utf8charlen; Err parazyd.org 70 i+ ew += tmpw; Err parazyd.org 70 i } else { Err parazyd.org 70 i nextfont = curfont; Err parazyd.org 70 i } Err parazyd.org 70 i@@ -301,36 +323,25 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp Err parazyd.org 70 i } Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i- if (!charexists || nextfont) Err parazyd.org 70 i+ if (overflow || !charexists || nextfont) Err parazyd.org 70 i break; Err parazyd.org 70 i else Err parazyd.org 70 i charexists = 0; Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i if (utf8strlen) { Err parazyd.org 70 i- drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL); Err parazyd.org 70 i- /* shorten text if necessary */ Err parazyd.org 70 i- for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) Err parazyd.org 70 i- drw_font_getexts(usedfont, utf8str, len, &ew, NULL); Err parazyd.org 70 i- Err parazyd.org 70 i- if (len) { Err parazyd.org 70 i- memcpy(buf, utf8str, len); Err parazyd.org 70 i- buf[len] = '\0'; Err parazyd.org 70 i- if (len < utf8strlen) Err parazyd.org 70 i- for (i = len; i && i > len - 3; buf[--i] = '.') Err parazyd.org 70 i- ; /* NOP */ Err parazyd.org 70 i- Err parazyd.org 70 i- if (render) { Err parazyd.org 70 i- ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; Err parazyd.org 70 i- XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], Err parazyd.org 70 i- usedfont->xfont, x, ty, (XftChar8 *)buf, len); Err parazyd.org 70 i- } Err parazyd.org 70 i- x += ew; Err parazyd.org 70 i- w -= ew; Err parazyd.org 70 i+ if (render) { Err parazyd.org 70 i+ ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; Err parazyd.org 70 i+ XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], Err parazyd.org 70 i+ usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen); Err parazyd.org 70 i } Err parazyd.org 70 i+ x += ew; Err parazyd.org 70 i+ w -= ew; Err parazyd.org 70 i } Err parazyd.org 70 i+ if (render && overflow) Err parazyd.org 70 i+ drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert); Err parazyd.org 70 i Err parazyd.org 70 i- if (!*text) { Err parazyd.org 70 i+ if (!*text || overflow) { Err parazyd.org 70 i break; Err parazyd.org 70 i } else if (nextfont) { Err parazyd.org 70 i charexists = 0; Err parazyd.org 70 i@@ -340,6 +351,12 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp Err parazyd.org 70 i * character must be drawn. */ Err parazyd.org 70 i charexists = 1; Err parazyd.org 70 i Err parazyd.org 70 i+ for (i = 0; i < nomatches_len; ++i) { Err parazyd.org 70 i+ /* avoid calling XftFontMatch if we know we won't find a match */ Err parazyd.org 70 i+ if (utf8codepoint == nomatches.codepoint[i]) Err parazyd.org 70 i+ goto no_match; Err parazyd.org 70 i+ } Err parazyd.org 70 i+ Err parazyd.org 70 i fccharset = FcCharSetCreate(); Err parazyd.org 70 i FcCharSetAddChar(fccharset, utf8codepoint); Err parazyd.org 70 i Err parazyd.org 70 i@@ -368,6 +385,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp Err parazyd.org 70 i curfont->next = usedfont; Err parazyd.org 70 i } else { Err parazyd.org 70 i xfont_free(usedfont); Err parazyd.org 70 i+ nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint; Err parazyd.org 70 i+no_match: Err parazyd.org 70 i usedfont = drw->fonts; Err parazyd.org 70 i } Err parazyd.org 70 i } Err parazyd.org 70 i@@ -397,6 +416,15 @@ drw_fontset_getwidth(Drw *drw, const char *text) Err parazyd.org 70 i return drw_text(drw, 0, 0, 0, 0, 0, text, 0); Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i+unsigned int Err parazyd.org 70 i+drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) Err parazyd.org 70 i+{ Err parazyd.org 70 i+ unsigned int tmp = 0; Err parazyd.org 70 i+ if (drw && drw->fonts && text && n) Err parazyd.org 70 i+ tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); Err parazyd.org 70 i+ return MIN(n, tmp); Err parazyd.org 70 i+} Err parazyd.org 70 i+ Err parazyd.org 70 i void Err parazyd.org 70 i drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) Err parazyd.org 70 i { Err parazyd.org 70 1diff --git a/drw.h b/drw.h /git/dwm/file/drw.h.gph parazyd.org 70 i@@ -35,6 +35,7 @@ void drw_free(Drw *drw); Err parazyd.org 70 i Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); Err parazyd.org 70 i void drw_fontset_free(Fnt* set); Err parazyd.org 70 i unsigned int drw_fontset_getwidth(Drw *drw, const char *text); Err parazyd.org 70 i+unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n); Err parazyd.org 70 i void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); Err parazyd.org 70 i Err parazyd.org 70 i /* Colorscheme abstraction */ Err parazyd.org 70 .