#include "obrender/render.h"
#include "obrender/theme.h"
#include "obt/display.h"
+#include "obt/xqueue.h"
+#include "obt/signal.h"
#include "obt/prop.h"
#include "obt/keyboard.h"
#include "obt/xml.h"
RrInstance *ob_rr_inst;
RrImageCache *ob_rr_icons;
RrTheme *ob_rr_theme;
-ObtMainLoop *ob_main_loop;
+GMainLoop *ob_main_loop;
gint ob_screen;
gboolean ob_replace_wm = FALSE;
gboolean ob_sm_use = TRUE;
{
gchar *program_name;
+ obt_signal_listen();
+
ob_set_state(OB_STATE_STARTING);
ob_debug_startup();
exit(EXIT_SUCCESS);
}
- ob_main_loop = obt_main_loop_new();
+ ob_main_loop = g_main_loop_new(NULL, FALSE);
- /* set up signal handler */
- obt_main_loop_signal_add(ob_main_loop, SIGUSR1, signal_handler, NULL,NULL);
- obt_main_loop_signal_add(ob_main_loop, SIGUSR2, signal_handler, NULL,NULL);
- obt_main_loop_signal_add(ob_main_loop, SIGTERM, signal_handler, NULL,NULL);
- obt_main_loop_signal_add(ob_main_loop, SIGINT, signal_handler, NULL,NULL);
- obt_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL,NULL);
- obt_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL,NULL);
- obt_main_loop_signal_add(ob_main_loop, SIGCHLD, signal_handler, NULL,NULL);
- obt_main_loop_signal_add(ob_main_loop, SIGTTIN, signal_handler, NULL,NULL);
- obt_main_loop_signal_add(ob_main_loop, SIGTTOU, signal_handler, NULL,NULL);
+ /* set up signal handlers, they are called from the mainloop
+ in the main program's thread */
+ obt_signal_add_callback(SIGUSR1, signal_handler, NULL);
+ obt_signal_add_callback(SIGUSR2, signal_handler, NULL);
+ obt_signal_add_callback(SIGTERM, signal_handler, NULL);
+ obt_signal_add_callback(SIGINT, signal_handler, NULL);
+ obt_signal_add_callback(SIGHUP, signal_handler, NULL);
+ obt_signal_add_callback(SIGPIPE, signal_handler, NULL);
+ obt_signal_add_callback(SIGCHLD, signal_handler, NULL);
+ obt_signal_add_callback(SIGTTIN, signal_handler, NULL);
+ obt_signal_add_callback(SIGTTOU, signal_handler, NULL);
ob_screen = DefaultScreen(obt_display);
XC_top_left_corner);
if (screen_annex()) { /* it will be ours! */
+
+ /* get a timestamp from after taking over as the WM. if we use the
+ old timestamp to set focus it can fail when replacing another WM. */
+ event_reset_time();
+
do {
ObPrompt *xmlprompt = NULL;
gchar *p = g_filename_to_utf8(config_file, -1,
NULL, NULL, NULL);
if (p)
- OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE,
- utf8, p);
+ OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, p);
g_free(p);
}
else
if (ob_rr_theme == NULL)
ob_exit_with_error(_("Unable to load a theme."));
- OBT_PROP_SETS(obt_root(ob_screen),
- OB_THEME, utf8, ob_rr_theme->name);
+ OBT_PROP_SETS(obt_root(ob_screen), OB_THEME,
+ ob_rr_theme->name);
}
if (reconfigure) {
menu_startup(reconfigure);
prompt_startup(reconfigure);
+ /* do this after everything is started so no events will get
+ missed */
+ xqueue_listen();
+
if (!reconfigure) {
guint32 xid;
ObWindow *w;
/* get all the existing windows */
window_manage_all();
- focus_nothing();
/* focus what was focused if a wm was already running */
if (OBT_PROP_GET32(obt_root(ob_screen),
}
}
- obt_main_loop_run(ob_main_loop);
+ g_main_loop_run(ob_main_loop);
ob_set_state(reconfigure ?
OB_STATE_RECONFIGURING : OB_STATE_EXITING);
if (restart) {
ob_debug_shutdown();
+ obt_signal_stop();
if (restart_path != NULL) {
gint argcp;
gchar **argvp;
g_free(ob_sm_id);
g_free(program_name);
- if (!restart)
+ if (!restart) {
ob_debug_shutdown();
+ obt_signal_stop();
+ }
return exitcode;
}
void ob_exit(gint code)
{
exitcode = code;
- obt_main_loop_exit(ob_main_loop);
+ g_main_loop_quit(ob_main_loop);
}
void ob_exit_replace(void)
{
exitcode = 0;
being_replaced = TRUE;
- obt_main_loop_exit(ob_main_loop);
+ g_main_loop_quit(ob_main_loop);
}
Cursor ob_cursor(ObCursor cursor)