Compare commits

..

3 Commits
1.3 ... 1.4

3 changed files with 20 additions and 15 deletions

View File

@ -10,3 +10,4 @@ d046c818ea467555cc338751c9bf3024609f1f12 0.9
9e11140d4cc3eecac3b0ab752f91528fd5e04be8 1.0
e8c1e9733752db12f2dbd1fa93c46f5806242ba9 1.1
bee7fe6d1189174d0204ca3195b83cdc1bb4f82e 1.2
2eb9997be51cb1b11a8900728ccc0904f9371157 1.3

View File

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

32
main.c
View File

@ -11,7 +11,6 @@
#include <unistd.h>
#include <sys/select.h>
#include <sys/time.h>
#include <X11/cursorfont.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
@ -286,18 +285,24 @@ main(int argc, char *argv[]) {
timeout.tv_sec = 3;
/* command line args */
for(i = 1; i < argc; i++)
if(!strncmp(argv[i], "-font", 6))
font = argv[++i];
else if(!strncmp(argv[i], "-normbg", 8))
normbg = argv[++i];
else if(!strncmp(argv[i], "-normfg", 8))
normfg = argv[++i];
else if(!strncmp(argv[i], "-selbg", 7))
selbg = argv[++i];
else if(!strncmp(argv[i], "-selfg", 7))
selfg = argv[++i];
else if(!strncmp(argv[i], "-t", 3))
timeout.tv_sec = atoi(argv[++i]);
if(!strncmp(argv[i], "-font", 6)) {
if(++i < argc) font = argv[i];
}
else if(!strncmp(argv[i], "-normbg", 8)) {
if(++i < argc) normbg = argv[i];
}
else if(!strncmp(argv[i], "-normfg", 8)) {
if(++i < argc) normfg = argv[i];
}
else if(!strncmp(argv[i], "-selbg", 7)) {
if(++i < argc) selbg = argv[i];
}
else if(!strncmp(argv[i], "-selfg", 7)) {
if(++i < argc) selfg = argv[i];
}
else if(!strncmp(argv[i], "-t", 3)) {
if(++i < argc) timeout.tv_sec = atoi(argv[i]);
}
else if(!strncmp(argv[i], "-v", 3)) {
fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS);
@ -340,7 +345,6 @@ main(int argc, char *argv[]) {
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
/* pixmap */
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);