#include "group.h"
#include "config.h"
#include "ping.h"
-#include "mainloop.h"
#include "gettext.h"
#include "render/render.h"
#include "render/theme.h"
program_name = g_path_get_basename(argv[0]);
g_set_prgname(program_name);
- if (!remote_control) {
- parse_paths_startup();
-
+ if (!remote_control)
session_startup(argc, argv);
- }
if (!obt_display_open(NULL))
ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
/* Send client message telling the OB process to:
* remote_control = 1 -> reconfigure
* remote_control = 2 -> restart */
- OBT_PROP_MSG(ob_screen, RootWindow(obt_display, ob_screen),
+ OBT_PROP_MSG(ob_screen, obt_root(ob_screen),
OB_CONTROL, remote_control, 0, 0, 0, 0);
obt_display_close(obt_display);
exit(EXIT_SUCCESS);
}
- ob_main_loop = obt_main_loop_new(obt_display);
+ ob_main_loop = obt_main_loop_new();
/* set up signal handler */
obt_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL,NULL);
if (obt_parse_load_config_file(i, "openbox", "rc.xml",
"openbox_config"))
{
- obt_parse_tree(i, obt_parse_instance_root(i)->children);
+ obt_parse_tree_from_root(i);
obt_parse_close(i);
} else
g_message(_("Unable to find a valid config file, using some simple defaults"));
/*
if (config_type != NULL)
- PROP_SETS(RootWindow(obt_display, ob_screen),
- ob_config, config_type);
+ PROP_SETS(obt_root(ob_screen), ob_config, config_type);
*/
/* we're done with parsing now, kill it */
if (ob_rr_theme == NULL)
ob_exit_with_error(_("Unable to load a theme."));
- OBT_PROP_SETS(RootWindow(obt_display, ob_screen),
+ OBT_PROP_SETS(obt_root(ob_screen),
OB_THEME, utf8, ob_rr_theme->name);
}
focus_nothing();
/* focus what was focused if a wm was already running */
- if (OBT_PROP_GET32(RootWindow(obt_display, ob_screen),
+ if (OBT_PROP_GET32(obt_root(ob_screen),
NET_ACTIVE_WINDOW, WINDOW, &xid) &&
- (w = g_hash_table_lookup(window_map, &xid)) &&
- WINDOW_IS_CLIENT(w))
+ (w = window_find(xid)) && WINDOW_IS_CLIENT(w))
{
client_focus(WINDOW_AS_CLIENT(w));
}
obt_display_close(obt_display);
- parse_paths_shutdown();
-
if (restart) {
if (restart_path != NULL) {
gint argcp;