Compare commits

..

11 Commits
3.1 ... 3.2

7 changed files with 22 additions and 33 deletions

View File

@ -30,3 +30,4 @@ b6e09682c8adcb6569656bee73c311f9ab457715 2.3
fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7 fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7
dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8 dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8
59b3024854db49739c6d237fa9077f04a2da847a 3.0 59b3024854db49739c6d237fa9077f04a2da847a 3.0
8f0f917ac988164e1b4446236e3a6ab6cfcb8c67 3.1

View File

@ -1,5 +1,5 @@
# dmenu version # dmenu version
VERSION = 3.1 VERSION = 3.2
# Customize below to fit your system # Customize below to fit your system

View File

@ -1,6 +1,4 @@
/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com> /* See LICENSE file for copyright and license details. */
* © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
* See LICENSE file for license details. */
#include <X11/Xlib.h> #include <X11/Xlib.h>
#define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*" #define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"

View File

@ -1,22 +1,17 @@
#!/bin/sh #!/bin/sh
CACHE=$HOME/.dmenu_cache CACHE=$HOME/.dmenu_cache
UPTODATE=1
IFS=: IFS=:
if test ! -f $CACHE uptodate() {
then test ! -f $CACHE && return 1
unset UPTODATE
fi
if test $UPTODATE
then
for dir in $PATH for dir in $PATH
do do
test $dir -nt $CACHE && unset UPTODATE test $dir -nt $CACHE && return 1
done done
fi return 0
}
if test ! $UPTODATE if ! uptodate
then then
for dir in $PATH for dir in $PATH
do do
@ -24,7 +19,8 @@ then
do do
test -x "$file" && echo "${file##*/}" test -x "$file" && echo "${file##*/}"
done done
done | sort | uniq > $CACHE done | sort | uniq > $CACHE.$$
mv $CACHE.$$ $CACHE
fi fi
cat $CACHE cat $CACHE

4
draw.c
View File

@ -1,6 +1,4 @@
/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com> /* See LICENSE file for copyright and license details. */
* © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
* See LICENSE file for license details. */
#include "dmenu.h" #include "dmenu.h"
#include <string.h> #include <string.h>

20
main.c
View File

@ -1,6 +1,4 @@
/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com> /* See LICENSE file for copyright and license details. */
* © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
* See LICENSE file for license details. */
#include "dmenu.h" #include "dmenu.h"
#include <ctype.h> #include <ctype.h>
#include <locale.h> #include <locale.h>
@ -437,28 +435,28 @@ main(int argc, char *argv[]) {
/* command line args */ /* command line args */
for(i = 1; i < argc; i++) for(i = 1; i < argc; i++)
if(!strncmp(argv[i], "-b", 3)) { if(!strcmp(argv[i], "-b")) {
bottom = True; bottom = True;
} }
else if(!strncmp(argv[i], "-fn", 4)) { else if(!strcmp(argv[i], "-fn")) {
if(++i < argc) font = argv[i]; if(++i < argc) font = argv[i];
} }
else if(!strncmp(argv[i], "-nb", 4)) { else if(!strcmp(argv[i], "-nb")) {
if(++i < argc) normbg = argv[i]; if(++i < argc) normbg = argv[i];
} }
else if(!strncmp(argv[i], "-nf", 4)) { else if(!strcmp(argv[i], "-nf")) {
if(++i < argc) normfg = argv[i]; if(++i < argc) normfg = argv[i];
} }
else if(!strncmp(argv[i], "-p", 3)) { else if(!strcmp(argv[i], "-p")) {
if(++i < argc) prompt = argv[i]; if(++i < argc) prompt = argv[i];
} }
else if(!strncmp(argv[i], "-sb", 4)) { else if(!strcmp(argv[i], "-sb")) {
if(++i < argc) selbg = argv[i]; if(++i < argc) selbg = argv[i];
} }
else if(!strncmp(argv[i], "-sf", 4)) { else if(!strcmp(argv[i], "-sf")) {
if(++i < argc) selfg = argv[i]; if(++i < argc) selfg = argv[i];
} }
else if(!strncmp(argv[i], "-v", 3)) else if(!strcmp(argv[i], "-v"))
eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n"); eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n");
else else
usage(); usage();

4
util.c
View File

@ -1,6 +1,4 @@
/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com> /* See LICENSE file for copyright and license details. */
* © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
* See LICENSE file for license details. */
#include "dmenu.h" #include "dmenu.h"
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>