#include "screen.h"
#include "focus.h"
#include "extensions.h"
-#include "gettext.h"
#include "config.h"
+#include "parse.h"
#include "grab.h"
#include "engine.h"
-#include "themerc.h"
#include "plugin.h"
#include "timer.h"
+#include "gettext.h"
#include "../render/render.h"
#include "../render/font.h"
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;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
g_warning("Couldn't set locale from environment.\n");
- bindtextdomain(PACKAGE, LOCALEDIR);
- bind_textdomain_codeset(PACKAGE, "UTF-8");
- textdomain(PACKAGE);
+ bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
+ textdomain(PACKAGE_NAME);
/* start our event dispatcher and register for signals */
dispatch_startup();
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);
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();
render_startup();
font_startup();
- themerc_startup();
- engine_startup(themerc_engine);
+ 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 */
+ parse_rc();
+
+ /* we're done with parsing now, kill it */
+ parse_shutdown();
+
+ engine_startup();
event_startup();
screen_startup();
focus_startup();
client_startup();
grab_startup();
- plugin_startup();
-
- config_parse();
- /* XXX load all plugins!! */
- plugin_open("focus");
- plugin_open("keyboard");
- plugin_open("mouse");
- plugin_open("placement");
- plugin_open("resistance");
+ /* call startup for all the plugins */
+ plugin_startall();
/* get all the existing windows */
client_manage_all();
screen_shutdown();
event_shutdown();
engine_shutdown();
- themerc_shutdown();
render_shutdown();
config_shutdown();
timer_shutdown();
void print_version()
{
- g_print("Openbox %s\n\n", VERSION);
+ g_print("Openbox %s\n\n", PACKAGE_VERSION);
g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
g_print("This is free software, and you are welcome to redistribute it\n");
g_print("under certain conditions. See the file COPYING for details.\n\n");
g_print(" -version Display the version and exit\n");
g_print(" -sync Run in synchronous mode (this is slow and meant\n"
" for debugging X routines)\n");
- g_print("\nPlease report bugs at %s\n", BUGURL);
+ g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
}
void parse_args(int argc, char **argv)