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

pull/4/head
Moritz Luedecke 7 years ago
parent 84a7f88da1
commit 9e8572af7e

@ -1,14 +1,16 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
/* Default settings; can be overriden by command line. */ /* Default settings; can be overriden by command line. */
static int topbar = 1; static int bottom = 1;
static int embedded = 0; static int embedded = 0;
static int minpwlen = 32; static int minpwlen = 32;
static int mon = -1;
static const char *asterisk = "*";
static const char *fonts[] = { static const char *fonts[] = {
"monospace:size=10" "monospace:size=10"
}; };
static const char *prompt = NULL; static const char *prompt = NULL;
static const char *asterisk = "*";
static const char *colors[SchemeLast][4] = { static const char *colors[SchemeLast][4] = {
[SchemePrompt] = { "#bbbbbb", "#222222" }, [SchemePrompt] = { "#bbbbbb", "#222222" },
[SchemeNormal] = { "#bbbbbb", "#222222" }, [SchemeNormal] = { "#bbbbbb", "#222222" },

@ -45,7 +45,7 @@ static int promptw, ppromptw, pdescw;
/* Sum of left and right padding */ /* Sum of left and right padding */
static int lrpad; static int lrpad;
static size_t cursor; static size_t cursor;
static int mon = -1, screen; static int screen;
static char* pin; static char* pin;
@ -299,7 +299,7 @@ setup(void) {
} }
x = info[i].x_org; 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; mw = info[i].width;
XFree(info); XFree(info);
} else } else
@ -309,7 +309,7 @@ setup(void) {
die("could not get embedding window attributes: 0x%lx", parentwin); die("could not get embedding window attributes: 0x%lx", parentwin);
} }
x = 0; x = 0;
y = topbar ? 0 : wa.height - mh; y = bottom ? wa.height - mh : 0;
mw = wa.width; mw = wa.width;
} }
@ -658,7 +658,7 @@ main(int argc, char *argv[]) {
asterisk = str; asterisk = str;
} }
if (config_lookup_bool(&cfg, "buttom", &bval)) { if (config_lookup_bool(&cfg, "buttom", &bval)) {
topbar = !bval; bottom = bval;
} }
if (config_lookup_int(&cfg, "min_password_length", &val)) { if (config_lookup_int(&cfg, "min_password_length", &val)) {
minpwlen = val; minpwlen = val;

Loading…
Cancel
Save