X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=a7357b2ffe2ff3b2513383b73b01864d66e4dd3d;hb=71c8b0b7b2cf2fa79ac4c81b7756f2b230f2de7a;hp=46e6a8643da0880cf8810704b93124a380d51427;hpb=39946832001bd205f764a36fbdae17bc53d1fb35;p=chaz%2Fopenbox diff --git a/openbox/openbox.c b/openbox/openbox.c index 46e6a864..a7357b2f 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -9,6 +9,7 @@ #include "extensions.h" #include "gettext.h" #include "config.h" +#include "parse.h" #include "grab.h" #include "engine.h" #include "plugin.h" @@ -49,7 +50,7 @@ State ob_state; gboolean ob_shutdown = FALSE; gboolean ob_restart = FALSE; char *ob_restart_path = NULL; -gboolean ob_remote = FALSE; +gboolean ob_remote = TRUE; gboolean ob_sync = FALSE; Cursors ob_cursors; char *ob_rc_path = NULL; @@ -98,6 +99,11 @@ int main(int argc, char **argv) mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)); g_free(path); + /* create the ~/.openbox/themes dir */ + path = g_build_filename(g_get_home_dir(), ".openbox", "themes", NULL); + mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | + S_IROTH | S_IWOTH | S_IXOTH)); + g_free(path); /* parse out command line args */ parse_args(argc, argv); @@ -140,7 +146,7 @@ int main(int argc, char **argv) prop_startup(); /* get atoms values for the display */ extensions_query_all(); /* find which extensions are present */ - + if (screen_annex()) { /* it will be ours! */ timer_startup(); config_startup(); @@ -148,10 +154,16 @@ int main(int argc, char **argv) font_startup(); plugin_startup(); + /* startup the parsing so plugins can register sections of the rc */ + parse_startup(); + /* load the plugins specified in the pluginrc */ plugin_loadall(); /* parse/load user options */ - config_parse(); + parse_rc(); + + /* we're done with parsing now, kill it */ + parse_shutdown(); engine_startup(); event_startup();