11 Commits
3.1 ... 3.2

Author SHA1 Message Date
Anselm R. Garbe
d27e3c1092 referred to LICENSE file 2007-05-30 12:19:06 +02:00
Anselm R. Garbe
3a9f3a51ce I agree with the race fix of JG, but I dislike the SUSV3-breaking find, and I don't care about PATH changes, keep it simple, stupid 2007-05-24 10:34:44 +02:00
Kris Maglione
53e92b5c17 Fix the uptodate logic (uptodate if !find newer dirs than the cache). 2007-05-23 19:38:23 -04:00
Kris Maglione
d50ff5ca11 Silence the first find in dmenu_path. 2007-05-23 18:35:05 -04:00
Kris Maglione
383e40dc21 Fix grouping in dmenu_path. 2007-05-23 16:59:38 -04:00
Kris Maglione
8369e1736b Merge. 2007-05-23 16:44:15 -04:00
Kris Maglione
c04b688cc0 Changed dmenu_path (fixed race, improved speed, check that $PATH is the same as the last run). 2007-05-23 16:42:51 -04:00
Anselm R. Garbe
4ebd7c4a21 removed some superflous strncmp's 2007-05-23 22:32:43 +02:00
Anselm R. Garbe
dfe95cb546 made dmenu_path the way anydot proposed in response to Jukka 2007-05-23 22:13:46 +02:00
Anselm R. Garbe
8b633bf17d applied Jukka's fix 2007-05-23 13:22:27 +02:00
Anselm R. Garbe
64697cdd0c Added tag 3.1 for changeset 8f0f917ac988 2007-05-21 14:36:03 +02:00
7 changed files with 22 additions and 33 deletions

View File

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

View File

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

View File

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

View File

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

4
draw.c
View File

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

20
main.c
View File

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

4
util.c
View File

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