add case-insensitive patches
This commit is contained in:
parent
78e783a6e6
commit
7cce7742a2
17
dmenu.c
17
dmenu.c
|
@ -62,8 +62,9 @@ static Clr *scheme[SchemeLast];
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
|
static char * cistrstr(const char *s, const char *sub);
|
||||||
static char *(*fstrstr)(const char *, const char *) = strstr;
|
static int (*fstrncmp)(const char *, const char *, size_t) = strncasecmp;
|
||||||
|
static char *(*fstrstr)(const char *, const char *) = cistrstr;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
appenditem(struct item *item, struct item **list, struct item **last)
|
appenditem(struct item *item, struct item **list, struct item **last)
|
||||||
|
@ -992,10 +993,14 @@ main(int argc, char *argv[])
|
||||||
fast = 1;
|
fast = 1;
|
||||||
else if (!strcmp(argv[i], "-F")) /* grabs keyboard before reading stdin */
|
else if (!strcmp(argv[i], "-F")) /* grabs keyboard before reading stdin */
|
||||||
fuzzy = 0;
|
fuzzy = 0;
|
||||||
else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
|
||||||
fstrncmp = strncasecmp;
|
else if (!strcmp(argv[i], "-s")) { /* case-sensitive item matching */
|
||||||
fstrstr = cistrstr;
|
fstrncmp = strncmp;
|
||||||
} else if (!strcmp(argv[i], "-P")) /* is the input a password */
|
fstrstr = strstr;
|
||||||
|
} else if (i + 1 == argc)
|
||||||
|
usage();
|
||||||
|
/* these options take one argument */
|
||||||
|
else if (!strcmp(argv[i], "-P")) /* is the input a password */
|
||||||
passwd = 1;
|
passwd = 1;
|
||||||
else if (i + 1 == argc)
|
else if (i + 1 == argc)
|
||||||
usage();
|
usage();
|
||||||
|
|
119
dmenu.c.orig
119
dmenu.c.orig
|
@ -658,6 +658,119 @@ draw:
|
||||||
drawmenu();
|
drawmenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
buttonpress(XEvent *e)
|
||||||
|
{
|
||||||
|
struct item *item;
|
||||||
|
XButtonPressedEvent *ev = &e->xbutton;
|
||||||
|
int x = 0, y = 0, h = bh, w;
|
||||||
|
|
||||||
|
if (ev->window != win)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* right-click: exit */
|
||||||
|
if (ev->button == Button3)
|
||||||
|
exit(1);
|
||||||
|
|
||||||
|
if (prompt && *prompt)
|
||||||
|
x += promptw;
|
||||||
|
|
||||||
|
/* input field */
|
||||||
|
w = (lines > 0 || !matches) ? mw - x : inputw;
|
||||||
|
|
||||||
|
/* left-click on input: clear input,
|
||||||
|
* NOTE: if there is no left-arrow the space for < is reserved so
|
||||||
|
* add that to the input width */
|
||||||
|
if (ev->button == Button1 &&
|
||||||
|
((lines <= 0 && ev->x >= 0 && ev->x <= x + w +
|
||||||
|
((!prev || !curr->left) ? TEXTW("<") : 0)) ||
|
||||||
|
(lines > 0 && ev->y >= y && ev->y <= y + h))) {
|
||||||
|
insert(NULL, -cursor);
|
||||||
|
drawmenu();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* middle-mouse click: paste selection */
|
||||||
|
if (ev->button == Button2) {
|
||||||
|
XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
|
||||||
|
utf8, utf8, win, CurrentTime);
|
||||||
|
drawmenu();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* scroll up */
|
||||||
|
if (ev->button == Button4 && prev) {
|
||||||
|
sel = curr = prev;
|
||||||
|
calcoffsets();
|
||||||
|
drawmenu();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* scroll down */
|
||||||
|
if (ev->button == Button5 && next) {
|
||||||
|
sel = curr = next;
|
||||||
|
calcoffsets();
|
||||||
|
drawmenu();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (ev->button != Button1)
|
||||||
|
return;
|
||||||
|
if (ev->state & ~ControlMask)
|
||||||
|
return;
|
||||||
|
if (lines > 0) {
|
||||||
|
/* vertical list: (ctrl)left-click on item */
|
||||||
|
w = mw - x;
|
||||||
|
for (item = curr; item != next; item = item->right) {
|
||||||
|
y += h;
|
||||||
|
if (ev->y >= y && ev->y <= (y + h)) {
|
||||||
|
puts(item->text);
|
||||||
|
if (!(ev->state & ControlMask))
|
||||||
|
exit(0);
|
||||||
|
sel = item;
|
||||||
|
if (sel) {
|
||||||
|
sel->out = 1;
|
||||||
|
drawmenu();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (matches) {
|
||||||
|
/* left-click on left arrow */
|
||||||
|
x += inputw;
|
||||||
|
w = TEXTW("<");
|
||||||
|
if (prev && curr->left) {
|
||||||
|
if (ev->x >= x && ev->x <= x + w) {
|
||||||
|
sel = curr = prev;
|
||||||
|
calcoffsets();
|
||||||
|
drawmenu();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* horizontal list: (ctrl)left-click on item */
|
||||||
|
for (item = curr; item != next; item = item->right) {
|
||||||
|
x += w;
|
||||||
|
w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
|
||||||
|
if (ev->x >= x && ev->x <= x + w) {
|
||||||
|
puts(item->text);
|
||||||
|
if (!(ev->state & ControlMask))
|
||||||
|
exit(0);
|
||||||
|
sel = item;
|
||||||
|
if (sel) {
|
||||||
|
sel->out = 1;
|
||||||
|
drawmenu();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* left-click on right arrow */
|
||||||
|
w = TEXTW(">");
|
||||||
|
x = mw - w;
|
||||||
|
if (next && ev->x >= x && ev->x <= x + w) {
|
||||||
|
sel = curr = next;
|
||||||
|
calcoffsets();
|
||||||
|
drawmenu();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
paste(void)
|
paste(void)
|
||||||
{
|
{
|
||||||
|
@ -724,6 +837,9 @@ run(void)
|
||||||
break;
|
break;
|
||||||
cleanup();
|
cleanup();
|
||||||
exit(1);
|
exit(1);
|
||||||
|
case ButtonPress:
|
||||||
|
buttonpress(&ev);
|
||||||
|
break;
|
||||||
case Expose:
|
case Expose:
|
||||||
if (ev.xexpose.count == 0)
|
if (ev.xexpose.count == 0)
|
||||||
drw_map(drw, win, 0, 0, mw, mh);
|
drw_map(drw, win, 0, 0, mw, mh);
|
||||||
|
@ -821,7 +937,8 @@ setup(void)
|
||||||
/* create menu window */
|
/* create menu window */
|
||||||
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 |
|
||||||
|
ButtonPressMask;
|
||||||
win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
|
win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
|
||||||
CopyFromParent, CopyFromParent, CopyFromParent,
|
CopyFromParent, CopyFromParent, CopyFromParent,
|
||||||
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
||||||
|
|
26
dmenu.c.rej
26
dmenu.c.rej
|
@ -1,11 +1,15 @@
|
||||||
--- dmenu.c 2019-09-25 12:48:38.848249931 -0600
|
--- dmenu.c
|
||||||
+++ dmenu.c 2019-09-25 12:48:55.756173240 -0600
|
+++ dmenu.c
|
||||||
@@ -693,7 +704,7 @@ setup(void)
|
@@ -710,9 +711,9 @@ main(int argc, char *argv[])
|
||||||
static void
|
topbar = 0;
|
||||||
usage(void)
|
else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
|
||||||
{
|
fast = 1;
|
||||||
- fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
- else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
|
||||||
+ fputs("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
|
- fstrncmp = strncasecmp;
|
||||||
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
|
- fstrstr = cistrstr;
|
||||||
exit(1);
|
+ else if (!strcmp(argv[i], "-s")) { /* case-sensitive item matching */
|
||||||
}
|
+ fstrncmp = strncmp;
|
||||||
|
+ fstrstr = strstr;
|
||||||
|
} else if (i + 1 == argc)
|
||||||
|
usage();
|
||||||
|
/* these options take one argument */
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
From 54acbdf72083a5eae5783eed42e162424ab2cec2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kim Torgersen <kim@torgersen.se>
|
||||||
|
Date: Sat, 23 May 2020 14:48:28 +0200
|
||||||
|
Subject: [PATCH] case-insensitive item matching default, case-sensitive option
|
||||||
|
(-s)
|
||||||
|
|
||||||
|
---
|
||||||
|
dmenu.c | 11 ++++++-----
|
||||||
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/dmenu.c b/dmenu.c
|
||||||
|
index 65f25ce..855df59 100644
|
||||||
|
--- a/dmenu.c
|
||||||
|
+++ b/dmenu.c
|
||||||
|
@@ -55,8 +55,9 @@ static Clr *scheme[SchemeLast];
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
-static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
|
||||||
|
-static char *(*fstrstr)(const char *, const char *) = strstr;
|
||||||
|
+static char * cistrstr(const char *s, const char *sub);
|
||||||
|
+static int (*fstrncmp)(const char *, const char *, size_t) = strncasecmp;
|
||||||
|
+static char *(*fstrstr)(const char *, const char *) = cistrstr;
|
||||||
|
|
||||||
|
static void
|
||||||
|
appenditem(struct item *item, struct item **list, struct item **last)
|
||||||
|
@@ -709,9 +710,9 @@ 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], "-i")) { /* case-insensitive item matching */
|
||||||
|
- fstrncmp = strncasecmp;
|
||||||
|
- fstrstr = cistrstr;
|
||||||
|
+ else if (!strcmp(argv[i], "-s")) { /* case-sensitive item matching */
|
||||||
|
+ fstrncmp = strncmp;
|
||||||
|
+ fstrstr = strstr;
|
||||||
|
} else if (i + 1 == argc)
|
||||||
|
usage();
|
||||||
|
/* these options take one argument */
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
Loading…
Reference in New Issue