#include "config.h"
#include "ping.h"
#include "prompt.h"
-#include "hooks.h"
#include "gettext.h"
-#include "render/render.h"
-#include "render/theme.h"
+#include "obrender/render.h"
+#include "obrender/theme.h"
#include "obt/display.h"
#include "obt/prop.h"
#include "obt/keyboard.h"
-#include "obt/parse.h"
+#include "obt/xml.h"
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#include <X11/Xcursor/Xcursor.h>
#endif
-#include <X11/Xlib.h>
-#include <X11/keysym.h>
-
RrInstance *ob_rr_inst;
RrImageCache *ob_rr_icons;
RrTheme *ob_rr_theme;
static gboolean restart = FALSE;
static gchar *restart_path = NULL;
static Cursor cursors[OB_NUM_CURSORS];
-static KeyCode keys[OB_NUM_KEYS];
static gint exitcode = 0;
static guint remote_control = 0;
static gboolean being_replaced = FALSE;
static gchar *config_file = NULL;
+static gchar *startup_cmd = NULL;
static void signal_handler(gint signal, gpointer data);
static void remove_args(gint *argc, gchar **argv, gint index, gint num);
static void parse_env();
static void parse_args(gint *argc, gchar **argv);
static Cursor load_cursor(const gchar *name, guint fontval);
+static void run_startup_cmd(void);
gint main(gint argc, gchar **argv)
{
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);
ob_screen = DefaultScreen(obt_display);
if (reconfigure) obt_keyboard_reload();
- /* get the keycodes for keys we use */
- keys[OB_KEY_RETURN] = obt_keyboard_keysym_to_keycode(XK_Return);
- keys[OB_KEY_ESCAPE] = obt_keyboard_keysym_to_keycode(XK_Escape);
- keys[OB_KEY_LEFT] = obt_keyboard_keysym_to_keycode(XK_Left);
- keys[OB_KEY_RIGHT] = obt_keyboard_keysym_to_keycode(XK_Right);
- keys[OB_KEY_UP] = obt_keyboard_keysym_to_keycode(XK_Up);
- keys[OB_KEY_DOWN] = obt_keyboard_keysym_to_keycode(XK_Down);
- keys[OB_KEY_TAB] = obt_keyboard_keysym_to_keycode(XK_Tab);
- keys[OB_KEY_SPACE] = obt_keyboard_keysym_to_keycode(XK_space);
-
{
- ObtParseInst *i;
+ ObtXmlInst *i;
/* startup the parsing so everything can register sections
of the rc */
- i = obt_parse_instance_new();
+ i = obt_xml_instance_new();
/* register all the available actions */
actions_startup(reconfigure);
- hooks_startup(reconfigure);
/* start up config which sets up with the parser */
config_startup(i);
/* parse/load user options */
if ((config_file &&
- obt_parse_load_file(i, config_file, "openbox_config")) ||
- obt_parse_load_config_file(i, "openbox", "rc.xml",
- "openbox_config"))
+ obt_xml_load_file(i, config_file, "openbox_config")) ||
+ obt_xml_load_config_file(i, "openbox", "rc.xml",
+ "openbox_config"))
{
- obt_parse_tree_from_root(i);
- obt_parse_close(i);
+ obt_xml_tree_from_root(i);
+ obt_xml_close(i);
}
else {
g_message(_("Unable to find a valid config file, using some simple defaults"));
OBT_PROP_ERASE(obt_root(ob_screen), OB_CONFIG_FILE);
/* we're done with parsing now, kill it */
- obt_parse_instance_unref(i);
+ obt_xml_instance_unref(i);
}
/* load the theme specified in the rc file */
config_font_inactivewindow,
config_font_menutitle,
config_font_menuitem,
- config_font_osd)))
+ config_font_activeosd,
+ config_font_inactiveosd)))
{
RrThemeFree(ob_rr_theme);
ob_rr_theme = theme;
ob_set_state(OB_STATE_RUNNING);
+ if (startup_cmd) run_startup_cmd();
+
/* look for parsing errors */
{
xmlErrorPtr e = xmlGetLastError();
sn_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
- hooks_shutdown(reconfigure);
actions_shutdown(reconfigure);
} while (reconfigure);
}
/* reap children */
while (waitpid(-1, NULL, WNOHANG) > 0);
break;
+ case SIGTTIN:
+ case SIGTTOU:
+ ob_debug("Caught signal %d. Ignoring.", signal);
+ break;
default:
ob_debug("Caught signal %d. Exiting.", signal);
/* TERM and INT return a 0 code */
g_print(_(" --exit Exit Openbox\n"));
g_print(_("\nDebugging options:\n"));
g_print(_(" --sync Run in synchronous mode\n"));
+ g_print(_(" --startup CMD Run CMD after starting\n"));
g_print(_(" --debug Display debugging output\n"));
g_print(_(" --debug-focus Display debugging output for focus handling\n"));
g_print(_(" --debug-session Display debugging output for session management\n"));
*argc -= num;
}
+static void run_startup_cmd(void)
+{
+ gchar **argv = NULL;
+ GError *e = NULL;
+ gboolean ok;
+
+ if (!g_shell_parse_argv(startup_cmd, NULL, &argv, &e)) {
+ g_message("Error parsing startup command: %s",
+ e->message);
+ g_error_free(e);
+ e = NULL;
+ }
+ ok = g_spawn_async(NULL, argv, NULL,
+ G_SPAWN_SEARCH_PATH |
+ G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, NULL, NULL, &e);
+ if (!g_shell_parse_argv(startup_cmd, NULL, &argv, &e)) {
+ g_message("Error launching startup command: %s",
+ e->message);
+ g_error_free(e);
+ e = NULL;
+ }
+}
+
static void parse_env(void)
{
+ const gchar *id;
+
/* unset this so we don't pass it on unknowingly */
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");
+ if (ob_sm_id) g_free(ob_sm_id);
+ ob_sm_id = g_strdup(id);
+ ob_debug_type(OB_DEBUG_SM,
+ "DESKTOP_AUTOSTART_ID %s supercedes --sm-client-id\n",
+ ob_sm_id);
+ }
}
static void parse_args(gint *argc, gchar **argv)
else if (!strcmp(argv[i], "--sync")) {
xsync = TRUE;
}
+ else if (!strcmp(argv[i], "--startup")) {
+ if (i == *argc - 1) /* no args left */
+ g_printerr(_("--startup requires an argument\n"));
+ else {
+ /* this will be in the current locale encoding, which is
+ what we want */
+ startup_cmd = argv[i+1];
+ remove_args(argc, argv, i, 2);
+ --i; /* this arg was removed so go back */
+ ob_debug("--startup %s", startup_cmd);
+ }
+ }
else if (!strcmp(argv[i], "--debug")) {
ob_debug_enable(OB_DEBUG_NORMAL, TRUE);
ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
void ob_exit_with_error(const gchar *msg)
{
- g_message(msg);
+ g_message("%s", msg);
session_shutdown(TRUE);
exit(EXIT_FAILURE);
}
return cursors[cursor];
}
-KeyCode ob_keycode(ObKey key)
-{
- g_assert(key < OB_NUM_KEYS);
- return keys[key];
-}
-
ObState ob_state(void)
{
return state;