X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=cd0e2b5df0472c654b2282b16d2a75a3cf08f4b4;hb=28b6ea0f67ee02b0ff04a267671a255b47c21559;hp=8b24bb07bcfa146e88489144801d8622ea1a9d5e;hpb=a1913a6af7c9cd6de18e15e989050690fdaa6600;p=dmenu.git

diff --git a/main.c b/main.c
index 8b24bb0..cd0e2b5 100644
--- a/main.c
+++ b/main.c
@@ -109,7 +109,7 @@ drawmenu(void) {
 }
 
 static unsigned long
-getcolor(const char *colstr) {
+initcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
 
@@ -119,7 +119,7 @@ getcolor(const char *colstr) {
 }
 
 static void
-setfont(const char *fontstr) {
+initfont(const char *fontstr) {
 	char *def, **missing;
 	int i, n;
 
@@ -418,7 +418,9 @@ main(int argc, char *argv[]) {
 	XModifierKeymap *modmap;
 	XSetWindowAttributes wa;
 
-	if(isatty(STDIN_FILENO)) {
+	if(argc == 2 && !strncmp("-v", argv[1], 3))
+		eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+	else if(isatty(STDIN_FILENO)) {
 		fputs("error: dmenu can't run in an interactive shell\n", stdout);
 		usage();
 	}
@@ -445,8 +447,6 @@ main(int argc, char *argv[]) {
 		else if(!strncmp(argv[i], "-sf", 4)) {
 			if(++i < argc) selfg = argv[i];
 		}
-		else if(!strncmp(argv[i], "-v", 3))
-			eprint("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
 		else
 			usage();
 	setlocale(LC_CTYPE, "");
@@ -470,11 +470,11 @@ main(int argc, char *argv[]) {
 	}
 	XFreeModifiermap(modmap);
 	/* style */
-	dc.norm[ColBG] = getcolor(normbg);
-	dc.norm[ColFG] = getcolor(normfg);
-	dc.sel[ColBG] = getcolor(selbg);
-	dc.sel[ColFG] = getcolor(selfg);
-	setfont(font);
+	dc.norm[ColBG] = initcolor(normbg);
+	dc.norm[ColFG] = initcolor(normfg);
+	dc.sel[ColBG] = initcolor(selbg);
+	dc.sel[ColFG] = initcolor(selfg);
+	initfont(font);
 	/* menu window */
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;