Move all config variables into config.h and rename topbar to buttom

2 files changed, 8 insertions, 6 deletions

diff --git a/config.h b/config.h
index 8eea22b..cee1d67 100644
--- a/config.h
+++ b/config.h
@@ -1,14 +1,16 @@
 /* See LICENSE file for copyright and license details. */
 /* Default settings; can be overriden by command line. */
 
-static int topbar = 1;
+static int bottom = 1;
 static int embedded = 0;
 static int minpwlen = 32;
+static int mon = -1;
+
+static const char *asterisk = "*";
 static const char *fonts[] = {
 	"monospace:size=10"
 };
 static const char *prompt = NULL;
-static const char *asterisk = "*";
 static const char *colors[SchemeLast][4] = {
 	[SchemePrompt] = { "#bbbbbb", "#222222" },
 	[SchemeNormal] = { "#bbbbbb", "#222222" },
diff --git a/pinentry-dmenu.c b/pinentry-dmenu.c
index 8538878..5bd0e1f 100644
--- a/pinentry-dmenu.c
+++ b/pinentry-dmenu.c
@@ -45,7 +45,7 @@ static int promptw, ppromptw, pdescw;
 /* Sum of left and right padding */
 static int lrpad;
 static size_t cursor;
-static int mon = -1, screen;
+static int screen;
 
 static char* pin;
 
@@ -299,7 +299,7 @@ setup(void) {
 		}
 
 		x = info[i].x_org;
-		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
+		y = info[i].y_org + (bottom ? info[i].height - mh : 0);
 		mw = info[i].width;
 		XFree(info);
 	} else
@@ -309,7 +309,7 @@ setup(void) {
 			die("could not get embedding window attributes: 0x%lx", parentwin);
 		}
 		x = 0;
-		y = topbar ? 0 : wa.height - mh;
+		y = bottom ? wa.height - mh : 0;
 		mw = wa.width;
 	}
 
@@ -658,7 +658,7 @@ main(int argc, char *argv[]) {
 			asterisk = str;
 		}
 		if (config_lookup_bool(&cfg, "buttom", &bval)) {
-			topbar = !bval;
+			bottom = bval;
 		}
 		if (config_lookup_int(&cfg, "min_password_length", &val)) {
 			minpwlen = val;