From: Connor Lane Smith <cls@lubutu.com>
Date: Mon, 19 Dec 2011 15:52:48 +0000 (+0100)
Subject: merge stest -> default
X-Git-Url: https://git.xinqibao.xyz/dmenu.git/commitdiff_plain/6664e4233faa3d6b677a24196e9af4ac5b1920fd?hp=6b1d658d1224cd108d64a6c340d47b66ad99816d

merge stest -> default
---

diff --git a/dmenu.c b/dmenu.c
index 99db24e..019fa3e 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -117,7 +117,7 @@ main(int argc, char *argv[]) {
 	setup();
 	run();
 
-	return EXIT_FAILURE; /* unreachable */
+	return 1; /* unreachable */
 }
 
 void
@@ -575,12 +575,12 @@ setup(void) {
 
 	/* create menu window */
 	swa.override_redirect = True;
-	swa.background_pixmap = ParentRelative;
+	swa.background_pixel = normcol[ColBG];
 	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
 	win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
 	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
 	                    DefaultVisual(dc->dpy, screen),
-	                    CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
+	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
 
 	/* open input methods */
 	xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
diff --git a/dmenu_run b/dmenu_run
index e0a3e13..052e51b 100755
--- a/dmenu_run
+++ b/dmenu_run
@@ -1,12 +1,15 @@
 #!/bin/sh
-CACHE=${XDG_CACHE_HOME:-"$HOME/.cache"}/dmenu_run
-if [ ! -d "`dirname "$CACHE"`" ]; then
-	CACHE=$HOME/.dmenu_cache
+cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
+if [ -d "$cachedir" ]; then
+	cache=$cachedir/dmenu_run
+else
+	cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~
 fi
 (
 	IFS=:
-	if stest -dqr -n "$CACHE" $PATH; then
-		stest -flx $PATH | sort -u > "$CACHE"
+	if stest -dqr -n "$cache" $PATH; then
+		stest -flx $PATH | sort -u | tee "$cache" | dmenu "$@"
+	else
+		dmenu "$@" < "$cache"
 	fi
-)
-cmd=`dmenu "$@" < "$CACHE"` && exec sh -c "$cmd"
+) | ${SHELL:-"/bin/sh"} &