#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 "startupnotify.h"
#include "focus.h"
#include "moveresize.h"
#include "frame.h"
+#include "keyboard.h"
+#include "mouse.h"
#include "extensions.h"
+#include "menuframe.h"
#include "grab.h"
-#include "plugin.h"
-#include "timer.h"
#include "group.h"
#include "config.h"
+#include "mainloop.h"
#include "gettext.h"
#include "parser/parse.h"
#include "render/render.h"
RrInstance *ob_rr_inst;
RrTheme *ob_rr_theme;
+ObMainLoop *ob_main_loop;
Display *ob_display;
gint ob_screen;
-gboolean ob_sm_use = TRUE;
-gchar *ob_sm_id;
gboolean ob_replace_wm;
static ObState state;
static gboolean xsync;
-static gboolean shutdown;
+static gboolean reconfigure;
static gboolean restart;
static char *restart_path;
static Cursor cursors[OB_NUM_CURSORS];
static KeyCode keys[OB_NUM_KEYS];
-static gchar *sm_save_file;
-static void signal_handler(const ObEvent *e, void *data);
+static void signal_handler(int signal, gpointer data);
static void parse_args(int argc, char **argv);
int main(int argc, char **argv)
{
- struct sigaction action;
- sigset_t sigset;
char *path;
- xmlDocPtr doc;
- xmlNodePtr node;
#ifdef DEBUG
ob_debug_show_output(TRUE);
bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
textdomain(PACKAGE_NAME);
- /* start our event dispatcher and register for signals */
- dispatch_startup();
- dispatch_register(Event_Signal, signal_handler, NULL);
-
- /* set up signal handler */
- sigemptyset(&sigset);
- action.sa_handler = dispatch_signal;
- action.sa_mask = sigset;
- action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
- sigaction(SIGUSR1, &action, (struct sigaction *) NULL);
- sigaction(SIGPIPE, &action, (struct sigaction *) NULL);
-/* sigaction(SIGSEGV, &action, (struct sigaction *) NULL);*/
- sigaction(SIGFPE, &action, (struct sigaction *) NULL);
- sigaction(SIGTERM, &action, (struct sigaction *) NULL);
- sigaction(SIGINT, &action, (struct sigaction *) NULL);
- sigaction(SIGHUP, &action, (struct sigaction *) NULL);
-
/* create the ~/.openbox dir */
path = g_build_filename(g_get_home_dir(), ".openbox", NULL);
mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
ob_exit_with_error("Failed to set display as close-on-exec.");
- if (sm_save_file)
- session_load(sm_save_file);
- session_startup(argc, argv);
+ ob_main_loop = ob_main_loop_new(ob_display);
-#ifdef USE_LIBSN
- ob_sn_display = sn_display_new(ob_display, NULL, NULL);
-#endif
+ /* set up signal handler */
+ ob_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL, NULL);
+ ob_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL, NULL);
+ ob_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL, NULL);
+ ob_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL, NULL);
+ ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL);
+ ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL);
+
+ session_startup(&argc, &argv);
ob_screen = DefaultScreen(ob_display);
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
/* create available cursors */
+ cursors[OB_CURSOR_NONE] = None;
cursors[OB_CURSOR_POINTER] =
XCreateFontCursor(ob_display, XC_left_ptr);
cursors[OB_CURSOR_BUSY] =
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();
- event_startup();
- grab_startup();
- /* focus_backup is used for stacking, so this needs to come before
- anything that calls stacking_add */
- focus_startup();
- window_startup();
- plugin_startup();
- /* load the plugins specified in the pluginrc */
- plugin_loadall();
-
- /* set up the kernel config shit */
- config_startup();
- menu_startup();
- /* parse/load user options */
- 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 */
- ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
- if (ob_rr_theme == NULL)
- ob_exit_with_error("Unable to load a theme.");
-
- moveresize_startup();
- screen_startup();
- group_startup();
- client_startup();
- dock_startup();
-
- /* call startup for all the plugins */
- plugin_startall();
-
- /* get all the existing windows */
- client_manage_all();
-
- state = OB_STATE_RUNNING;
- while (!shutdown)
- event_loop();
- state = OB_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();
- moveresize_shutdown();
- menu_shutdown();
- window_shutdown();
- grab_shutdown();
- event_shutdown();
- timer_shutdown();
- config_shutdown();
- }
+ do {
+ event_startup(reconfigure);
+ grab_startup(reconfigure);
+ /* focus_backup is used for stacking, so this needs to come before
+ anything that calls stacking_add */
+ focus_startup(reconfigure);
+ window_startup(reconfigure);
+ sn_startup(reconfigure);
+
+ {
+ ObParseInst *i;
+ xmlDocPtr doc;
+ xmlNodePtr node;
+
+ /* startup the parsing so everything can register sections
+ of the rc */
+ i = parse_startup();
+
+ config_startup(i);
+ /* parse/load user options */
+ if (parse_load_rc(&doc, &node))
+ parse_tree(i, doc, node->xmlChildrenNode);
+ /* we're done with parsing now, kill it */
+ xmlFreeDoc(doc);
+ parse_shutdown(i);
+ }
+
+ /* load the theme specified in the rc file */
+ {
+ RrTheme *theme;
+ if ((theme = RrThemeNew(ob_rr_inst, config_theme)))
+ ob_rr_theme = theme;
+ if (ob_rr_theme == NULL)
+ ob_exit_with_error("Unable to load a theme.");
+ }
+
+ moveresize_startup(reconfigure);
+ screen_startup(reconfigure);
+ group_startup(reconfigure);
+ client_startup(reconfigure);
+ dock_startup(reconfigure);
+ keyboard_startup(reconfigure);
+ mouse_startup(reconfigure);
+ menu_startup(reconfigure);
+
+ if (!reconfigure) {
+ /* get all the existing windows */
+ client_manage_all();
+ } else {
+ GList *it;
+
+ /* redecorate all existing windows */
+ for (it = client_list; it; it = g_list_next(it)) {
+ ObClient *c = it->data;
+ frame_adjust_theme(c->frame);
+ }
+ }
+
+ reconfigure = FALSE;
- dispatch_shutdown();
+ state = OB_STATE_RUNNING;
+ ob_main_loop_run(ob_main_loop);
+ state = OB_STATE_EXITING;
+
+ if (!reconfigure) {
+ dock_remove_all();
+ client_unmanage_all();
+ }
+
+ menu_shutdown(reconfigure);
+ mouse_shutdown(reconfigure);
+ keyboard_shutdown(reconfigure);
+ dock_shutdown(reconfigure);
+ client_shutdown(reconfigure);
+ group_shutdown(reconfigure);
+ screen_shutdown(reconfigure);
+ focus_shutdown(reconfigure);
+ moveresize_shutdown(reconfigure);
+ sn_shutdown(reconfigure);
+ window_shutdown(reconfigure);
+ grab_shutdown(reconfigure);
+ event_shutdown(reconfigure);
+ config_shutdown();
+ } while (reconfigure);
+ }
RrThemeFree(ob_rr_theme);
RrInstanceFree(ob_rr_inst);
session_shutdown();
- g_free(ob_sm_id);
XCloseDisplay(ob_display);
/* re-run me */
execvp(argv[0], argv); /* try how we were run */
+ execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */
}
return 0;
}
-static void signal_handler(const ObEvent *e, void *data)
+static void signal_handler(int signal, gpointer data)
{
- int s;
-
- s = e->data.s.signal;
- switch (s) {
- case SIGUSR1:
- fprintf(stderr, "Caught SIGUSR1 signal. Restarting.");
+ if (signal == SIGUSR1) {
+ fprintf(stderr, "Caught signal %d. Restarting.\n", signal);
ob_restart();
- break;
-
- case SIGHUP:
- case SIGINT:
- case SIGTERM:
- case SIGPIPE:
- fprintf(stderr, "Caught signal %d. Exiting.", s);
+ } else if (signal == SIGUSR2) {
+ fprintf(stderr, "Caught signal %d. Reconfiguring.\n", signal);
+ ob_reconfigure();
+ } else {
+ fprintf(stderr, "Caught signal %d. Exiting.\n", signal);
ob_exit();
- break;
-
- case SIGFPE:
- case SIGSEGV:
- fprintf(stderr, "Caught signal %d. Aborting and dumping core.", s);
- abort();
}
}
xsync = TRUE;
} else if (!strcmp(argv[i], "--debug")) {
ob_debug_show_output(TRUE);
-#ifdef USE_SM
- } else if (!strcmp(argv[i], "--sm-client-id")) {
- if (i == argc - 1) /* no args left */
- g_printerr(_("--sm-client-id requires an argument\n"));
- else
- ob_sm_id = g_strdup(argv[++i]);
- } else if (!strcmp(argv[i], "--sm-save-file")) {
- if (i == argc - 1) /* no args left */
- g_printerr(_("--sm-save-file requires an argument\n"));
- else
- sm_save_file = argv[++i];
- } else if (!strcmp(argv[i], "--sm-disable")) {
- ob_sm_use = FALSE;
-#endif
} else {
g_printerr("Invalid option: '%s'\n\n", argv[i]);
print_help();
void ob_exit()
{
- shutdown = TRUE;
+ ob_main_loop_exit(ob_main_loop);
}
Cursor ob_cursor(ObCursor cursor)
{
return state;
}
+
+gchar *ob_expand_tilde(const gchar *f)
+{
+ gchar **spl;
+ gchar *ret, *mid;
+
+ if (!f)
+ return NULL;
+ spl = g_strsplit(f, "~", 0);
+ mid = g_strconcat(g_get_home_dir(), G_DIR_SEPARATOR_S, NULL);
+ ret = g_strjoinv(mid, spl);
+ g_free(mid);
+ g_strfreev(spl);
+ return ret;
+}
+
+void ob_reconfigure()
+{
+ reconfigure = TRUE;
+ ob_exit();
+}
projects / chaz / openbox / blobdiff