tavo/dmenu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

new diff

Browse source
This commit is contained in:
tavo-wasd 2024-04-28 22:15:58 -06:00
parent ee82ac14a9
commit 5d7a3c0e89
1 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
dmenu-5.3-tavo.diff
View file

@ -4,9 +4,9 @@ dmenu-center-5.2.diff
dmenu-fuzzymatch-4.9.diff dmenu-fuzzymatch-4.9.diff
dmenu-password-5.0.diff dmenu-password-5.0.diff
--- ---
diff -Nu a/config.def.h b/config.def.h diff '--color=auto' -Nu a/config.def.h b/config.def.h
--- a/config.def.h 2024-03-19 05:25:09.000000000 -0600 --- a/config.def.h 2024-03-19 05:25:09.000000000 -0600
+++ b/config.def.h 2024-04-27 10:52:25.869380160 -0600 +++ b/config.def.h 2024-04-28 21:58:37.487742963 -0600
@@ -2,6 +2,9 @@ @@ -2,6 +2,9 @@
/* Default settings; can be overriden by command line. */ /* Default settings; can be overriden by command line. */
@ -24,9 +24,9 @@ diff -Nu a/config.def.h b/config.def.h
+ +
+/* Size of the window border */ +/* Size of the window border */
+static unsigned int border_width = 0; +static unsigned int border_width = 0;
diff -Nu a/config.h b/config.h diff '--color=auto' -Nu a/config.h b/config.h
--- a/config.h 1969-12-31 18:00:00.000000000 -0600 --- a/config.h 1969-12-31 18:00:00.000000000 -0600
+++ b/config.h 2024-04-27 11:04:13.872392598 -0600 +++ b/config.h 2024-04-28 21:58:37.487742963 -0600
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
+/* See LICENSE file for copyright and license details. */ +/* See LICENSE file for copyright and license details. */
+/* Default settings; can be overriden by command line. */ +/* Default settings; can be overriden by command line. */
@ -57,9 +57,9 @@ diff -Nu a/config.h b/config.h
+ +
+/* Size of the window border */ +/* Size of the window border */
+static unsigned int border_width = 2; +static unsigned int border_width = 2;
diff -Nu a/config.mk b/config.mk diff '--color=auto' -Nu a/config.mk b/config.mk
--- a/config.mk 2024-03-19 05:25:09.000000000 -0600 --- a/config.mk 2024-03-19 05:25:09.000000000 -0600
+++ b/config.mk 2024-04-27 10:50:17.596133866 -0600 +++ b/config.mk 2024-04-28 21:58:37.487742963 -0600
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# includes and libs # includes and libs
@ -69,9 +69,9 @@ diff -Nu a/config.mk b/config.mk
# 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)
diff -Nu a/dmenu.1 b/dmenu.1 diff '--color=auto' -Nu a/dmenu.1 b/dmenu.1
--- a/dmenu.1 2024-03-19 05:25:09.000000000 -0600 --- a/dmenu.1 2024-03-19 05:25:09.000000000 -0600
+++ b/dmenu.1 2024-04-27 10:59:12.237385772 -0600 +++ b/dmenu.1 2024-04-28 21:58:37.487742963 -0600
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
dmenu \- dynamic menu dmenu \- dynamic menu
.SH SYNOPSIS .SH SYNOPSIS
@ -101,9 +101,9 @@ diff -Nu a/dmenu.1 b/dmenu.1
.BI \-l " lines" .BI \-l " lines"
dmenu lists items vertically, with the given number of lines. dmenu lists items vertically, with the given number of lines.
.TP .TP
diff -Nu a/dmenu.c b/dmenu.c diff '--color=auto' -Nu a/dmenu.c b/dmenu.c
--- a/dmenu.c 2024-03-19 05:25:09.000000000 -0600 --- a/dmenu.c 2024-03-19 05:25:09.000000000 -0600
+++ b/dmenu.c 2024-04-27 10:58:14.208809907 -0600 +++ b/dmenu.c 2024-04-28 22:04:56.279387589 -0600
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#include <ctype.h> #include <ctype.h>
@ -260,7 +260,24 @@ diff -Nu a/dmenu.c b/dmenu.c
static char **tokv = NULL; static char **tokv = NULL;
static int tokn = 0; static int tokn = 0;
@@ -551,6 +653,10 @@ @@ -514,12 +616,10 @@
}
break;
case XK_Tab:
- if (!sel)
- return;
- cursor = strnlen(sel->text, sizeof text - 1);
- memcpy(text, sel->text, cursor);
- text[cursor] = '\0';
- match();
+ if (sel && sel->right && (sel = sel->right) == next) {
+ curr = next;
+ calcoffsets();
+ }
break;
}
@@ -551,6 +651,10 @@
char *line = NULL; char *line = NULL;
size_t i, itemsiz = 0, linesiz = 0; size_t i, itemsiz = 0, linesiz = 0;
ssize_t len; ssize_t len;
@ -271,7 +288,7 @@ diff -Nu a/dmenu.c b/dmenu.c
/* read each line from stdin and add it to the item list */ /* read each line from stdin and add it to the item list */
for (i = 0; (len = getline(&line, &linesiz, stdin)) != -1; i++) { for (i = 0; (len = getline(&line, &linesiz, stdin)) != -1; i++) {
@@ -636,6 +742,7 @@ @@ -636,6 +740,7 @@
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;
@ -279,7 +296,7 @@ diff -Nu a/dmenu.c b/dmenu.c
#ifdef XINERAMA #ifdef XINERAMA
i = 0; i = 0;
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
@@ -662,9 +769,16 @@ @@ -662,9 +767,16 @@
if (INTERSECT(x, y, 1, 1, info[i]) != 0) if (INTERSECT(x, y, 1, 1, info[i]) != 0)
break; break;
@ -299,7 +316,7 @@ diff -Nu a/dmenu.c b/dmenu.c
XFree(info); XFree(info);
} else } else
#endif #endif
@@ -672,9 +786,16 @@ @@ -672,9 +784,16 @@
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);
@ -319,7 +336,7 @@ diff -Nu a/dmenu.c b/dmenu.c
} }
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 */
@@ -684,9 +805,11 @@ @@ -684,9 +803,11 @@
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;
@ -332,7 +349,7 @@ diff -Nu a/dmenu.c b/dmenu.c
XSetClassHint(dpy, win, &ch); XSetClassHint(dpy, win, &ch);
@@ -715,7 +838,7 @@ @@ -715,7 +836,7 @@
static void static void
usage(void) usage(void)
{ {
@ -341,7 +358,7 @@ diff -Nu a/dmenu.c b/dmenu.c
" [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]"); " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]");
} }
@@ -734,10 +857,16 @@ @@ -734,10 +855,16 @@
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;
@ -359,7 +376,7 @@ diff -Nu a/dmenu.c b/dmenu.c
usage(); usage();
/* these options take one argument */ /* these options take one argument */
else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */
@@ -758,6 +887,8 @@ @@ -758,6 +885,8 @@
colors[SchemeSel][ColFg] = argv[++i]; colors[SchemeSel][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];