#include "openbox.h"
+#include "dock.h"
#include "event.h"
#include "menu.h"
#include "client.h"
#include "dispatch.h"
#include "xerror.h"
#include "prop.h"
+#include "startup.h"
#include "screen.h"
#include "focus.h"
#include "moveresize.h"
#include "frame.h"
#include "extensions.h"
-#include "parse.h"
#include "grab.h"
#include "plugin.h"
#include "timer.h"
#include "group.h"
#include "config.h"
#include "gettext.h"
+#include "parser/parse.h"
#include "render/render.h"
-#include "render/font.h"
#include "render/theme.h"
#ifdef HAVE_FCNTL_H
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/types.h>
-# include <sys/wait.h>
-#endif
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
#include <X11/cursorfont.h>
-Display *ob_display = NULL;
-int ob_screen;
-Window ob_root;
-State ob_state;
-gboolean ob_shutdown = FALSE;
-gboolean ob_restart = FALSE;
-char *ob_restart_path = NULL;
-gboolean ob_remote = TRUE;
-gboolean ob_sync = FALSE;
-Cursors ob_cursors;
-char *ob_rc_path = NULL;
+RrInstance *ob_rr_inst = NULL;
+RrTheme *ob_rr_theme = NULL;
+Display *ob_display = NULL;
+int ob_screen;
+Window ob_root;
+State ob_state;
+gboolean ob_shutdown = FALSE;
+gboolean ob_restart = FALSE;
+char *ob_restart_path = NULL;
+gboolean ob_remote = TRUE;
+gboolean ob_sync = FALSE;
+Cursors ob_cursors;
+char *ob_rc_path = NULL;
void signal_handler(const ObEvent *e, void *data);
void parse_args(int argc, char **argv);
struct sigaction action;
sigset_t sigset;
char *path;
- char *theme;
+ xmlDocPtr doc;
+ xmlNodePtr node;
ob_state = State_Starting;
sigaction(SIGTERM, &action, (struct sigaction *) NULL);
sigaction(SIGINT, &action, (struct sigaction *) NULL);
sigaction(SIGHUP, &action, (struct sigaction *) NULL);
- sigaction(SIGCHLD, &action, (struct sigaction *) NULL);
-
- /* anything that died while we were restarting won't give us a SIGCHLD */
- while (waitpid(-1, NULL, WNOHANG) > 0);
/* create the ~/.openbox dir */
path = g_build_filename(g_get_home_dir(), ".openbox", NULL);
g_critical("Failed to set display as close-on-exec.");
exit(1);
}
-
+
+#ifdef USE_LIBSN
+ ob_sn_display = sn_display_new(ob_display, NULL, NULL);
+#endif
+
ob_screen = DefaultScreen(ob_display);
ob_root = RootWindow(ob_display, ob_screen);
+ ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
+ if (ob_rr_inst == NULL) {
+ g_critical("Failed to initialize the render library.");
+ exit(1);
+ }
+
/* XXX fork self onto other screens */
XSynchronize(ob_display, ob_sync);
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
ob_cursors.ptr = XCreateFontCursor(ob_display, XC_left_ptr);
+ ob_cursors.busy = XCreateFontCursor(ob_display, XC_watch);
ob_cursors.move = XCreateFontCursor(ob_display, XC_fleur);
ob_cursors.tl = XCreateFontCursor(ob_display, XC_top_left_corner);
ob_cursors.tr = XCreateFontCursor(ob_display, XC_top_right_corner);
prop_startup(); /* get atoms values for the display */
extensions_query_all(); /* find which extensions are present */
+ /* save stuff that we can use to restore state */
+ startup_save();
+
if (screen_annex()) { /* it will be ours! */
/* startup the parsing so everything can register sections of the rc */
parse_startup();
/* anything that is going to read data from the rc file needs to be
in this group */
timer_startup();
- render_startup();
font_startup();
- theme_startup();
event_startup();
- moveresize_startup();
grab_startup();
plugin_startup();
/* load the plugins specified in the pluginrc */
/* set up the kernel config shit */
config_startup();
/* parse/load user options */
- parse_rc();
+ if (parse_load_rc(&doc, &node))
+ parse_tree(doc, node->xmlChildrenNode, NULL);
/* we're done with parsing now, kill it */
parse_shutdown();
/* load the theme specified in the rc file */
- theme = theme_load(config_theme);
- g_free(theme);
- if (!theme) return 1;
+ ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
+ if (ob_rr_theme == NULL) {
+ g_critical("Unable to load a theme.");
+ exit(1);
+ }
+ window_startup();
menu_startup();
frame_startup();
- stacking_startup();
+ moveresize_startup();
focus_startup();
screen_startup();
group_startup();
client_startup();
+ dock_startup();
/* call startup for all the plugins */
plugin_startall();
event_loop();
ob_state = State_Exiting;
+ dock_remove_all();
client_unmanage_all();
plugin_shutdown(); /* calls all the plugins' shutdown functions */
+ dock_shutdown();
client_shutdown();
group_shutdown();
screen_shutdown();
focus_shutdown();
- stacking_shutdown();
+ moveresize_shutdown();
frame_shutdown();
menu_shutdown();
+ window_shutdown();
grab_shutdown();
event_shutdown();
- theme_shutdown();
- render_shutdown();
timer_shutdown();
config_shutdown();
}
dispatch_shutdown();
+ RrThemeFree(ob_rr_theme);
+ RrInstanceFree(ob_rr_inst);
XCloseDisplay(ob_display);
if (ob_restart) {
ob_shutdown = ob_restart = TRUE;
break;
- case SIGCHLD:
- wait(NULL);
- break;
-
case SIGHUP:
case SIGINT:
case SIGTERM:
case SIGFPE:
case SIGSEGV:
- g_error("Caught signal %d. Aborting and dumping core.", s);
+ g_message("Caught signal %d. Aborting and dumping core.", s);
+ abort();
}
}
projects / chaz / openbox / blobdiff