#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);
/* set the DISPLAY environment variable for any lauched children, to the
display we're using, so they open in the right place. */
- setenv("DISPLAY", DisplayString(obt_display), TRUE);
+ g_setenv("DISPLAY", DisplayString(obt_display), TRUE);
/* create available cursors */
cursors[OB_CURSOR_NONE] = None;
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 {
+ gchar *xml_error_string = NULL;
ObPrompt *xmlprompt = NULL;
if (reconfigure) obt_keyboard_reload();
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
OBT_PROP_ERASE(obt_root(ob_screen), OB_CONFIG_FILE);
+ if (obt_xml_last_error(i)) {
+ xml_error_string = g_strdup_printf(
+ _("One or more XML syntax errors were found while parsing the Openbox configuration files. See stdout for more information. The last error seen was in file \"%s\" line %d, with message: %s"),
+ obt_xml_last_error_file(i),
+ obt_xml_last_error_line(i),
+ obt_xml_last_error_message(i));
+ }
+
/* we're done with parsing now, kill it */
obt_xml_instance_unref(i);
}
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),
}
}
- reconfigure = FALSE;
-
ob_set_state(OB_STATE_RUNNING);
- if (startup_cmd) run_startup_cmd();
+ if (!reconfigure && startup_cmd) run_startup_cmd();
+
+ reconfigure = FALSE;
/* look for parsing errors */
- {
- xmlErrorPtr e = xmlGetLastError();
- if (e) {
- gchar *m;
-
- m = g_strdup_printf(_("One or more XML syntax errors were found while parsing the Openbox configuration files. See stdout for more information. The last error seen was in file \"%s\" line %d, with message: %s"), e->file, e->line, e->message);
- xmlprompt =
- prompt_show_message(m, _("Openbox Syntax Error"), _("Close"));
- g_free(m);
- xmlResetError(e);
- }
+ if (xml_error_string) {
+ xmlprompt = prompt_show_message(xml_error_string,
+ _("Openbox Syntax Error"),
+ _("Close"));
+ g_free(xml_error_string);
+ xml_error_string = NULL;
}
- 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;
}
{
g_print("Openbox %s\n", PACKAGE_VERSION);
g_print(_("Copyright (c)"));
- g_print(" 2008 Mikael Magnusson\n");
+ g_print(" 2004 Mikael Magnusson\n");
g_print(_("Copyright (c)"));
- g_print(" 2003-2006 Dana Jansens\n\n");
+ g_print(" 2002 Dana Jansens\n\n");
g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
g_print("This is free software, and you are welcome to redistribute it\n");
g_print("under certain conditions. See the file COPYING for details.\n\n");
G_SPAWN_SEARCH_PATH |
G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, NULL, &e);
- if (!g_shell_parse_argv(startup_cmd, NULL, &argv, &e)) {
+ if (!ok) {
g_message("Error launching startup command: %s",
e->message);
g_error_free(e);
const gchar *id;
/* unset this so we don't pass it on unknowingly */
- unsetenv("DESKTOP_STARTUP_ID");
+ g_unsetenv("DESKTOP_STARTUP_ID");
/* this is how gnome-session passes in a session client id */
id = g_getenv("DESKTOP_AUTOSTART_ID");
if (id) {
- unsetenv("DESKTOP_AUTOSTART_ID");
+ g_unsetenv("DESKTOP_AUTOSTART_ID");
if (ob_sm_id) g_free(ob_sm_id);
ob_sm_id = g_strdup(id);
ob_debug_type(OB_DEBUG_SM,
}
else if (!strcmp(argv[i], "--startup")) {
if (i == *argc - 1) /* no args left */
- g_printerr(_("--startup requires an argument\n"));
+ g_printerr(_("%s requires an argument\n"), "--startup");
else {
/* this will be in the current locale encoding, which is
what we want */
}
else if (!strcmp(argv[i], "--config-file")) {
if (i == *argc - 1) /* no args left */
- g_printerr(_("--config-file requires an argument\n"));
+ g_printerr(_("%s requires an argument\n"), "--config-file");
else {
/* this will be in the current locale encoding, which is
what we want */
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)