#include "focus.h"
#include "extensions.h"
#include "gettext.h"
+#include "grab.h"
#include "engine.h"
#include "themerc.h"
#include "plugin.h"
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <X11/cursorfont.h>
screen_startup();
focus_startup();
client_startup();
+ grab_startup();
plugin_startup();
/* XXX load all plugins!! */
- plugin_open("foo");
+ plugin_open("focus");
+ plugin_open("keyboard");
+ plugin_open("mouse");
/* get all the existing windows */
client_manage_all();
ob_state = State_Running;
- while (!ob_shutdown) {
+ while (!ob_shutdown)
event_loop();
- }
ob_state = State_Exiting;
client_unmanage_all();
- plugin_shutdown();
+ plugin_shutdown(); /* calls all the plugins' shutdown functions */
+ grab_shutdown();
client_shutdown();
+ focus_shutdown();
screen_shutdown();
event_shutdown();
engine_shutdown();
render_shutdown();
timer_shutdown();
}
-
- XCloseDisplay(ob_display);
dispatch_shutdown();
- /* XXX if (ob_restart) */
+ XCloseDisplay(ob_display);
+
+ if (ob_restart) {
+ ob_restart_path = "";
+ if (ob_restart_path != NULL) {
+ int argcp;
+ char **argvp;
+ GError *err = NULL;
+
+ /* run other shit */
+ if (g_shell_parse_argv(ob_restart_path, &argcp, &argvp, &err)) {
+ execvp(argvp[0], argvp);
+ g_strfreev(argvp);
+ } else {
+ g_warning("failed to execute '%s': %s", ob_restart_path,
+ err->message);
+ }
+ }
+
+ /* re-run me */
+ execvp(argv[0], argv); /* try how we were run */
+ execlp("ob3", "ob3", NULL); /* try this as a last resort */
+ }
return 0;
}
void signal_handler(const ObEvent *e, void *data)
{
- switch (e->data.signal) {
+ int s;
+
+ s = e->data.s.signal;
+ switch (s) {
case SIGUSR1:
g_message("Caught SIGUSR1 signal. Restarting.");
ob_shutdown = ob_restart = TRUE;
case SIGINT:
case SIGTERM:
case SIGPIPE:
- g_message("Caught signal %d. Exiting.", e->data.signal);
+ g_message("Caught signal %d. Exiting.", s);
ob_shutdown = TRUE;
break;
case SIGFPE:
case SIGSEGV:
- g_error("Caught signal %d. Aborting and dumping core.",e->data.signal);
+ g_error("Caught signal %d. Aborting and dumping core.", s);
}
}