Compare commits
No commits in common. "5d3b60de3a9a7b30bdc0fa8909e8bb655193fd00" and "e851ce9f8429065d2a24115c08e6e73f177b6c16" have entirely different histories.
5d3b60de3a
...
e851ce9f84
13
config.def.h
13
config.def.h
@ -2,31 +2,22 @@
|
|||||||
/* Default settings; can be overriden by command line. */
|
/* Default settings; can be overriden by command line. */
|
||||||
|
|
||||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
||||||
static int fuzzy = 1; /* -F option; if 0, dmenu doesn't use fuzzy matching */
|
|
||||||
static int centered = 1; /* -c option; centers dmenu on screen */
|
|
||||||
static int min_width = 500; /* minimum width when centered */
|
|
||||||
static const float menu_height_ratio = 2.0f; /* This is the ratio used in the original calculation */
|
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
/* -fn option overrides fonts[0]; default X11 font or font set */
|
||||||
static const char *fonts[] = {
|
static const char *fonts[] = {
|
||||||
"Hack Nerd Font Mono:size=15"
|
"monospace:size=10"
|
||||||
};
|
};
|
||||||
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
|
static const char *prompt = NULL; /* -p option; prompt to the left of input field */
|
||||||
static const char *colors[SchemeLast][2] = {
|
static const char *colors[SchemeLast][2] = {
|
||||||
/* fg bg */
|
/* fg bg */
|
||||||
[SchemeNorm] = { "#bbbbbb", "#222222" },
|
[SchemeNorm] = { "#bbbbbb", "#222222" },
|
||||||
[SchemeSel] = { "#eeeeee", "#005577" },
|
[SchemeSel] = { "#eeeeee", "#005577" },
|
||||||
[SchemeSelHighlight] = { "#ffc978", "#005577" },
|
|
||||||
[SchemeNormHighlight] = { "#ffc978", "#222222" },
|
|
||||||
[SchemeOut] = { "#000000", "#00ffff" },
|
[SchemeOut] = { "#000000", "#00ffff" },
|
||||||
};
|
};
|
||||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
||||||
static unsigned int lines = 15;
|
static unsigned int lines = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Characters not considered part of a word while deleting words
|
* Characters not considered part of a word while deleting words
|
||||||
* for example: " /?\"&[]"
|
* for example: " /?\"&[]"
|
||||||
*/
|
*/
|
||||||
static const char worddelimiters[] = " ";
|
static const char worddelimiters[] = " ";
|
||||||
|
|
||||||
/* Size of the window border */
|
|
||||||
static unsigned int border_width = 0;
|
|
||||||
|
@ -21,7 +21,7 @@ FREETYPEINC = /usr/include/freetype2
|
|||||||
|
|
||||||
# includes and libs
|
# includes and libs
|
||||||
INCS = -I$(X11INC) -I$(FREETYPEINC)
|
INCS = -I$(X11INC) -I$(FREETYPEINC)
|
||||||
LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lm
|
LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
||||||
|
23
dmenu.1
23
dmenu.1
@ -20,14 +20,6 @@ dmenu \- dynamic menu
|
|||||||
.IR color ]
|
.IR color ]
|
||||||
.RB [ \-sf
|
.RB [ \-sf
|
||||||
.IR color ]
|
.IR color ]
|
||||||
.RB [ \-nhb
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-nhf
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-shb
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-shf
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-w
|
.RB [ \-w
|
||||||
.IR windowid ]
|
.IR windowid ]
|
||||||
.P
|
.P
|
||||||
@ -48,9 +40,6 @@ which lists programs in the user's $PATH and runs the result in their $SHELL.
|
|||||||
.B \-b
|
.B \-b
|
||||||
dmenu appears at the bottom of the screen.
|
dmenu appears at the bottom of the screen.
|
||||||
.TP
|
.TP
|
||||||
.B \-c
|
|
||||||
dmenu appears centered on the screen.
|
|
||||||
.TP
|
|
||||||
.B \-f
|
.B \-f
|
||||||
dmenu grabs the keyboard before reading stdin if not reading from a tty. This
|
dmenu grabs the keyboard before reading stdin if not reading from a tty. This
|
||||||
is faster, but will lock up X until stdin reaches end\-of\-file.
|
is faster, but will lock up X until stdin reaches end\-of\-file.
|
||||||
@ -86,18 +75,6 @@ defines the selected background color.
|
|||||||
.BI \-sf " color"
|
.BI \-sf " color"
|
||||||
defines the selected foreground color.
|
defines the selected foreground color.
|
||||||
.TP
|
.TP
|
||||||
.BI \-nhb " color"
|
|
||||||
defines the normal highlight background color.
|
|
||||||
.TP
|
|
||||||
.BI \-nhf " color"
|
|
||||||
defines the normal highlight foreground color.
|
|
||||||
.TP
|
|
||||||
.BI \-shb " color"
|
|
||||||
defines the selected highlight background color.
|
|
||||||
.TP
|
|
||||||
.BI \-shf " color"
|
|
||||||
defines the selected highlight foreground color.
|
|
||||||
.TP
|
|
||||||
.B \-v
|
.B \-v
|
||||||
prints version information to stdout, then exits.
|
prints version information to stdout, then exits.
|
||||||
.TP
|
.TP
|
||||||
|
198
dmenu.c
198
dmenu.c
@ -1,7 +1,6 @@
|
|||||||
/* See LICENSE file for copyright and license details. */
|
/* See LICENSE file for copyright and license details. */
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include <math.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -26,15 +25,12 @@
|
|||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
||||||
|
|
||||||
/* enums */
|
/* enums */
|
||||||
enum { SchemeNorm, SchemeSel, SchemeNormHighlight, SchemeSelHighlight,
|
enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
|
||||||
SchemeOut, SchemeLast }; /* color schemes */
|
|
||||||
|
|
||||||
|
|
||||||
struct item {
|
struct item {
|
||||||
char *text;
|
char *text;
|
||||||
struct item *left, *right;
|
struct item *left, *right;
|
||||||
int out;
|
int out;
|
||||||
double distance;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static char text[BUFSIZ] = "";
|
static char text[BUFSIZ] = "";
|
||||||
@ -87,7 +83,7 @@ calcoffsets(void)
|
|||||||
int i, n;
|
int i, n;
|
||||||
|
|
||||||
if (lines > 0)
|
if (lines > 0)
|
||||||
n = (lines * bh) - 1;
|
n = lines * bh;
|
||||||
else
|
else
|
||||||
n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
|
n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
|
||||||
/* calculate which items will begin the next page and previous page */
|
/* calculate which items will begin the next page and previous page */
|
||||||
@ -99,15 +95,6 @@ calcoffsets(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
|
||||||
max_textw(void)
|
|
||||||
{
|
|
||||||
int len = 0;
|
|
||||||
for (struct item *item = items; item && item->text; item++)
|
|
||||||
len = MAX(TEXTW(item->text), len);
|
|
||||||
return len;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
cleanup(void)
|
cleanup(void)
|
||||||
{
|
{
|
||||||
@ -142,47 +129,9 @@ cistrstr(const char *h, const char *n)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
drawhighlights(struct item *item, int x, int y, int maxw)
|
|
||||||
{
|
|
||||||
int i, indent;
|
|
||||||
char c, *highlight;
|
|
||||||
|
|
||||||
if (!(strlen(item->text) && strlen(text)))
|
|
||||||
return;
|
|
||||||
|
|
||||||
drw_setscheme(drw, scheme[item == sel
|
|
||||||
? SchemeSelHighlight
|
|
||||||
: SchemeNormHighlight]);
|
|
||||||
for (i = 0, highlight = item->text; *highlight && text[i];) {
|
|
||||||
if (!fstrncmp(highlight, &text[i], 1)) {
|
|
||||||
/* get indentation */
|
|
||||||
c = *highlight;
|
|
||||||
*highlight = '\0';
|
|
||||||
indent = TEXTW(item->text);
|
|
||||||
*highlight = c;
|
|
||||||
|
|
||||||
/* highlight character */
|
|
||||||
c = highlight[1];
|
|
||||||
highlight[1] = '\0';
|
|
||||||
drw_text(
|
|
||||||
drw,
|
|
||||||
x + indent - (lrpad / 2.),
|
|
||||||
y,
|
|
||||||
MIN(maxw - indent, TEXTW(highlight) - lrpad),
|
|
||||||
bh, 0, highlight, 0
|
|
||||||
);
|
|
||||||
highlight[1] = c;
|
|
||||||
++i;
|
|
||||||
}
|
|
||||||
++highlight;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
drawitem(struct item *item, int x, int y, int w)
|
drawitem(struct item *item, int x, int y, int w)
|
||||||
{
|
{
|
||||||
int r;
|
|
||||||
if (item == sel)
|
if (item == sel)
|
||||||
drw_setscheme(drw, scheme[SchemeSel]);
|
drw_setscheme(drw, scheme[SchemeSel]);
|
||||||
else if (item->out)
|
else if (item->out)
|
||||||
@ -190,25 +139,7 @@ drawitem(struct item *item, int x, int y, int w)
|
|||||||
else
|
else
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
|
||||||
r = drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
||||||
drawhighlights(item, x, y, w);
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
drawdate(int x, int y, int w)
|
|
||||||
{
|
|
||||||
char date[128];
|
|
||||||
time_t t = time(NULL);
|
|
||||||
struct tm *tm = localtime(&t);
|
|
||||||
|
|
||||||
/* Hour:Minute DayOfTheWeek DayOfTheMonth Month Year */
|
|
||||||
strftime(date, sizeof(date), "%H:%M %A %d %B %Y", tm);
|
|
||||||
|
|
||||||
drw_setscheme(drw, scheme[SchemeSel]);
|
|
||||||
|
|
||||||
int r = drw_text(drw, x, y, w, bh, lrpad / 2, date, 0);
|
|
||||||
return r;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -240,8 +171,6 @@ drawmenu(void)
|
|||||||
/* draw vertical list */
|
/* draw vertical list */
|
||||||
for (item = curr; item != next; item = item->right)
|
for (item = curr; item != next; item = item->right)
|
||||||
drawitem(item, x, y += bh, mw - x);
|
drawitem(item, x, y += bh, mw - x);
|
||||||
|
|
||||||
drawdate(x, lines * bh, w);
|
|
||||||
} else if (matches) {
|
} else if (matches) {
|
||||||
/* draw horizontal list */
|
/* draw horizontal list */
|
||||||
x += inputw;
|
x += inputw;
|
||||||
@ -297,94 +226,9 @@ grabkeyboard(void)
|
|||||||
die("cannot grab keyboard");
|
die("cannot grab keyboard");
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
compare_distance(const void *a, const void *b)
|
|
||||||
{
|
|
||||||
struct item *da = *(struct item **) a;
|
|
||||||
struct item *db = *(struct item **) b;
|
|
||||||
|
|
||||||
if (!db)
|
|
||||||
return 1;
|
|
||||||
if (!da)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return da->distance == db->distance ? 0 : da->distance < db->distance ? -1 : 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
fuzzymatch(void)
|
|
||||||
{
|
|
||||||
/* bang - we have so much memory */
|
|
||||||
struct item *it;
|
|
||||||
struct item **fuzzymatches = NULL;
|
|
||||||
char c;
|
|
||||||
int number_of_matches = 0, i, pidx, sidx, eidx;
|
|
||||||
int text_len = strlen(text), itext_len;
|
|
||||||
|
|
||||||
matches = matchend = NULL;
|
|
||||||
|
|
||||||
/* walk through all items */
|
|
||||||
for (it = items; it && it->text; it++) {
|
|
||||||
if (text_len) {
|
|
||||||
itext_len = strlen(it->text);
|
|
||||||
pidx = 0; /* pointer */
|
|
||||||
sidx = eidx = -1; /* start of match, end of match */
|
|
||||||
/* walk through item text */
|
|
||||||
for (i = 0; i < itext_len && (c = it->text[i]); i++) {
|
|
||||||
/* fuzzy match pattern */
|
|
||||||
if (!fstrncmp(&text[pidx], &c, 1)) {
|
|
||||||
if(sidx == -1)
|
|
||||||
sidx = i;
|
|
||||||
pidx++;
|
|
||||||
if (pidx == text_len) {
|
|
||||||
eidx = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* build list of matches */
|
|
||||||
if (eidx != -1) {
|
|
||||||
/* compute distance */
|
|
||||||
/* add penalty if match starts late (log(sidx+2))
|
|
||||||
* add penalty for long a match without many matching characters */
|
|
||||||
it->distance = log(sidx + 2) + (double)(eidx - sidx - text_len);
|
|
||||||
/* fprintf(stderr, "distance %s %f\n", it->text, it->distance); */
|
|
||||||
appenditem(it, &matches, &matchend);
|
|
||||||
number_of_matches++;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
appenditem(it, &matches, &matchend);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (number_of_matches) {
|
|
||||||
/* initialize array with matches */
|
|
||||||
if (!(fuzzymatches = realloc(fuzzymatches, number_of_matches * sizeof(struct item*))))
|
|
||||||
die("cannot realloc %u bytes:", number_of_matches * sizeof(struct item*));
|
|
||||||
for (i = 0, it = matches; it && i < number_of_matches; i++, it = it->right) {
|
|
||||||
fuzzymatches[i] = it;
|
|
||||||
}
|
|
||||||
/* sort matches according to distance */
|
|
||||||
qsort(fuzzymatches, number_of_matches, sizeof(struct item*), compare_distance);
|
|
||||||
/* rebuild list of matches */
|
|
||||||
matches = matchend = NULL;
|
|
||||||
for (i = 0, it = fuzzymatches[i]; i < number_of_matches && it && \
|
|
||||||
it->text; i++, it = fuzzymatches[i]) {
|
|
||||||
appenditem(it, &matches, &matchend);
|
|
||||||
}
|
|
||||||
free(fuzzymatches);
|
|
||||||
}
|
|
||||||
curr = sel = matches;
|
|
||||||
calcoffsets();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
match(void)
|
match(void)
|
||||||
{
|
{
|
||||||
if (fuzzy) {
|
|
||||||
fuzzymatch();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
static char **tokv = NULL;
|
static char **tokv = NULL;
|
||||||
static int tokn = 0;
|
static int tokn = 0;
|
||||||
|
|
||||||
@ -792,7 +636,6 @@ setup(void)
|
|||||||
bh = drw->fonts->h + 2;
|
bh = drw->fonts->h + 2;
|
||||||
lines = MAX(lines, 0);
|
lines = MAX(lines, 0);
|
||||||
mh = (lines + 1) * bh;
|
mh = (lines + 1) * bh;
|
||||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
|
||||||
#ifdef XINERAMA
|
#ifdef XINERAMA
|
||||||
i = 0;
|
i = 0;
|
||||||
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
||||||
@ -819,16 +662,9 @@ setup(void)
|
|||||||
if (INTERSECT(x, y, 1, 1, info[i]) != 0)
|
if (INTERSECT(x, y, 1, 1, info[i]) != 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (centered) {
|
|
||||||
mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
|
|
||||||
x = info[i].x_org + ((info[i].width - mw) / 2);
|
|
||||||
y = info[i].y_org + ((info[i].height - mh) / menu_height_ratio);
|
|
||||||
} else {
|
|
||||||
x = info[i].x_org;
|
x = info[i].x_org;
|
||||||
y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
||||||
mw = info[i].width;
|
mw = info[i].width;
|
||||||
}
|
|
||||||
|
|
||||||
XFree(info);
|
XFree(info);
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
@ -836,17 +672,10 @@ setup(void)
|
|||||||
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
||||||
die("could not get embedding window attributes: 0x%lx",
|
die("could not get embedding window attributes: 0x%lx",
|
||||||
parentwin);
|
parentwin);
|
||||||
|
|
||||||
if (centered) {
|
|
||||||
mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
|
|
||||||
x = (wa.width - mw) / 2;
|
|
||||||
y = (wa.height - mh) / 2;
|
|
||||||
} else {
|
|
||||||
x = 0;
|
x = 0;
|
||||||
y = topbar ? 0 : wa.height - mh;
|
y = topbar ? 0 : wa.height - mh;
|
||||||
mw = wa.width;
|
mw = wa.width;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
||||||
inputw = mw / 3; /* input width: ~33% of monitor width */
|
inputw = mw / 3; /* input width: ~33% of monitor width */
|
||||||
match();
|
match();
|
||||||
@ -855,11 +684,9 @@ setup(void)
|
|||||||
swa.override_redirect = True;
|
swa.override_redirect = True;
|
||||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||||
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
||||||
win = XCreateWindow(dpy, root, x, y, mw, mh, border_width,
|
win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
|
||||||
CopyFromParent, CopyFromParent, CopyFromParent,
|
CopyFromParent, CopyFromParent, CopyFromParent,
|
||||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
||||||
if (border_width)
|
|
||||||
XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
|
|
||||||
XSetClassHint(dpy, win, &ch);
|
XSetClassHint(dpy, win, &ch);
|
||||||
|
|
||||||
|
|
||||||
@ -889,8 +716,7 @@ static void
|
|||||||
usage(void)
|
usage(void)
|
||||||
{
|
{
|
||||||
die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
||||||
" [-nb color] [-nf color] [-sb color] [-sf color]\n"
|
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]");
|
||||||
" [-nhb color] [-nhf color] [-shb color] [-shf color] [-w windowid]");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@ -908,10 +734,6 @@ main(int argc, char *argv[])
|
|||||||
topbar = 0;
|
topbar = 0;
|
||||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
||||||
fast = 1;
|
fast = 1;
|
||||||
else if (!strcmp(argv[i], "-F")) /* grabs keyboard before reading stdin */
|
|
||||||
fuzzy = 0;
|
|
||||||
else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */
|
|
||||||
centered = 1;
|
|
||||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
||||||
fstrncmp = strncasecmp;
|
fstrncmp = strncasecmp;
|
||||||
fstrstr = cistrstr;
|
fstrstr = cistrstr;
|
||||||
@ -934,18 +756,8 @@ main(int argc, char *argv[])
|
|||||||
colors[SchemeSel][ColBg] = argv[++i];
|
colors[SchemeSel][ColBg] = argv[++i];
|
||||||
else if (!strcmp(argv[i], "-sf")) /* selected foreground color */
|
else if (!strcmp(argv[i], "-sf")) /* selected foreground color */
|
||||||
colors[SchemeSel][ColFg] = argv[++i];
|
colors[SchemeSel][ColFg] = argv[++i];
|
||||||
else if (!strcmp(argv[i], "-nhb")) /* normal hi background color */
|
|
||||||
colors[SchemeNormHighlight][ColBg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-nhf")) /* normal hi foreground color */
|
|
||||||
colors[SchemeNormHighlight][ColFg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-shb")) /* selected hi background color */
|
|
||||||
colors[SchemeSelHighlight][ColBg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-shf")) /* selected hi foreground color */
|
|
||||||
colors[SchemeSelHighlight][ColFg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-w")) /* embedding window id */
|
else if (!strcmp(argv[i], "-w")) /* embedding window id */
|
||||||
embed = argv[++i];
|
embed = argv[++i];
|
||||||
else if (!strcmp(argv[i], "-bw"))
|
|
||||||
border_width = atoi(argv[++i]); /* border width */
|
|
||||||
else
|
else
|
||||||
usage();
|
usage();
|
||||||
|
|
||||||
|
@ -1,36 +0,0 @@
|
|||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1edb647..dd3eb31 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -21,3 +21,6 @@ static unsigned int lines = 0;
|
|
||||||
* for example: " /?\"&[]"
|
|
||||||
*/
|
|
||||||
static const char worddelimiters[] = " ";
|
|
||||||
+
|
|
||||||
+/* Size of the window border */
|
|
||||||
+static unsigned int border_width = 0;
|
|
||||||
diff --git a/dmenu.c b/dmenu.c
|
|
||||||
index 27b7a30..7c130fc 100644
|
|
||||||
--- a/dmenu.c
|
|
||||||
+++ b/dmenu.c
|
|
||||||
@@ -684,9 +684,11 @@ setup(void)
|
|
||||||
swa.override_redirect = True;
|
|
||||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
|
||||||
- win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
|
|
||||||
+ win = XCreateWindow(dpy, root, x, y, mw, mh, border_width,
|
|
||||||
CopyFromParent, CopyFromParent, CopyFromParent,
|
|
||||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
|
||||||
+ if (border_width)
|
|
||||||
+ XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
|
|
||||||
XSetClassHint(dpy, win, &ch);
|
|
||||||
|
|
||||||
|
|
||||||
@@ -757,6 +759,8 @@ main(int argc, char *argv[])
|
|
||||||
colors[SchemeSel][ColFg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-w")) /* embedding window id */
|
|
||||||
embed = argv[++i];
|
|
||||||
+ else if (!strcmp(argv[i], "-bw"))
|
|
||||||
+ border_width = atoi(argv[++i]); /* border width */
|
|
||||||
else
|
|
||||||
usage();
|
|
@ -1,119 +0,0 @@
|
|||||||
From 36c3d68f185f47cbb754569775b7888728be4711 Mon Sep 17 00:00:00 2001
|
|
||||||
From: elbachir-one <bachiralfa@gmail.com>
|
|
||||||
Date: Sun, 16 Jun 2024 21:28:41 +0100
|
|
||||||
Subject: [PATCH] Adding an option to change the height as well
|
|
||||||
|
|
||||||
---
|
|
||||||
config.def.h | 3 +++
|
|
||||||
dmenu.1 | 3 +++
|
|
||||||
dmenu.c | 38 ++++++++++++++++++++++++++++++++------
|
|
||||||
3 files changed, 38 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1edb647..832896f 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -2,6 +2,9 @@
|
|
||||||
/* Default settings; can be overriden by command line. */
|
|
||||||
|
|
||||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
|
||||||
+static int centered = 1; /* -c option; centers dmenu on screen */
|
|
||||||
+static int min_width = 500; /* minimum width when centered */
|
|
||||||
+static const float menu_height_ratio = 4.0f; /* This is the ratio used in the original calculation */
|
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
|
||||||
static const char *fonts[] = {
|
|
||||||
"monospace:size=10"
|
|
||||||
diff --git a/dmenu.1 b/dmenu.1
|
|
||||||
index 323f93c..c036baa 100644
|
|
||||||
--- a/dmenu.1
|
|
||||||
+++ b/dmenu.1
|
|
||||||
@@ -40,6 +40,9 @@ which lists programs in the user's $PATH and runs the result in their $SHELL.
|
|
||||||
.B \-b
|
|
||||||
dmenu appears at the bottom of the screen.
|
|
||||||
.TP
|
|
||||||
+.B \-c
|
|
||||||
+dmenu appears centered on the screen.
|
|
||||||
+.TP
|
|
||||||
.B \-f
|
|
||||||
dmenu grabs the keyboard before reading stdin if not reading from a tty. This
|
|
||||||
is faster, but will lock up X until stdin reaches end\-of\-file.
|
|
||||||
diff --git a/dmenu.c b/dmenu.c
|
|
||||||
index 40f93e0..32d6a9d 100644
|
|
||||||
--- a/dmenu.c
|
|
||||||
+++ b/dmenu.c
|
|
||||||
@@ -95,6 +95,15 @@ calcoffsets(void)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int
|
|
||||||
+max_textw(void)
|
|
||||||
+{
|
|
||||||
+ int len = 0;
|
|
||||||
+ for (struct item *item = items; item && item->text; item++)
|
|
||||||
+ len = MAX(TEXTW(item->text), len);
|
|
||||||
+ return len;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
cleanup(void)
|
|
||||||
{
|
|
||||||
@@ -636,6 +645,7 @@ setup(void)
|
|
||||||
bh = drw->fonts->h + 2;
|
|
||||||
lines = MAX(lines, 0);
|
|
||||||
mh = (lines + 1) * bh;
|
|
||||||
+ promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
|
||||||
#ifdef XINERAMA
|
|
||||||
i = 0;
|
|
||||||
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
|
||||||
@@ -662,9 +672,16 @@ setup(void)
|
|
||||||
if (INTERSECT(x, y, 1, 1, info[i]) != 0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
- x = info[i].x_org;
|
|
||||||
- y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
|
||||||
- mw = info[i].width;
|
|
||||||
+ if (centered) {
|
|
||||||
+ mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
|
|
||||||
+ x = info[i].x_org + ((info[i].width - mw) / 2);
|
|
||||||
+ y = info[i].y_org + ((info[i].height - mh) / menu_height_ratio);
|
|
||||||
+ } else {
|
|
||||||
+ x = info[i].x_org;
|
|
||||||
+ y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
|
|
||||||
+ mw = info[i].width;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
XFree(info);
|
|
||||||
} else
|
|
||||||
#endif
|
|
||||||
@@ -672,9 +689,16 @@ setup(void)
|
|
||||||
if (!XGetWindowAttributes(dpy, parentwin, &wa))
|
|
||||||
die("could not get embedding window attributes: 0x%lx",
|
|
||||||
parentwin);
|
|
||||||
- x = 0;
|
|
||||||
- y = topbar ? 0 : wa.height - mh;
|
|
||||||
- mw = wa.width;
|
|
||||||
+
|
|
||||||
+ if (centered) {
|
|
||||||
+ mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
|
|
||||||
+ x = (wa.width - mw) / 2;
|
|
||||||
+ y = (wa.height - mh) / 2;
|
|
||||||
+ } else {
|
|
||||||
+ x = 0;
|
|
||||||
+ y = topbar ? 0 : wa.height - mh;
|
|
||||||
+ mw = wa.width;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
|
|
||||||
inputw = mw / 3; /* input width: ~33% of monitor width */
|
|
||||||
@@ -734,6 +758,8 @@ main(int argc, char *argv[])
|
|
||||||
topbar = 0;
|
|
||||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
|
||||||
fast = 1;
|
|
||||||
+ else if (!strcmp(argv[i], "-c")) /* centers dmenu on screen */
|
|
||||||
+ centered = 1;
|
|
||||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
|
||||||
fstrncmp = strncasecmp;
|
|
||||||
fstrstr = cistrstr;
|
|
||||||
--
|
|
||||||
2.45.2
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
|||||||
From 64fb38e3778addc0272eb8793deb909e639e5746 Mon Sep 17 00:00:00 2001
|
|
||||||
From: piotr-marendowski <piotr-marendowski@tutanota.com>
|
|
||||||
Date: Thu, 6 Jul 2023 10:03:03 +0000
|
|
||||||
Subject: [PATCH] Displays date and time at the bottom of the vertical layout.
|
|
||||||
|
|
||||||
---
|
|
||||||
dmenu.c | 20 +++++++++++++++++++-
|
|
||||||
1 file changed, 19 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/dmenu.c b/dmenu.c
|
|
||||||
index 7cf253b..5428f67 100644
|
|
||||||
--- a/dmenu.c
|
|
||||||
+++ b/dmenu.c
|
|
||||||
@@ -84,7 +84,7 @@ calcoffsets(void)
|
|
||||||
int i, n;
|
|
||||||
|
|
||||||
if (lines > 0)
|
|
||||||
- n = lines * bh;
|
|
||||||
+ n = (lines * bh) - 1;
|
|
||||||
else
|
|
||||||
n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
|
|
||||||
/* calculate which items will begin the next page and previous page */
|
|
||||||
@@ -143,6 +143,22 @@ drawitem(struct item *item, int x, int y, int w)
|
|
||||||
return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int
|
|
||||||
+drawdate(int x, int y, int w)
|
|
||||||
+{
|
|
||||||
+ char date[128];
|
|
||||||
+ time_t t = time(NULL);
|
|
||||||
+ struct tm *tm = localtime(&t);
|
|
||||||
+
|
|
||||||
+ /* Hour:Minute DayOfTheWeek DayOfTheMonth Month Year */
|
|
||||||
+ strftime(date, sizeof(date), "%H:%M %A %d %B %Y", tm);
|
|
||||||
+
|
|
||||||
+ drw_setscheme(drw, scheme[SchemeSel]);
|
|
||||||
+
|
|
||||||
+ int r = drw_text(drw, x, y, w, bh, lrpad / 2, date, 0);
|
|
||||||
+ return r;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
drawmenu(void)
|
|
||||||
{
|
|
||||||
@@ -172,6 +188,8 @@ drawmenu(void)
|
|
||||||
/* draw vertical list */
|
|
||||||
for (item = curr; item != next; item = item->right)
|
|
||||||
drawitem(item, x, y += bh, mw - x);
|
|
||||||
+
|
|
||||||
+ drawdate(x, lines * bh, w);
|
|
||||||
} else if (matches) {
|
|
||||||
/* draw horizontal list */
|
|
||||||
x += inputw;
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
@ -1,165 +0,0 @@
|
|||||||
From dd0327d33a3c5269ed128e0903787365625bd507 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Justinas Grigas <dev@jstnas.com>
|
|
||||||
Date: Sun, 16 Jun 2024 00:38:53 +0100
|
|
||||||
Subject: [PATCH] fuzzyhighlight: highlight fuzzy matches
|
|
||||||
|
|
||||||
This patch actually fixes the highlighted character offset
|
|
||||||
---
|
|
||||||
config.def.h | 2 ++
|
|
||||||
dmenu.1 | 20 ++++++++++++++++++
|
|
||||||
dmenu.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++---
|
|
||||||
3 files changed, 76 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1edb647..64eab2a 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -11,6 +11,8 @@ static const char *colors[SchemeLast][2] = {
|
|
||||||
/* fg bg */
|
|
||||||
[SchemeNorm] = { "#bbbbbb", "#222222" },
|
|
||||||
[SchemeSel] = { "#eeeeee", "#005577" },
|
|
||||||
+ [SchemeSelHighlight] = { "#ffc978", "#005577" },
|
|
||||||
+ [SchemeNormHighlight] = { "#ffc978", "#222222" },
|
|
||||||
[SchemeOut] = { "#000000", "#00ffff" },
|
|
||||||
};
|
|
||||||
/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
|
|
||||||
diff --git a/dmenu.1 b/dmenu.1
|
|
||||||
index 323f93c..472b179 100644
|
|
||||||
--- a/dmenu.1
|
|
||||||
+++ b/dmenu.1
|
|
||||||
@@ -20,6 +20,14 @@ dmenu \- dynamic menu
|
|
||||||
.IR color ]
|
|
||||||
.RB [ \-sf
|
|
||||||
.IR color ]
|
|
||||||
+.RB [ \-nhb
|
|
||||||
+.IR color ]
|
|
||||||
+.RB [ \-nhf
|
|
||||||
+.IR color ]
|
|
||||||
+.RB [ \-shb
|
|
||||||
+.IR color ]
|
|
||||||
+.RB [ \-shf
|
|
||||||
+.IR color ]
|
|
||||||
.RB [ \-w
|
|
||||||
.IR windowid ]
|
|
||||||
.P
|
|
||||||
@@ -75,6 +83,18 @@ defines the selected background color.
|
|
||||||
.BI \-sf " color"
|
|
||||||
defines the selected foreground color.
|
|
||||||
.TP
|
|
||||||
+.BI \-nhb " color"
|
|
||||||
+defines the normal highlight background color.
|
|
||||||
+.TP
|
|
||||||
+.BI \-nhf " color"
|
|
||||||
+defines the normal highlight foreground color.
|
|
||||||
+.TP
|
|
||||||
+.BI \-shb " color"
|
|
||||||
+defines the selected highlight background color.
|
|
||||||
+.TP
|
|
||||||
+.BI \-shf " color"
|
|
||||||
+defines the selected highlight foreground color.
|
|
||||||
+.TP
|
|
||||||
.B \-v
|
|
||||||
prints version information to stdout, then exits.
|
|
||||||
.TP
|
|
||||||
diff --git a/dmenu.c b/dmenu.c
|
|
||||||
index 40f93e0..662131a 100644
|
|
||||||
--- a/dmenu.c
|
|
||||||
+++ b/dmenu.c
|
|
||||||
@@ -25,7 +25,9 @@
|
|
||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
||||||
|
|
||||||
/* enums */
|
|
||||||
-enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
|
|
||||||
+enum { SchemeNorm, SchemeSel, SchemeNormHighlight, SchemeSelHighlight,
|
|
||||||
+ SchemeOut, SchemeLast }; /* color schemes */
|
|
||||||
+
|
|
||||||
|
|
||||||
struct item {
|
|
||||||
char *text;
|
|
||||||
@@ -129,9 +131,47 @@ cistrstr(const char *h, const char *n)
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void
|
|
||||||
+drawhighlights(struct item *item, int x, int y, int maxw)
|
|
||||||
+{
|
|
||||||
+ int i, indent;
|
|
||||||
+ char c, *highlight;
|
|
||||||
+
|
|
||||||
+ if (!(strlen(item->text) && strlen(text)))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ drw_setscheme(drw, scheme[item == sel
|
|
||||||
+ ? SchemeSelHighlight
|
|
||||||
+ : SchemeNormHighlight]);
|
|
||||||
+ for (i = 0, highlight = item->text; *highlight && text[i];) {
|
|
||||||
+ if (!fstrncmp(highlight, &text[i], 1)) {
|
|
||||||
+ /* get indentation */
|
|
||||||
+ c = *highlight;
|
|
||||||
+ *highlight = '\0';
|
|
||||||
+ indent = TEXTW(item->text);
|
|
||||||
+ *highlight = c;
|
|
||||||
+
|
|
||||||
+ /* highlight character */
|
|
||||||
+ c = highlight[1];
|
|
||||||
+ highlight[1] = '\0';
|
|
||||||
+ drw_text(
|
|
||||||
+ drw,
|
|
||||||
+ x + indent - (lrpad / 2.),
|
|
||||||
+ y,
|
|
||||||
+ MIN(maxw - indent, TEXTW(highlight) - lrpad),
|
|
||||||
+ bh, 0, highlight, 0
|
|
||||||
+ );
|
|
||||||
+ highlight[1] = c;
|
|
||||||
+ ++i;
|
|
||||||
+ }
|
|
||||||
+ ++highlight;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int
|
|
||||||
drawitem(struct item *item, int x, int y, int w)
|
|
||||||
{
|
|
||||||
+ int r;
|
|
||||||
if (item == sel)
|
|
||||||
drw_setscheme(drw, scheme[SchemeSel]);
|
|
||||||
else if (item->out)
|
|
||||||
@@ -139,7 +179,9 @@ drawitem(struct item *item, int x, int y, int w)
|
|
||||||
else
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
|
|
||||||
- return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
|
||||||
+ r = drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
|
|
||||||
+ drawhighlights(item, x, y, w);
|
|
||||||
+ return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
@@ -716,7 +758,8 @@ static void
|
|
||||||
usage(void)
|
|
||||||
{
|
|
||||||
die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
|
||||||
- " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]");
|
|
||||||
+ " [-nb color] [-nf color] [-sb color] [-sf color]\n"
|
|
||||||
+ " [-nhb color] [-nhf color] [-shb color] [-shf color] [-w windowid]");
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
@@ -756,6 +799,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], "-nhb")) /* normal hi background color */
|
|
||||||
+ colors[SchemeNormHighlight][ColBg] = argv[++i];
|
|
||||||
+ else if (!strcmp(argv[i], "-nhf")) /* normal hi foreground color */
|
|
||||||
+ colors[SchemeNormHighlight][ColFg] = argv[++i];
|
|
||||||
+ else if (!strcmp(argv[i], "-shb")) /* selected hi background color */
|
|
||||||
+ colors[SchemeSelHighlight][ColBg] = argv[++i];
|
|
||||||
+ else if (!strcmp(argv[i], "-shf")) /* selected hi foreground color */
|
|
||||||
+ colors[SchemeSelHighlight][ColFg] = argv[++i];
|
|
||||||
else if (!strcmp(argv[i], "-w")) /* embedding window id */
|
|
||||||
embed = argv[++i];
|
|
||||||
else
|
|
||||||
--
|
|
||||||
2.45.2
|
|
||||||
|
|
@ -1,163 +0,0 @@
|
|||||||
From 94353eb52055927d9079f3d9e33da1c954abf386 Mon Sep 17 00:00:00 2001
|
|
||||||
From: aleks <aleks.stier@icloud.com>
|
|
||||||
Date: Wed, 26 Jun 2019 13:25:10 +0200
|
|
||||||
Subject: [PATCH] Add support for fuzzy-matching
|
|
||||||
|
|
||||||
---
|
|
||||||
config.def.h | 1 +
|
|
||||||
config.mk | 2 +-
|
|
||||||
dmenu.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
3 files changed, 91 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1edb647..51612b9 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
/* Default settings; can be overriden by command line. */
|
|
||||||
|
|
||||||
static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */
|
|
||||||
+static int fuzzy = 1; /* -F option; if 0, dmenu doesn't use fuzzy matching */
|
|
||||||
/* -fn option overrides fonts[0]; default X11 font or font set */
|
|
||||||
static const char *fonts[] = {
|
|
||||||
"monospace:size=10"
|
|
||||||
diff --git a/config.mk b/config.mk
|
|
||||||
index 0929b4a..d14309a 100644
|
|
||||||
--- a/config.mk
|
|
||||||
+++ b/config.mk
|
|
||||||
@@ -20,7 +20,7 @@ FREETYPEINC = /usr/include/freetype2
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I$(X11INC) -I$(FREETYPEINC)
|
|
||||||
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
|
|
||||||
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lm
|
|
||||||
|
|
||||||
# flags
|
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
|
|
||||||
diff --git a/dmenu.c b/dmenu.c
|
|
||||||
index 6b8f51b..96ddc98 100644
|
|
||||||
--- a/dmenu.c
|
|
||||||
+++ b/dmenu.c
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <locale.h>
|
|
||||||
+#include <math.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
@@ -32,6 +33,7 @@ struct item {
|
|
||||||
char *text;
|
|
||||||
struct item *left, *right;
|
|
||||||
int out;
|
|
||||||
+ double distance;
|
|
||||||
};
|
|
||||||
|
|
||||||
static char text[BUFSIZ] = "";
|
|
||||||
@@ -210,9 +212,94 @@ grabkeyboard(void)
|
|
||||||
die("cannot grab keyboard");
|
|
||||||
}
|
|
||||||
|
|
||||||
+int
|
|
||||||
+compare_distance(const void *a, const void *b)
|
|
||||||
+{
|
|
||||||
+ struct item *da = *(struct item **) a;
|
|
||||||
+ struct item *db = *(struct item **) b;
|
|
||||||
+
|
|
||||||
+ if (!db)
|
|
||||||
+ return 1;
|
|
||||||
+ if (!da)
|
|
||||||
+ return -1;
|
|
||||||
+
|
|
||||||
+ return da->distance == db->distance ? 0 : da->distance < db->distance ? -1 : 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+fuzzymatch(void)
|
|
||||||
+{
|
|
||||||
+ /* bang - we have so much memory */
|
|
||||||
+ struct item *it;
|
|
||||||
+ struct item **fuzzymatches = NULL;
|
|
||||||
+ char c;
|
|
||||||
+ int number_of_matches = 0, i, pidx, sidx, eidx;
|
|
||||||
+ int text_len = strlen(text), itext_len;
|
|
||||||
+
|
|
||||||
+ matches = matchend = NULL;
|
|
||||||
+
|
|
||||||
+ /* walk through all items */
|
|
||||||
+ for (it = items; it && it->text; it++) {
|
|
||||||
+ if (text_len) {
|
|
||||||
+ itext_len = strlen(it->text);
|
|
||||||
+ pidx = 0; /* pointer */
|
|
||||||
+ sidx = eidx = -1; /* start of match, end of match */
|
|
||||||
+ /* walk through item text */
|
|
||||||
+ for (i = 0; i < itext_len && (c = it->text[i]); i++) {
|
|
||||||
+ /* fuzzy match pattern */
|
|
||||||
+ if (!fstrncmp(&text[pidx], &c, 1)) {
|
|
||||||
+ if(sidx == -1)
|
|
||||||
+ sidx = i;
|
|
||||||
+ pidx++;
|
|
||||||
+ if (pidx == text_len) {
|
|
||||||
+ eidx = i;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ /* build list of matches */
|
|
||||||
+ if (eidx != -1) {
|
|
||||||
+ /* compute distance */
|
|
||||||
+ /* add penalty if match starts late (log(sidx+2))
|
|
||||||
+ * add penalty for long a match without many matching characters */
|
|
||||||
+ it->distance = log(sidx + 2) + (double)(eidx - sidx - text_len);
|
|
||||||
+ /* fprintf(stderr, "distance %s %f\n", it->text, it->distance); */
|
|
||||||
+ appenditem(it, &matches, &matchend);
|
|
||||||
+ number_of_matches++;
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ appenditem(it, &matches, &matchend);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (number_of_matches) {
|
|
||||||
+ /* initialize array with matches */
|
|
||||||
+ if (!(fuzzymatches = realloc(fuzzymatches, number_of_matches * sizeof(struct item*))))
|
|
||||||
+ die("cannot realloc %u bytes:", number_of_matches * sizeof(struct item*));
|
|
||||||
+ for (i = 0, it = matches; it && i < number_of_matches; i++, it = it->right) {
|
|
||||||
+ fuzzymatches[i] = it;
|
|
||||||
+ }
|
|
||||||
+ /* sort matches according to distance */
|
|
||||||
+ qsort(fuzzymatches, number_of_matches, sizeof(struct item*), compare_distance);
|
|
||||||
+ /* rebuild list of matches */
|
|
||||||
+ matches = matchend = NULL;
|
|
||||||
+ for (i = 0, it = fuzzymatches[i]; i < number_of_matches && it && \
|
|
||||||
+ it->text; i++, it = fuzzymatches[i]) {
|
|
||||||
+ appenditem(it, &matches, &matchend);
|
|
||||||
+ }
|
|
||||||
+ free(fuzzymatches);
|
|
||||||
+ }
|
|
||||||
+ curr = sel = matches;
|
|
||||||
+ calcoffsets();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
match(void)
|
|
||||||
{
|
|
||||||
+ if (fuzzy) {
|
|
||||||
+ fuzzymatch();
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
static char **tokv = NULL;
|
|
||||||
static int tokn = 0;
|
|
||||||
|
|
||||||
@@ -702,6 +789,8 @@ main(int argc, char *argv[])
|
|
||||||
topbar = 0;
|
|
||||||
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
|
||||||
fast = 1;
|
|
||||||
+ else if (!strcmp(argv[i], "-F")) /* grabs keyboard before reading stdin */
|
|
||||||
+ fuzzy = 0;
|
|
||||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
|
||||||
fstrncmp = strncasecmp;
|
|
||||||
fstrstr = cistrstr;
|
|
||||||
--
|
|
||||||
2.22.0
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user