Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
/* See LICENSE file for copyright and license details. */
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <X11/Xlib.h>
|
|
|
|
#include <X11/Xft/Xft.h>
|
|
|
|
|
|
|
|
#include "patches.h"
|
|
|
|
#include "drw.h"
|
|
|
|
#include "util.h"
|
|
|
|
|
2020-06-13 15:32:41 +02:00
|
|
|
#if !PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
#define UTF_INVALID 0xFFFD
|
|
|
|
#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 long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
|
|
|
|
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])
|
|
|
|
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))
|
|
|
|
*u = UTF_INVALID;
|
|
|
|
for (i = 1; *u > utfmax[i]; ++i)
|
|
|
|
;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
utf8decode(const char *c, long *u, size_t clen)
|
|
|
|
{
|
|
|
|
size_t i, j, len, type;
|
|
|
|
long udecoded;
|
|
|
|
|
|
|
|
*u = UTF_INVALID;
|
|
|
|
if (!clen)
|
|
|
|
return 0;
|
|
|
|
udecoded = utf8decodebyte(c[0], &len);
|
|
|
|
if (!BETWEEN(len, 1, UTF_SIZ))
|
|
|
|
return 1;
|
|
|
|
for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
|
|
|
|
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
|
|
|
|
if (type)
|
|
|
|
return j;
|
|
|
|
}
|
|
|
|
if (j < len)
|
|
|
|
return 0;
|
|
|
|
*u = udecoded;
|
|
|
|
utf8validate(u, len);
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
|
|
|
Drw *
|
2020-05-29 17:01:40 +02:00
|
|
|
#if ALPHA_PATCH
|
|
|
|
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
|
2020-05-29 17:01:40 +02:00
|
|
|
#endif // ALPHA_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
{
|
|
|
|
Drw *drw = ecalloc(1, sizeof(Drw));
|
|
|
|
|
|
|
|
drw->dpy = dpy;
|
|
|
|
drw->screen = screen;
|
|
|
|
drw->root = root;
|
|
|
|
drw->w = w;
|
|
|
|
drw->h = h;
|
2020-05-29 17:01:40 +02:00
|
|
|
#if ALPHA_PATCH
|
|
|
|
drw->visual = visual;
|
|
|
|
drw->depth = depth;
|
|
|
|
drw->cmap = cmap;
|
|
|
|
drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
|
|
|
|
drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
|
|
|
|
drw->gc = XCreateGC(dpy, root, 0, NULL);
|
2020-05-29 17:01:40 +02:00
|
|
|
#endif // ALPHA_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
|
|
|
|
|
|
|
|
return drw;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
drw_resize(Drw *drw, unsigned int w, unsigned int h)
|
|
|
|
{
|
|
|
|
if (!drw)
|
|
|
|
return;
|
|
|
|
|
|
|
|
drw->w = w;
|
|
|
|
drw->h = h;
|
|
|
|
if (drw->drawable)
|
|
|
|
XFreePixmap(drw->dpy, drw->drawable);
|
2020-05-29 17:01:40 +02:00
|
|
|
#if ALPHA_PATCH
|
|
|
|
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
|
2020-05-29 17:01:40 +02:00
|
|
|
#endif // ALPHA_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
drw_free(Drw *drw)
|
|
|
|
{
|
|
|
|
XFreePixmap(drw->dpy, drw->drawable);
|
|
|
|
XFreeGC(drw->dpy, drw->gc);
|
2020-06-25 12:54:49 +02:00
|
|
|
#if PANGO_PATCH
|
|
|
|
drw_font_free(drw->font);
|
|
|
|
#else
|
|
|
|
drw_fontset_free(drw->fonts);
|
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
free(drw);
|
|
|
|
}
|
|
|
|
|
2020-06-13 15:32:41 +02:00
|
|
|
#if PANGO_PATCH
|
|
|
|
/* This function is an implementation detail. Library users should use
|
|
|
|
* drw_font_create instead.
|
|
|
|
*/
|
|
|
|
static Fnt *
|
|
|
|
xfont_create(Drw *drw, const char *fontname)
|
|
|
|
{
|
|
|
|
Fnt *font;
|
|
|
|
PangoFontMap *fontmap;
|
|
|
|
PangoContext *context;
|
|
|
|
PangoFontDescription *desc;
|
|
|
|
PangoFontMetrics *metrics;
|
|
|
|
|
|
|
|
if (!fontname) {
|
|
|
|
die("no font specified.");
|
|
|
|
}
|
|
|
|
|
|
|
|
font = ecalloc(1, sizeof(Fnt));
|
|
|
|
font->dpy = drw->dpy;
|
|
|
|
|
|
|
|
fontmap = pango_xft_get_font_map(drw->dpy, drw->screen);
|
|
|
|
context = pango_font_map_create_context(fontmap);
|
|
|
|
desc = pango_font_description_from_string(fontname);
|
|
|
|
font->layout = pango_layout_new(context);
|
|
|
|
pango_layout_set_font_description(font->layout, desc);
|
|
|
|
|
|
|
|
metrics = pango_context_get_metrics(context, desc, pango_language_from_string ("en-us"));
|
|
|
|
font->h = pango_font_metrics_get_height(metrics) / PANGO_SCALE;
|
|
|
|
|
|
|
|
pango_font_metrics_unref(metrics);
|
|
|
|
g_object_unref(context);
|
|
|
|
|
|
|
|
return font;
|
|
|
|
}
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
/* This function is an implementation detail. Library users should use
|
|
|
|
* drw_fontset_create instead.
|
|
|
|
*/
|
|
|
|
static Fnt *
|
|
|
|
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
|
|
|
|
{
|
|
|
|
Fnt *font;
|
|
|
|
XftFont *xfont = NULL;
|
|
|
|
FcPattern *pattern = NULL;
|
|
|
|
|
|
|
|
if (fontname) {
|
|
|
|
/* Using the pattern found at font->xfont->pattern does not yield the
|
|
|
|
* same substitution results as using the pattern returned by
|
|
|
|
* FcNameParse; using the latter results in the desired fallback
|
|
|
|
* behaviour whereas the former just results in missing-character
|
|
|
|
* rectangles being drawn, at least with some fonts. */
|
|
|
|
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
|
|
|
|
fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
|
|
|
|
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
|
|
|
|
XftFontClose(drw->dpy, xfont);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else if (fontpattern) {
|
|
|
|
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
|
|
|
|
fprintf(stderr, "error, cannot load font from pattern.\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
die("no font specified.");
|
|
|
|
}
|
|
|
|
|
2020-05-29 20:33:20 +02:00
|
|
|
#if !COLOR_EMOJI_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
/* Do not allow using color fonts. This is a workaround for a BadLength
|
|
|
|
* error from Xft with color glyphs. Modelled on the Xterm workaround. See
|
|
|
|
* https://bugzilla.redhat.com/show_bug.cgi?id=1498269
|
|
|
|
* https://lists.suckless.org/dev/1701/30932.html
|
|
|
|
* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
|
|
|
|
* and lots more all over the internet.
|
|
|
|
*/
|
|
|
|
FcBool iscol;
|
2020-06-13 15:32:41 +02:00
|
|
|
if (FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
XftFontClose(drw->dpy, xfont);
|
|
|
|
return NULL;
|
|
|
|
}
|
2020-05-29 20:33:20 +02:00
|
|
|
#endif // COLOR_EMOJI_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
|
|
|
font = ecalloc(1, sizeof(Fnt));
|
|
|
|
font->xfont = xfont;
|
|
|
|
font->pattern = pattern;
|
|
|
|
font->h = xfont->ascent + xfont->descent;
|
|
|
|
font->dpy = drw->dpy;
|
|
|
|
|
|
|
|
return font;
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
|
|
|
static void
|
|
|
|
xfont_free(Fnt *font)
|
|
|
|
{
|
|
|
|
if (!font)
|
|
|
|
return;
|
2020-06-13 15:32:41 +02:00
|
|
|
#if PANGO_PATCH
|
|
|
|
if (font->layout)
|
|
|
|
g_object_unref(font->layout);
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
if (font->pattern)
|
|
|
|
FcPatternDestroy(font->pattern);
|
|
|
|
XftFontClose(font->dpy, font->xfont);
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
free(font);
|
|
|
|
}
|
|
|
|
|
2020-06-13 15:32:41 +02:00
|
|
|
#if PANGO_PATCH
|
|
|
|
Fnt*
|
|
|
|
drw_font_create(Drw* drw, const char font[])
|
|
|
|
{
|
|
|
|
Fnt *fnt = NULL;
|
|
|
|
|
|
|
|
if (!drw || !font)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
fnt = xfont_create(drw, font);
|
|
|
|
|
|
|
|
return (drw->font = fnt);
|
|
|
|
}
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
Fnt*
|
|
|
|
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
|
|
|
|
{
|
|
|
|
Fnt *cur, *ret = NULL;
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (!drw || !fonts)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 1; i <= fontcount; i++) {
|
|
|
|
if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
|
|
|
|
cur->next = ret;
|
|
|
|
ret = cur;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (drw->fonts = ret);
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
2020-06-13 15:32:41 +02:00
|
|
|
#if PANGO_PATCH
|
|
|
|
void
|
|
|
|
drw_font_free(Fnt *font)
|
|
|
|
{
|
|
|
|
if (font)
|
|
|
|
xfont_free(font);
|
|
|
|
}
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
void
|
|
|
|
drw_fontset_free(Fnt *font)
|
|
|
|
{
|
|
|
|
if (font) {
|
|
|
|
drw_fontset_free(font->next);
|
|
|
|
xfont_free(font);
|
|
|
|
}
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
|
|
|
void
|
2020-05-29 17:01:40 +02:00
|
|
|
#if ALPHA_PATCH
|
|
|
|
drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
2020-05-29 17:01:40 +02:00
|
|
|
#endif // ALPHA_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
{
|
|
|
|
if (!drw || !dest || !clrname)
|
|
|
|
return;
|
|
|
|
|
2020-05-29 17:01:40 +02:00
|
|
|
#if ALPHA_PATCH
|
|
|
|
if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
|
|
|
|
clrname, dest))
|
|
|
|
die("error, cannot allocate color '%s'", clrname);
|
|
|
|
|
|
|
|
dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
|
|
|
|
DefaultColormap(drw->dpy, drw->screen),
|
|
|
|
clrname, dest))
|
|
|
|
die("error, cannot allocate color '%s'", clrname);
|
2020-05-29 17:01:40 +02:00
|
|
|
#endif // ALPHA_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Wrapper to create color schemes. The caller has to call free(3) on the
|
|
|
|
* returned color scheme when done using it. */
|
|
|
|
Clr *
|
2020-05-29 17:01:40 +02:00
|
|
|
#if ALPHA_PATCH
|
|
|
|
drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount)
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
2020-05-29 17:01:40 +02:00
|
|
|
#endif // ALPHA_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
Clr *ret;
|
|
|
|
|
|
|
|
/* need at least two colors for a scheme */
|
|
|
|
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < clrcount; i++)
|
2020-05-29 17:01:40 +02:00
|
|
|
#if ALPHA_PATCH
|
|
|
|
drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
drw_clr_create(drw, &ret[i], clrnames[i]);
|
2020-05-29 17:01:40 +02:00
|
|
|
#endif // ALPHA_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2020-06-13 15:32:41 +02:00
|
|
|
#if !PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
void
|
|
|
|
drw_setfontset(Drw *drw, Fnt *set)
|
|
|
|
{
|
|
|
|
if (drw)
|
|
|
|
drw->fonts = set;
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
drw_setscheme(Drw *drw, Clr *scm)
|
|
|
|
{
|
|
|
|
if (drw)
|
|
|
|
drw->scheme = scm;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
|
|
|
|
{
|
|
|
|
if (!drw || !drw->scheme)
|
|
|
|
return;
|
|
|
|
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
|
|
|
|
if (filled)
|
|
|
|
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
|
|
else
|
|
|
|
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
|
|
|
|
}
|
|
|
|
|
2020-06-13 15:32:41 +02:00
|
|
|
#if PANGO_PATCH
|
|
|
|
int
|
|
|
|
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup)
|
|
|
|
{
|
|
|
|
char buf[1024];
|
|
|
|
int ty;
|
|
|
|
unsigned int ew;
|
|
|
|
XftDraw *d = NULL;
|
|
|
|
size_t i, len;
|
|
|
|
int render = x || y || w || h;
|
|
|
|
|
|
|
|
if (!drw || (render && !drw->scheme) || !text || !drw->font)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!render) {
|
2022-03-28 10:53:35 +02:00
|
|
|
w = invert ? invert : ~invert;
|
2020-06-13 15:32:41 +02:00
|
|
|
} else {
|
|
|
|
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
|
|
|
|
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
|
|
|
#if ALPHA_PATCH
|
|
|
|
d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
|
|
|
|
#else
|
|
|
|
d = XftDrawCreate(drw->dpy, drw->drawable,
|
|
|
|
DefaultVisual(drw->dpy, drw->screen),
|
|
|
|
DefaultColormap(drw->dpy, drw->screen));
|
|
|
|
#endif // ALPHA_PATCH
|
|
|
|
x += lpad;
|
|
|
|
w -= lpad;
|
|
|
|
}
|
|
|
|
|
|
|
|
len = strlen(text);
|
|
|
|
|
|
|
|
if (len) {
|
|
|
|
drw_font_getexts(drw->font, text, len, &ew, NULL, markup);
|
|
|
|
/* shorten text if necessary */
|
|
|
|
for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--)
|
|
|
|
drw_font_getexts(drw->font, text, len, &ew, NULL, markup);
|
|
|
|
|
|
|
|
if (len) {
|
|
|
|
memcpy(buf, text, len);
|
|
|
|
buf[len] = '\0';
|
|
|
|
if (len < strlen(text))
|
|
|
|
for (i = len; i && i > len - 3; buf[--i] = '.')
|
|
|
|
; /* NOP */
|
|
|
|
|
|
|
|
if (render) {
|
|
|
|
ty = y + (h - drw->font->h) / 2;
|
|
|
|
if (markup)
|
|
|
|
pango_layout_set_markup(drw->font->layout, buf, len);
|
|
|
|
else
|
|
|
|
pango_layout_set_text(drw->font->layout, buf, len);
|
|
|
|
pango_xft_render_layout(d, &drw->scheme[invert ? ColBg : ColFg],
|
|
|
|
drw->font->layout, x * PANGO_SCALE, ty * PANGO_SCALE);
|
|
|
|
if (markup) /* clear markup attributes */
|
|
|
|
pango_layout_set_attributes(drw->font->layout, NULL);
|
|
|
|
}
|
|
|
|
x += ew;
|
|
|
|
w -= ew;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (d)
|
|
|
|
XftDrawDestroy(d);
|
|
|
|
|
|
|
|
return x + (render ? w : 0);
|
|
|
|
}
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
int
|
|
|
|
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
|
|
|
|
{
|
2022-03-28 11:14:10 +02:00
|
|
|
int i, ty, ellipsis_x = 0;
|
2022-04-17 10:05:43 +02:00
|
|
|
unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
XftDraw *d = NULL;
|
|
|
|
Fnt *usedfont, *curfont, *nextfont;
|
|
|
|
int utf8strlen, utf8charlen, render = x || y || w || h;
|
|
|
|
long utf8codepoint = 0;
|
|
|
|
const char *utf8str;
|
|
|
|
FcCharSet *fccharset;
|
|
|
|
FcPattern *fcpattern;
|
|
|
|
FcPattern *match;
|
|
|
|
XftResult result;
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
int charexists = 0, overflow = 0;
|
2022-03-28 11:14:10 +02:00
|
|
|
/* keep track of a couple codepoints for which we have no match. */
|
|
|
|
enum { nomatches_len = 64 };
|
|
|
|
static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches;
|
2022-04-17 10:05:43 +02:00
|
|
|
const char *ellipsis = "...";
|
|
|
|
static unsigned int ellipsis_width = 0;
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
2022-04-17 10:06:08 +02:00
|
|
|
if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!render) {
|
2022-03-28 10:53:35 +02:00
|
|
|
w = invert ? invert : ~invert;
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
} else {
|
|
|
|
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
|
|
|
|
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
|
2020-05-29 17:01:40 +02:00
|
|
|
#if ALPHA_PATCH
|
|
|
|
d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
d = XftDrawCreate(drw->dpy, drw->drawable,
|
|
|
|
DefaultVisual(drw->dpy, drw->screen),
|
|
|
|
DefaultColormap(drw->dpy, drw->screen));
|
2020-05-29 17:01:40 +02:00
|
|
|
#endif // ALPHA_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
x += lpad;
|
|
|
|
w -= lpad;
|
|
|
|
}
|
|
|
|
|
|
|
|
usedfont = drw->fonts;
|
2022-04-17 10:05:43 +02:00
|
|
|
if (!ellipsis_width && render)
|
|
|
|
ellipsis_width = drw_fontset_getwidth(drw, ellipsis);
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
while (1) {
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
ew = ellipsis_len = utf8strlen = 0;
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
utf8str = text;
|
|
|
|
nextfont = NULL;
|
|
|
|
while (*text) {
|
|
|
|
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
|
|
|
|
for (curfont = drw->fonts; curfont; curfont = curfont->next) {
|
|
|
|
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
|
|
|
|
if (charexists) {
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
|
|
|
|
if (ew + ellipsis_width <= w) {
|
|
|
|
/* keep track where the ellipsis still fits */
|
|
|
|
ellipsis_x = x + ew;
|
|
|
|
ellipsis_w = w - ew;
|
|
|
|
ellipsis_len = utf8strlen;
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
}
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
|
|
|
|
if (ew + tmpw > w) {
|
|
|
|
overflow = 1;
|
2022-03-28 10:53:35 +02:00
|
|
|
/* called from drw_fontset_getwidth_clamp():
|
|
|
|
* it wants the width AFTER the overflow
|
|
|
|
*/
|
|
|
|
if (!render)
|
|
|
|
x += tmpw;
|
|
|
|
else
|
|
|
|
utf8strlen = ellipsis_len;
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
} else if (curfont == usedfont) {
|
|
|
|
utf8strlen += utf8charlen;
|
|
|
|
text += utf8charlen;
|
|
|
|
ew += tmpw;
|
|
|
|
} else {
|
|
|
|
nextfont = curfont;
|
|
|
|
}
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
if (overflow || !charexists || nextfont)
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
break;
|
|
|
|
else
|
|
|
|
charexists = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (utf8strlen) {
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
if (render) {
|
|
|
|
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
|
|
|
|
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
|
|
|
|
usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
|
|
|
|
}
|
|
|
|
x += ew;
|
|
|
|
w -= ew;
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
}
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
if (render && overflow && ellipsis_w)
|
2022-04-17 10:05:43 +02:00
|
|
|
drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, ellipsis, invert);
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
drw_text: improve both performance and correctness
this patch makes some non-trivial changes, which significantly improves
the performance of drawing large strings as well as fixes any issues
regarding the printing of the ellipsis when string gets truncated.
* performance:
before there were two O(n) loops, one which finds how long we can go
without changing font, and the second loop would (incorrectly) truncate
the string if it's too big.
this patch merges the overflow calculation into the first loop and exits
out when overflow is detected. when dumping lots of emojies into dmenu,
i see some noticeable startup time improvement:
before -> after
460ms -> 360ms
input latency when scrolling up/down is also noticeably better and can
be tested with the following:
for _ in $(seq 20); do
cat /dev/urandom | base64 | tr -d '\n' | head -c 1000000
echo
done | ./dmenu -l 10
* correctness:
the previous version would incorrectly assumed single byte chars and
would overwrite them with '.' , this caused a whole bunch of obvious
problems, including the ellipsis not getting rendered if then font
changed.
in addition to exiting out when we detect overflow, this patch also
keeps track of the last x-position where the ellipsis would fit. if we
detect overflow, we simply make a recursing call to drw_text() at the
ellipsis_x position and overwrite what was there.
so now the ellipsis will always be printed properly, regardless of
weather the font changes or if the string is single byte char or not.
the idea of rendering the ellipsis on top incase of overflow was
from Bakkeby <bakkeby@gmail.com>, thanks! however the original patch had
some issues incorrectly truncating the prompt (-p flag) and cutting off
emojies. those have been fixed in here.
Ref. https://git.suckless.org/dmenu/commit/41fdabbf7c517f8d524b70cbd78238cc319ccef3.html
2022-03-28 10:31:54 +02:00
|
|
|
if (!*text || overflow) {
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
break;
|
|
|
|
} else if (nextfont) {
|
|
|
|
charexists = 0;
|
|
|
|
usedfont = nextfont;
|
|
|
|
} else {
|
|
|
|
/* Regardless of whether or not a fallback font is found, the
|
|
|
|
* character must be drawn. */
|
|
|
|
charexists = 1;
|
|
|
|
|
2022-03-28 11:14:10 +02:00
|
|
|
for (i = 0; i < nomatches_len; ++i) {
|
|
|
|
/* avoid calling XftFontMatch if we know we won't find a match */
|
|
|
|
if (utf8codepoint == nomatches.codepoint[i])
|
|
|
|
goto no_match;
|
|
|
|
}
|
|
|
|
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
fccharset = FcCharSetCreate();
|
|
|
|
FcCharSetAddChar(fccharset, utf8codepoint);
|
|
|
|
|
|
|
|
if (!drw->fonts->pattern) {
|
|
|
|
/* Refer to the comment in xfont_create for more information. */
|
|
|
|
die("the first font in the cache must be loaded from a font string.");
|
|
|
|
}
|
|
|
|
|
|
|
|
fcpattern = FcPatternDuplicate(drw->fonts->pattern);
|
|
|
|
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
|
|
|
|
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
|
|
|
|
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
|
|
|
|
|
|
|
|
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
|
|
|
|
FcDefaultSubstitute(fcpattern);
|
|
|
|
match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
|
|
|
|
|
|
|
|
FcCharSetDestroy(fccharset);
|
|
|
|
FcPatternDestroy(fcpattern);
|
|
|
|
|
|
|
|
if (match) {
|
|
|
|
usedfont = xfont_create(drw, NULL, match);
|
|
|
|
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
|
|
|
|
for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
|
|
|
|
; /* NOP */
|
|
|
|
curfont->next = usedfont;
|
|
|
|
} else {
|
|
|
|
xfont_free(usedfont);
|
2022-03-28 11:14:10 +02:00
|
|
|
nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
|
|
|
|
no_match:
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
usedfont = drw->fonts;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (d)
|
|
|
|
XftDrawDestroy(d);
|
|
|
|
|
|
|
|
return x + (render ? w : 0);
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
|
|
|
|
{
|
|
|
|
if (!drw)
|
|
|
|
return;
|
|
|
|
|
|
|
|
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
|
|
|
|
XSync(drw->dpy, False);
|
|
|
|
}
|
|
|
|
|
2020-06-13 15:32:41 +02:00
|
|
|
#if PANGO_PATCH
|
|
|
|
unsigned int
|
|
|
|
drw_font_getwidth(Drw *drw, const char *text, Bool markup)
|
|
|
|
{
|
|
|
|
if (!drw || !drw->font || !text)
|
|
|
|
return 0;
|
|
|
|
return drw_text(drw, 0, 0, 0, 0, 0, text, 0, markup);
|
|
|
|
}
|
2022-03-28 10:53:35 +02:00
|
|
|
|
|
|
|
unsigned int
|
|
|
|
drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
|
|
|
|
{
|
|
|
|
unsigned int tmp = 0;
|
|
|
|
if (drw && drw->font && text && n)
|
|
|
|
tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n, True);
|
|
|
|
return MIN(n, tmp);
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
unsigned int
|
|
|
|
drw_fontset_getwidth(Drw *drw, const char *text)
|
|
|
|
{
|
|
|
|
if (!drw || !drw->fonts || !text)
|
|
|
|
return 0;
|
|
|
|
return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
|
|
|
|
}
|
2022-03-28 10:53:35 +02:00
|
|
|
|
|
|
|
unsigned int
|
|
|
|
drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
|
|
|
|
{
|
|
|
|
unsigned int tmp = 0;
|
|
|
|
if (drw && drw->fonts && text && n)
|
|
|
|
tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
|
|
|
|
return MIN(n, tmp);
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
2020-06-13 15:32:41 +02:00
|
|
|
#if PANGO_PATCH
|
|
|
|
void
|
|
|
|
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup)
|
|
|
|
{
|
|
|
|
if (!font || !text)
|
|
|
|
return;
|
|
|
|
|
|
|
|
PangoRectangle r;
|
|
|
|
if (markup)
|
|
|
|
pango_layout_set_markup(font->layout, text, len);
|
|
|
|
else
|
|
|
|
pango_layout_set_text(font->layout, text, len);
|
|
|
|
pango_layout_get_extents(font->layout, 0, &r);
|
|
|
|
if (markup) /* clear markup attributes */
|
|
|
|
pango_layout_set_attributes(font->layout, NULL);
|
|
|
|
if (w)
|
|
|
|
*w = r.width / PANGO_SCALE;
|
|
|
|
if (h)
|
|
|
|
*h = font->h;
|
|
|
|
}
|
|
|
|
#else
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
void
|
|
|
|
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
|
|
|
|
{
|
|
|
|
XGlyphInfo ext;
|
|
|
|
|
|
|
|
if (!font || !text)
|
|
|
|
return;
|
|
|
|
|
|
|
|
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
|
|
|
|
if (w)
|
|
|
|
*w = ext.xOff;
|
|
|
|
if (h)
|
|
|
|
*h = font->h;
|
|
|
|
}
|
2020-06-13 15:32:41 +02:00
|
|
|
#endif // PANGO_PATCH
|
Added border, center, fuzzymatch, incremental, initialtext, instant, line-height, mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext, rejectnomatch, scroll, vertfull, wmtype and xyw patches
2019-09-19 00:33:15 +02:00
|
|
|
|
|
|
|
Cur *
|
|
|
|
drw_cur_create(Drw *drw, int shape)
|
|
|
|
{
|
|
|
|
Cur *cur;
|
|
|
|
|
|
|
|
if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
cur->cursor = XCreateFontCursor(drw->dpy, shape);
|
|
|
|
|
|
|
|
return cur;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
drw_cur_free(Drw *drw, Cur *cursor)
|
|
|
|
{
|
|
|
|
if (!cursor)
|
|
|
|
return;
|
|
|
|
|
|
|
|
XFreeCursor(drw->dpy, cursor->cursor);
|
|
|
|
free(cursor);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if SCROLL_PATCH
|
|
|
|
#include "patch/scroll.c"
|
2020-05-29 20:33:20 +02:00
|
|
|
#endif
|