Compare commits

..

4 Commits
3.0 ... 3.1

5 changed files with 31 additions and 8 deletions

View File

@ -29,3 +29,4 @@ b6e09682c8adcb6569656bee73c311f9ab457715 2.3
775f761a5647a05038e091d1c99fc35d3034cd68 2.6 775f761a5647a05038e091d1c99fc35d3034cd68 2.6
fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7 fbd9e9d63f202afe6834ccfdf890904f1897ec0b 2.7
dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8 dd3d02b07cac44fbafc074a361c1002cebe7aae4 2.8
59b3024854db49739c6d237fa9077f04a2da847a 3.0

View File

@ -23,7 +23,6 @@ ${OBJ}: dmenu.h config.mk
dmenu: ${OBJ} dmenu: ${OBJ}
@echo CC -o $@ @echo CC -o $@
@${CC} -o $@ ${OBJ} ${LDFLAGS} @${CC} -o $@ ${OBJ} ${LDFLAGS}
@strip $@
clean: clean:
@echo cleaning @echo cleaning

View File

@ -1,5 +1,5 @@
# dmenu version # dmenu version
VERSION = 3.0 VERSION = 3.1
# Customize below to fit your system # Customize below to fit your system
@ -16,7 +16,7 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
# flags # flags
CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
LDFLAGS = ${LIBS} LDFLAGS = -s ${LIBS}
#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = -g ${LIBS} #LDFLAGS = -g ${LIBS}

View File

@ -1,9 +1,30 @@
#!/bin/sh #!/bin/sh
CACHE=$HOME/.dmenu_cache
UPTODATE=1
IFS=: IFS=:
if test ! -f $CACHE
then
unset UPTODATE
fi
if test $UPTODATE
then
for dir in $PATH
do
test $dir -nt $CACHE && unset UPTODATE
done
fi
if test ! $UPTODATE
then
for dir in $PATH for dir in $PATH
do do
for file in "$dir"/* for file in "$dir"/*
do do
test -x "$file" && echo "${file##*/}" test -x "$file" && echo "${file##*/}"
done done
done | sort | uniq done | sort | uniq > $CACHE
fi
cat $CACHE

2
main.c
View File

@ -135,6 +135,8 @@ initfont(const char *fontstr) {
char *def, **missing; char *def, **missing;
int i, n; int i, n;
if(!fontstr || fontstr[0] == '\0')
eprint("error, cannot load font: '%s'\n", fontstr);
missing = NULL; missing = NULL;
if(dc.font.set) if(dc.font.set)
XFreeFontSet(dpy, dc.font.set); XFreeFontSet(dpy, dc.font.set);