applied Matthias Christian Ott's sanity fixes (thanks a lot!)

.hgtags

@@ -37,3 +37,5 @@ e4c81a78ffbad6ba4d1ad119cc654da6eca63a4c 3.2
 05e5bd706b3b3e61399d57c4bb43df296a20112d 3.5
 0bc2751d06e8b95e0138854c7815e154c5c3d990 3.6
 0508a3a6ee106f36d9b8ff07bb5b28584edfa89c 3.7
+644b0798fcccd570fd519899e1601c6857496b91 3.8
+21a1ed9a69b9541a355758a57103e294fb722c33 3.9

config.mk

@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 3.8
+VERSION = 4.0
 
 # Customize below to fit your system
 
@@ -19,7 +19,7 @@ INCS = -I. -I/usr/include -I${X11INC}
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
 

dmenu.c

@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#define _BSD_SOURCE
 #include <ctype.h>
 #include <locale.h>
 #include <stdarg.h>
@@ -18,6 +17,7 @@
 /* macros */
 #define CLEANMASK(mask)         (mask & ~(numlockmask | LockMask))
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
+#define MIN(a, b)               ((a) < (b) ? (a) : (b))
 
 /* enums */
 enum { ColFG, ColBG, ColLast };
@@ -78,7 +78,7 @@ static unsigned int mw, mh;
 static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
-static DC dc = {0};
+static DC dc;
 static Item *allitems = NULL;	/* first of all items */
 static Item *item = NULL;	/* first of pattern matching items */
 static Item *sel = NULL;
@@ -140,7 +140,7 @@ cistrstr(const char *s, const char *sub) {
 		do {
 			do {
 				if((csub = *s++) == 0)
-					return (NULL);
+					return NULL;
 			}
 			while(tolower(csub) != c);
 		}
@@ -213,37 +213,25 @@ drawmenu(void) {
 
 void
 drawtext(const char *text, unsigned long col[ColLast]) {
-	int x, y, w, h;
+	char buf[256];
-	static char buf[256];
+	int i, x, y, h, len, olen;
-	unsigned int len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
 	XSetForeground(dpy, dc.gc, col[ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	if(!text)
 		return;
-	w = 0;
+	olen = strlen(text);
-	olen = len = strlen(text);
-	if(len >= sizeof buf)
-		len = sizeof buf - 1;
-	memcpy(buf, text, len);
-	buf[len] = 0;
 	h = dc.font.ascent + dc.font.descent;
 	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
 	x = dc.x + (h / 2);
 	/* shorten text if necessary */
-	while(len && (w = textnw(buf, len)) > dc.w - h)
+	for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--);
-		buf[--len] = 0;
+	if(!len)
-	if(len < olen) {
+		return;
-		if(len > 1)
+	memcpy(buf, text, len);
-			buf[len - 1] = '.';
+	if(len < olen)
-		if(len > 2)
+		for(i = len; i && i > len - 3; buf[--i] = '.');
-			buf[len - 2] = '.';
-		if(len > 3)
-			buf[len - 3] = '.';
-	}
-	if(w > dc.w)
-		return; /* too long */
 	XSetForeground(dpy, dc.gc, col[ColFG]);
 	if(dc.font.set)
 		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
@@ -292,8 +280,6 @@ initfont(const char *fontstr) {
 	if(!fontstr || fontstr[0] == '\0')
 		eprint("error, cannot load font: '%s'\n", fontstr);
 	missing = NULL;
-	if(dc.font.set)
-		XFreeFontSet(dpy, dc.font.set);
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
 	if(missing)
 		XFreeStringList(missing);
@@ -313,9 +299,6 @@ initfont(const char *fontstr) {
 		}
 	}
 	else {
-		if(dc.font.xfont)
-			XFreeFont(dpy, dc.font.xfont);
-		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
 		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
@@ -334,7 +317,7 @@ kpress(XKeyEvent * e) {
 
 	len = strlen(text);
 	buf[0] = 0;
-	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
+	num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
 	if(IsKeypadKey(ksym)) {
 		if(ksym == XK_KP_Enter)
 			ksym = XK_Return;
@@ -412,10 +395,7 @@ kpress(XKeyEvent * e) {
 	default:
 		if(num && !iscntrl((int) buf[0])) {
 			buf[num] = 0;
-			if(len > 0)
+			strncpy(text + len, buf, sizeof text - len);
-				strncat(text, buf, sizeof text);
-			else
-				strncpy(text, buf, sizeof text);
 			match(text);
 		}
 		break;
@@ -553,7 +533,7 @@ readstdin(void) {
 			maxname = p;
 			max = len;
 		}
-		if((new = (Item *)malloc(sizeof(Item))) == NULL)
+		if(!(new = (Item *)malloc(sizeof(Item))))
 			eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
 		new->next = new->left = new->right = NULL;
 		new->text = p;
@@ -612,7 +592,7 @@ setup(Bool topbar) {
 	initfont(font);
 
 	/* menu window */
-	wa.override_redirect = 1;
+	wa.override_redirect = True;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
 
@@ -650,7 +630,7 @@ setup(Bool topbar) {
 
 	/* pixmap */
 	dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
-	dc.gc = XCreateGC(dpy, root, 0, 0);
+	dc.gc = XCreateGC(dpy, root, 0, NULL);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	if(!dc.font.set)
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
@@ -721,7 +701,7 @@ main(int argc, char *argv[]) {
 			       "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
 	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
 		fprintf(stderr, "warning: no locale support\n");
-	if(!(dpy = XOpenDisplay(0)))
+	if(!(dpy = XOpenDisplay(NULL)))
 		eprint("dmenu: cannot open display\n");
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);