initialize X after parsing of cmdline/config

This way, the '-h/--help' options work, even when $DISPLAY is not set.
This commit is contained in:
Sascha Kruse 2012-06-27 22:25:34 +02:00
parent ca0f41a775
commit 61655d70ff

View File

@ -1162,7 +1162,6 @@ void parse_cmdline_for_config_file(int argc, char *argv[])
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
now = time(&now); now = time(&now);
dc = initdc();
geometry.mask = XParseGeometry(geom, geometry.mask = XParseGeometry(geom,
&geometry.x, &geometry.y, &geometry.x, &geometry.y,
&geometry.w, &geometry.h); &geometry.w, &geometry.h);
@ -1170,6 +1169,7 @@ int main(int argc, char *argv[])
parse_cmdline_for_config_file(argc, argv); parse_cmdline_for_config_file(argc, argv);
parse_dunstrc(); parse_dunstrc();
parse_cmdline(argc, argv); parse_cmdline(argc, argv);
dc = initdc();
key = key_string ? XStringToKeysym(key_string) : NoSymbol; key = key_string ? XStringToKeysym(key_string) : NoSymbol;
history_key = history_key =
history_key_string ? XStringToKeysym(history_key_string) : NoSymbol; history_key_string ? XStringToKeysym(history_key_string) : NoSymbol;