From 5d7a3c0e8936328f64e87b3b5ad1cb35407046cf Mon Sep 17 00:00:00 2001
From: tavo-wasd <gustavo@gustavocalvo.xyz>
Date: Sun, 28 Apr 2024 22:15:58 -0600
Subject: [PATCH] new diff

---
 dmenu-5.3-tavo.diff | 53 ++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/dmenu-5.3-tavo.diff b/dmenu-5.3-tavo.diff
index 8c37158..61909da 100644
--- a/dmenu-5.3-tavo.diff
+++ b/dmenu-5.3-tavo.diff
@@ -4,9 +4,9 @@ dmenu-center-5.2.diff
 dmenu-fuzzymatch-4.9.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
-+++ 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 @@
  /* 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 */
 +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
-+++ 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 @@
 +/* See LICENSE file for copyright and license details. */
 +/* 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 */
 +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
-+++ 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 @@
  
  # includes and libs
@@ -69,9 +69,9 @@ diff -Nu a/config.mk b/config.mk
  
  # flags
  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
-+++ 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 @@
  dmenu \- dynamic menu
  .SH SYNOPSIS
@@ -101,9 +101,9 @@ diff -Nu a/dmenu.1 b/dmenu.1
  .BI \-l " lines"
  dmenu lists items vertically, with the given number of lines.
  .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
-+++ 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 @@
  /* See LICENSE file for copyright and license details. */
  #include <ctype.h>
@@ -260,7 +260,24 @@ diff -Nu a/dmenu.c b/dmenu.c
  	static char **tokv = NULL;
  	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;
  	size_t i, itemsiz = 0, linesiz = 0;
  	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 */
  	for (i = 0; (len = getline(&line, &linesiz, stdin)) != -1; i++) {
-@@ -636,6 +742,7 @@
+@@ -636,6 +740,7 @@
  	bh = drw->fonts->h + 2;
  	lines = MAX(lines, 0);
  	mh = (lines + 1) * bh;
@@ -279,7 +296,7 @@ diff -Nu a/dmenu.c b/dmenu.c
  #ifdef XINERAMA
  	i = 0;
  	if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
-@@ -662,9 +769,16 @@
+@@ -662,9 +767,16 @@
  				if (INTERSECT(x, y, 1, 1, info[i]) != 0)
  					break;
  
@@ -299,7 +316,7 @@ diff -Nu a/dmenu.c b/dmenu.c
  		XFree(info);
  	} else
  #endif
-@@ -672,9 +786,16 @@
+@@ -672,9 +784,16 @@
  		if (!XGetWindowAttributes(dpy, parentwin, &wa))
  			die("could not get embedding window attributes: 0x%lx",
  			    parentwin);
@@ -319,7 +336,7 @@ diff -Nu a/dmenu.c b/dmenu.c
  	}
  	promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
  	inputw = mw / 3; /* input width: ~33% of monitor width */
-@@ -684,9 +805,11 @@
+@@ -684,9 +803,11 @@
  	swa.override_redirect = True;
  	swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
  	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
@@ -332,7 +349,7 @@ diff -Nu a/dmenu.c b/dmenu.c
  	XSetClassHint(dpy, win, &ch);
  
  
-@@ -715,7 +838,7 @@
+@@ -715,7 +836,7 @@
  static 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]");
  }
  
-@@ -734,10 +857,16 @@
+@@ -734,10 +855,16 @@
  			topbar = 0;
  		else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
  			fast = 1;
@@ -359,7 +376,7 @@ diff -Nu a/dmenu.c b/dmenu.c
  			usage();
  		/* these options take one argument */
  		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];
  		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
  			embed = argv[++i];