bump version to 5.1

code-style: rm newline (oops)
revert using strcasestr and use a more optimized portable version
2022-02-11 12:26:35 +01:00 · 2022-02-08 21:45:28 +01:00 · 2022-02-08 19:38:23 +01:00 · 2022-02-07 10:36:13 +01:00 · 2022-02-07 00:21:12 +01:00 · 2021-08-20 23:05:53 +02:00
4 changed files with 26 additions and 8 deletions
--- a/2
+++ b/2
@ -8,7 +8,7 @@ MIT/X Consortium License
 © 2009 Markus Schnalke <meillo@marmaro.de>
 © 2009 Evan Gates <evan.gates@gmail.com>
 © 2010-2012 Connor Lane Smith <cls@lubutu.com>
-© 2014-2020 Hiltjo Posthuma <hiltjo@codemadness.org>
+© 2014-2022 Hiltjo Posthuma <hiltjo@codemadness.org>
 © 2015-2019 Quentin Rameau <quinq@fifth.space>

 Permission is hereby granted, free of charge, to any person obtaining a
--- a/config.mk
+++ b/config.mk
@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 5.0
+VERSION = 5.1

 # paths
 PREFIX = /usr/local
--- a/dmenu.c
+++ b/dmenu.c
@ -103,13 +103,20 @@ cleanup(void)
 }

 static char *
-cistrstr(const char *s, const char *sub)
+cistrstr(const char *h, const char *n)
 {
-	size_t len;
+	size_t i;

-	for (len = strlen(sub); *s; s++)
-		if (!strncasecmp(s, sub, len))
-			return (char *)s;
+	if (!n[0])
+		return (char *)h;
+
+	for (; *h; ++h) {
+		for (i = 0; n[i] && tolower((unsigned char)n[i]) ==
+		            tolower((unsigned char)h[i]); ++i)
+			;
+		if (n[i] == '\0')
+			return (char *)h;
+	}
 	return NULL;
 }

@ -360,9 +367,11 @@ keypress(XKeyEvent *ev)
 			                  utf8, utf8, win, CurrentTime);
 			return;
 		case XK_Left:
+		case XK_KP_Left:
 			movewordedge(-1);
 			goto draw;
 		case XK_Right:
+		case XK_KP_Right:
 			movewordedge(+1);
 			goto draw;
 		case XK_Return:
@ -400,6 +409,7 @@ insert:
 			insert(buf, len);
 		break;
 	case XK_Delete:
+	case XK_KP_Delete:
 		if (text[cursor] == '\0')
 			return;
 		cursor = nextrune(+1);
@ -410,6 +420,7 @@ insert:
 		insert(NULL, nextrune(-1) - cursor);
 		break;
 	case XK_End:
+	case XK_KP_End:
 		if (text[cursor] != '\0') {
 			cursor = strlen(text);
 			break;
@ -429,6 +440,7 @@ insert:
 		cleanup();
 		exit(1);
 	case XK_Home:
+	case XK_KP_Home:
 		if (sel == matches) {
 			cursor = 0;
 			break;
@ -437,6 +449,7 @@ insert:
 		calcoffsets();
 		break;
 	case XK_Left:
+	case XK_KP_Left:
 		if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
 			cursor = nextrune(-1);
 			break;
@ -445,18 +458,21 @@ insert:
 			return;
 		/* fallthrough */
 	case XK_Up:
+	case XK_KP_Up:
 		if (sel && sel->left && (sel = sel->left)->right == curr) {
 			curr = prev;
 			calcoffsets();
 		}
 		break;
 	case XK_Next:
+	case XK_KP_Next:
 		if (!next)
 			return;
 		sel = curr = next;
 		calcoffsets();
 		break;
 	case XK_Prior:
+	case XK_KP_Prior:
 		if (!prev)
 			return;
 		sel = curr = prev;
@ -473,6 +489,7 @@ insert:
 			sel->out = 1;
 		break;
 	case XK_Right:
+	case XK_KP_Right:
 		if (text[cursor] != '\0') {
 			cursor = nextrune(+1);
 			break;
@ -481,6 +498,7 @@ insert:
 			return;
 		/* fallthrough */
 	case XK_Down:
+	case XK_KP_Down:
 		if (sel && sel->right && (sel = sel->right) == next) {
 			curr = next;
 			calcoffsets();
--- a/stest.c
+++ b/stest.c
@ -84,7 +84,7 @@ main(int argc, char *argv[])
 	if (!argc) {
 		/* read list from stdin */
 		while ((n = getline(&line, &linesiz, stdin)) > 0) {
-			if (n && line[n - 1] == '\n')
+			if (line[n - 1] == '\n')
 				line[n - 1] = '\0';
 			test(line, line);
 		}
Author	SHA1	Message	Date
Hiltjo Posthuma	308fe78b83	bump version to 5.1	2022-02-11 12:26:35 +01:00
Hiltjo Posthuma	c4b656e0da	code-style: rm newline (oops)	2022-02-08 21:45:28 +01:00
Hiltjo Posthuma	3e39c526d2	revert using strcasestr and use a more optimized portable version ... compared to the old cistrstr(). Thanks for the feedback!	2022-02-08 19:38:23 +01:00
Hiltjo Posthuma	a9a3836861	follow-up fix: add -D_GNU_SOURCE for strcasestr for some systems	2022-02-07 10:36:13 +01:00
Hiltjo Posthuma	eb96af27f4	improve performance of case-insensitive matching	2022-02-07 00:21:12 +01:00
Hiltjo Posthuma	d78ff08d99	Revert "Improve speed of drw_text when provided with large strings" This reverts commit c585e8e498ec6f9c423ab8ea07cf853ee5b05fbe. It causes issues with truncation of characters when the text does not fit and so on. The patch should be reworked and properly tested.	2021-08-20 23:05:53 +02:00
Hiltjo Posthuma	cd2133a5f6	add support for more keypad keys The keypad Enter key was already supported. On some keyboard layouts like my laptop the page-up and page-down key is more comfortable to use. This adds a few lines but no complexity.	2021-08-09 18:39:25 +02:00
Miles Alan	c585e8e498	Improve speed of drw_text when provided with large strings Calculates len & ew in drw_font_getexts loop by incrementing instead of decrementing; as such avoids proportional increase in time spent in loop based on provided strings size.	2021-08-09 18:20:51 +02:00
Guilherme Janczak	523aa08f51	remove always true condition in if statement	2021-07-25 10:55:45 +02:00