dmenu

commit cc596365ac9c522beb8978cfca741d23d3bf83ae
parent c9e4e152e61b22186ba4f4ca58ae8c8d3d83e81e
Author: Hiltjo Posthuma <[email protected]>
Date:   Sun,  8 Nov 2015 23:03:34 +0100

unboolify dmenu

Diffstat:
M
config.def.h
 | 
2
+-
M
dmenu.c
 | 
14
++++++--------

2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 /* Default settings; can be overriden by command line. */
 
-static bool topbar = true;                  /* -b  option; if False, dmenu appears at bottom */
+static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
 	"monospace:size=10"
diff --git a/dmenu.c b/dmenu.c
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,7 +31,7 @@ enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 struct item {
 	char *text;
 	struct item *left, *right;
-	bool out;
+	int out;
 };
 
 static char text[BUFSIZ] = "";
@@ -421,7 +420,7 @@ keypress(XKeyEvent *ev)
 			exit(0);
 		}
 		if (sel)
-			sel->out = true;
+			sel->out = 1;
 		break;
 	case XK_Right:
 		if (text[cursor] != '\0') {
@@ -480,7 +479,7 @@ readstdin(void)
 			*p = '\0';
 		if (!(items[i].text = strdup(buf)))
 			die("cannot strdup %u bytes:", strlen(buf) + 1);
-		items[i].out = false;
+		items[i].out = 0;
 		if (strlen(items[i].text) > max)
 			max = strlen(maxstr = items[i].text);
 	}
@@ -617,8 +616,7 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-	bool fast = false;
-	int i;
+	int i, fast = 0;
 
 	for (i = 1; i < argc; i++)
 		/* these options take no arguments */
@@ -626,9 +624,9 @@ main(int argc, char *argv[])
 			puts("dmenu-"VERSION);
 			exit(0);
 		} else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
-			topbar = false;
+			topbar = 0;
 		else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
-			fast = true;
+			fast = 1;
 		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
 			fstrncmp = strncasecmp;
 			fstrstr = cistrstr;