sites

public wiki contents of suckless.org
git clone git://git.suckless.org/sites
Log | Files | Refs

commit 9bbc02d13a89e427a046817771c6f8fd332d0167
parent 65833e3048b0f9a55f300863b07c37ef32df5f0a
Author: NRK <nrk@disroot.org>
Date:   Fri, 25 Mar 2022 21:36:31 +0600

[dmenu][patch][highpriority]: 5.1 rebase and allocation cleanup

previous patch didn't check for malloc failure, and didn't cleanup
allocated memory at exit.

Diffstat:
Atools.suckless.org/dmenu/patches/highpriority/dmenu-highpriority-5.1.diff | 174+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mtools.suckless.org/dmenu/patches/highpriority/index.md | 3++-
2 files changed, 176 insertions(+), 1 deletion(-)

diff --git a/tools.suckless.org/dmenu/patches/highpriority/dmenu-highpriority-5.1.diff b/tools.suckless.org/dmenu/patches/highpriority/dmenu-highpriority-5.1.diff @@ -0,0 +1,174 @@ +diff --git a/config.def.h b/config.def.h +index 1edb647..47b616d 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -12,6 +12,7 @@ static const char *colors[SchemeLast][2] = { + [SchemeNorm] = { "#bbbbbb", "#222222" }, + [SchemeSel] = { "#eeeeee", "#005577" }, + [SchemeOut] = { "#000000", "#00ffff" }, ++ [SchemeHp] = { "#bbbbbb", "#333333" } + }; + /* -l option; if nonzero, dmenu uses vertical list with given number of lines */ + static unsigned int lines = 0; +diff --git a/dmenu.c b/dmenu.c +index eca67ac..6ae896a 100644 +--- a/dmenu.c ++++ b/dmenu.c +@@ -26,14 +26,16 @@ + #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) + + /* enums */ +-enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ ++enum { SchemeNorm, SchemeSel, SchemeHp, SchemeOut, SchemeLast }; /* color schemes */ + + struct item { + char *text; + struct item *left, *right; +- int out; ++ int out, hp; + }; + ++static char **hpitems = NULL; ++static int hplength = 0; + static char text[BUFSIZ] = ""; + static char *embed; + static int bh, mw, mh; +@@ -58,6 +60,42 @@ static Clr *scheme[SchemeLast]; + static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; + static char *(*fstrstr)(const char *, const char *) = strstr; + ++static char ** ++tokenize(char *source, const char *delim, int *llen) ++{ ++ int listlength = 0, list_size = 0; ++ char **list = NULL, *token; ++ ++ token = strtok(source, delim); ++ while (token) { ++ if (listlength + 1 >= list_size) { ++ if (!(list = realloc(list, (list_size += 8) * sizeof(*list)))) ++ die("Unable to realloc %zu bytes\n", list_size * sizeof(*list)); ++ } ++ if (!(list[listlength] = strdup(token))) ++ die("Unable to strdup %zu bytes\n", strlen(token) + 1); ++ token = strtok(NULL, delim); ++ listlength++; ++ } ++ ++ *llen = listlength; ++ return list; ++} ++ ++static int ++arrayhas(char **list, int length, char *item) ++{ ++ int i; ++ ++ for (i = 0; i < length; i++) { ++ size_t len1 = strlen(list[i]); ++ size_t len2 = strlen(item); ++ if (!fstrncmp(list[i], item, len1 > len2 ? len2 : len1)) ++ return 1; ++ } ++ return 0; ++} ++ + static void + appenditem(struct item *item, struct item **list, struct item **last) + { +@@ -97,6 +135,9 @@ cleanup(void) + XUngrabKey(dpy, AnyKey, AnyModifier, root); + for (i = 0; i < SchemeLast; i++) + free(scheme[i]); ++ for (i = 0; i < hplength; ++i) ++ free(hpitems[i]); ++ free(hpitems); + drw_free(drw); + XSync(dpy, False); + XCloseDisplay(dpy); +@@ -125,6 +166,8 @@ drawitem(struct item *item, int x, int y, int w) + { + if (item == sel) + drw_setscheme(drw, scheme[SchemeSel]); ++ else if (item->hp) ++ drw_setscheme(drw, scheme[SchemeHp]); + else if (item->out) + drw_setscheme(drw, scheme[SchemeOut]); + else +@@ -226,7 +269,7 @@ match(void) + char buf[sizeof text], *s; + int i, tokc = 0; + size_t len, textsize; +- struct item *item, *lprefix, *lsubstr, *prefixend, *substrend; ++ struct item *item, *lhpprefix, *lprefix, *lsubstr, *hpprefixend, *prefixend, *substrend; + + strcpy(buf, text); + /* separate input text into tokens to be matched individually */ +@@ -235,7 +278,7 @@ match(void) + die("cannot realloc %u bytes:", tokn * sizeof *tokv); + len = tokc ? strlen(tokv[0]) : 0; + +- matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; ++ matches = lhpprefix = lprefix = lsubstr = matchend = hpprefixend = prefixend = substrend = NULL; + textsize = strlen(text) + 1; + for (item = items; item && item->text; item++) { + for (i = 0; i < tokc; i++) +@@ -243,14 +286,24 @@ match(void) + break; + if (i != tokc) /* not all tokens match */ + continue; +- /* exact matches go first, then prefixes, then substrings */ ++ /* exact matches go first, then prefixes with high priority, then prefixes, then substrings */ + if (!tokc || !fstrncmp(text, item->text, textsize)) + appenditem(item, &matches, &matchend); ++ else if (item->hp && !fstrncmp(tokv[0], item->text, len)) ++ appenditem(item, &lhpprefix, &hpprefixend); + else if (!fstrncmp(tokv[0], item->text, len)) + appenditem(item, &lprefix, &prefixend); + else + appenditem(item, &lsubstr, &substrend); + } ++ if (lhpprefix) { ++ if (matches) { ++ matchend->right = lhpprefix; ++ lhpprefix->left = matchend; ++ } else ++ matches = lhpprefix; ++ matchend = hpprefixend; ++ } + if (lprefix) { + if (matches) { + matchend->right = lprefix; +@@ -553,6 +606,7 @@ readstdin(void) + if (!(items[i].text = strdup(buf))) + die("cannot strdup %u bytes:", strlen(buf) + 1); + items[i].out = 0; ++ items[i].hp = arrayhas(hpitems, hplength, items[i].text); + drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL); + if (tmpmax > inputw) { + inputw = tmpmax; +@@ -708,7 +762,8 @@ static void + usage(void) + { + fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" +- " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr); ++ " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n" ++ " [-hb color] [-hf color] [-hp items]\n", stderr); + exit(1); + } + +@@ -749,8 +804,14 @@ main(int argc, char *argv[]) + colors[SchemeSel][ColBg] = argv[++i]; + else if (!strcmp(argv[i], "-sf")) /* selected foreground color */ + colors[SchemeSel][ColFg] = argv[++i]; ++ else if (!strcmp(argv[i], "-hb")) /* high priority background color */ ++ colors[SchemeHp][ColBg] = argv[++i]; ++ else if (!strcmp(argv[i], "-hf")) /* low priority background color */ ++ colors[SchemeHp][ColFg] = argv[++i]; + else if (!strcmp(argv[i], "-w")) /* embedding window id */ + embed = argv[++i]; ++ else if (!strcmp(argv[i], "-hp")) ++ hpitems = tokenize(argv[++i], ",", &hplength); + else + usage(); + diff --git a/tools.suckless.org/dmenu/patches/highpriority/index.md b/tools.suckless.org/dmenu/patches/highpriority/index.md @@ -11,7 +11,6 @@ Adds the option *[SchemeHp]* to *colors* in config.def.h and the flags *hb*, *hf * *hf*: Foreground color of the high priority items * *hp*: A CSV (comma-seperated list) of high priority items - [![Screenshot dmenu with highpriority patch](dmenu-highpriority.gif)](dmenu-highpriority.gif) In this case, *chromium* is added to *hp* and it came first on search instead of *chromedriver* @@ -19,7 +18,9 @@ In this case, *chromium* is added to *hp* and it came first on search instead of Download -------- * [dmenu-highpriority-4.9.diff](dmenu-highpriority-4.9.diff) +* [dmenu-highpriority-5.1.diff](dmenu-highpriority-5.1.diff) Author ------ * Takase +* NRK (v5.1 rebase, allocation related cleanup)