+#include "debug.h"
#include "openbox.h"
+#include "session.h"
#include "dock.h"
#include "event.h"
#include "menu.h"
#include "focus.h"
#include "moveresize.h"
#include "frame.h"
+#include "keyboard.h"
+#include "mouse.h"
#include "extensions.h"
#include "grab.h"
#include "plugin.h"
#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
# include <sys/types.h>
#endif
-
-#ifdef USE_SM
-#include <X11/SM/SMlib.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
#endif
#include <X11/cursorfont.h>
-#ifdef USE_SM
-gboolean ob_sm_use = TRUE;
-SmcConn ob_sm_conn;
-gchar *ob_sm_id;
-#endif
-
RrInstance *ob_rr_inst;
RrTheme *ob_rr_theme;
Display *ob_display;
gint ob_screen;
-Cursor ob_cursors[OB_NUM_CURSORS];
-KeyCode ob_keys[OB_NUM_KEYS];
+gboolean ob_sm_use = TRUE;
+gchar *ob_sm_id;
+gboolean ob_replace_wm;
static ObState state;
static gboolean xsync;
static gboolean shutdown;
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 parse_args(int argc, char **argv);
-static void sm_startup(int argc, char **argv);
-static void sm_shutdown();
-
-#ifdef USE_SM
-static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
- Bool shutdown, int interact_style, Bool fast);
-static void sm_die(SmcConn conn, SmPointer data);
-static void sm_save_complete(SmcConn conn, SmPointer data);
-static void sm_shutdown_cancelled(SmcConn conn, SmPointer data);
-#endif
-static void exit_with_error(gchar *msg);
-
int main(int argc, char **argv)
{
struct sigaction action;
xmlDocPtr doc;
xmlNodePtr node;
+#ifdef DEBUG
+ ob_debug_show_output(TRUE);
+#endif
+
state = OB_STATE_STARTING;
/* initialize the locale */
mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
S_IROTH | S_IWOTH | S_IXOTH));
g_free(path);
+ /* create the ~/.openbox/sessions dir */
+ path = g_build_filename(g_get_home_dir(), ".openbox", "sessions", NULL);
+ mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
+ S_IROTH | S_IWOTH | S_IXOTH));
+ g_free(path);
g_set_prgname(argv[0]);
ob_display = XOpenDisplay(NULL);
if (ob_display == NULL)
- exit_with_error("Failed to open the display.");
+ ob_exit_with_error("Failed to open the display.");
if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
- exit_with_error("Failed to set display as close-on-exec.");
+ ob_exit_with_error("Failed to set display as close-on-exec.");
- sm_startup(argc, argv);
+ if (sm_save_file)
+ session_load(sm_save_file);
+ session_startup(argc, argv);
#ifdef USE_LIBSN
ob_sn_display = sn_display_new(ob_display, NULL, NULL);
ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
if (ob_rr_inst == NULL)
- exit_with_error("Failed to initialize the render library.");
+ ob_exit_with_error("Failed to initialize the render library.");
/* XXX fork self onto other screens */
putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
/* create available cursors */
- ob_cursors[OB_CURSOR_POINTER] =
+ cursors[OB_CURSOR_POINTER] =
XCreateFontCursor(ob_display, XC_left_ptr);
- ob_cursors[OB_CURSOR_BUSY] =
+ cursors[OB_CURSOR_BUSY] =
XCreateFontCursor(ob_display, XC_watch);
- ob_cursors[OB_CURSOR_MOVE] =
+ cursors[OB_CURSOR_MOVE] =
XCreateFontCursor(ob_display, XC_fleur);
- ob_cursors[OB_CURSOR_NORTH] =
+ cursors[OB_CURSOR_NORTH] =
XCreateFontCursor(ob_display, XC_top_side);
- ob_cursors[OB_CURSOR_NORTHEAST] =
+ cursors[OB_CURSOR_NORTHEAST] =
XCreateFontCursor(ob_display, XC_top_right_corner);
- ob_cursors[OB_CURSOR_EAST] =
+ cursors[OB_CURSOR_EAST] =
XCreateFontCursor(ob_display, XC_right_side);
- ob_cursors[OB_CURSOR_SOUTHEAST] =
+ cursors[OB_CURSOR_SOUTHEAST] =
XCreateFontCursor(ob_display, XC_bottom_right_corner);
- ob_cursors[OB_CURSOR_SOUTH] =
+ cursors[OB_CURSOR_SOUTH] =
XCreateFontCursor(ob_display, XC_bottom_side);
- ob_cursors[OB_CURSOR_SOUTHWEST] =
+ cursors[OB_CURSOR_SOUTHWEST] =
XCreateFontCursor(ob_display, XC_bottom_left_corner);
- ob_cursors[OB_CURSOR_WEST] =
+ cursors[OB_CURSOR_WEST] =
XCreateFontCursor(ob_display, XC_left_side);
- ob_cursors[OB_CURSOR_NORTHWEST] =
+ cursors[OB_CURSOR_NORTHWEST] =
XCreateFontCursor(ob_display, XC_top_left_corner);
/* create available keycodes */
- ob_keys[OB_KEY_RETURN] =
+ keys[OB_KEY_RETURN] =
XKeysymToKeycode(ob_display, XStringToKeysym("Return"));
- ob_keys[OB_KEY_ESCAPE] =
+ keys[OB_KEY_ESCAPE] =
XKeysymToKeycode(ob_display, XStringToKeysym("Escape"));
- ob_keys[OB_KEY_LEFT] =
+ keys[OB_KEY_LEFT] =
XKeysymToKeycode(ob_display, XStringToKeysym("Left"));
- ob_keys[OB_KEY_RIGHT] =
+ keys[OB_KEY_RIGHT] =
XKeysymToKeycode(ob_display, XStringToKeysym("Right"));
- ob_keys[OB_KEY_UP] =
+ keys[OB_KEY_UP] =
XKeysymToKeycode(ob_display, XStringToKeysym("Up"));
- ob_keys[OB_KEY_DOWN] =
+ keys[OB_KEY_DOWN] =
XKeysymToKeycode(ob_display, XStringToKeysym("Down"));
prop_startup(); /* get atoms values for the display */
startup_save();
if (screen_annex()) { /* it will be ours! */
+ ObParseInst *i;
+
/* startup the parsing so everything can register sections of the rc */
- parse_startup();
+ i = parse_startup();
/* anything that is going to read data from the rc file needs to be
in this group */
window_startup();
plugin_startup();
/* load the plugins specified in the pluginrc */
- plugin_loadall();
+ plugin_loadall(i);
/* set up the kernel config shit */
- config_startup();
- menu_startup();
+ config_startup(i);
+ menu_startup(i);
/* parse/load user options */
if (parse_load_rc(&doc, &node))
- parse_tree(doc, node->xmlChildrenNode, NULL);
+ parse_tree(i, doc, node->xmlChildrenNode);
/* we're done with parsing now, kill it */
- parse_shutdown();
+ xmlFreeDoc(doc);
+ parse_shutdown(i);
+
+ menu_parse();
/* load the theme specified in the rc file */
ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
if (ob_rr_theme == NULL)
- exit_with_error("Unable to load a theme.");
+ ob_exit_with_error("Unable to load a theme.");
moveresize_startup();
screen_startup();
group_startup();
client_startup();
dock_startup();
+ keyboard_startup();
+ mouse_startup();
/* call startup for all the plugins */
plugin_startall();
client_unmanage_all();
plugin_shutdown(); /* calls all the plugins' shutdown functions */
+ menu_shutdown();
+ mouse_shutdown();
+ keyboard_shutdown();
dock_shutdown();
client_shutdown();
group_shutdown();
screen_shutdown();
focus_shutdown();
moveresize_shutdown();
- menu_shutdown();
window_shutdown();
grab_shutdown();
event_shutdown();
RrThemeFree(ob_rr_theme);
RrInstanceFree(ob_rr_inst);
- sm_shutdown();
+ session_shutdown();
+ g_free(ob_sm_id);
+
+#ifdef USE_LIBSN
+ sn_display_unref(ob_sn_display);
+#endif
XCloseDisplay(ob_display);
return 0;
}
-static void sm_startup(int argc, char **argv)
-{
-#ifdef USE_SM
-
-#define SM_ERR_LEN 1024
-
- SmcCallbacks cb;
- char sm_err[SM_ERR_LEN];
-
- cb.save_yourself.callback = sm_save_yourself;
- cb.save_yourself.client_data = NULL;
-
- cb.die.callback = sm_die;
- cb.die.client_data = NULL;
-
- cb.save_complete.callback = sm_save_complete;
- cb.save_complete.client_data = NULL;
-
- cb.shutdown_cancelled.callback = sm_shutdown_cancelled;
- cb.shutdown_cancelled.client_data = NULL;
-
- ob_sm_conn = SmcOpenConnection(NULL, NULL, 1, 0,
- SmcSaveYourselfProcMask |
- SmcDieProcMask |
- SmcSaveCompleteProcMask |
- SmcShutdownCancelledProcMask,
- &cb, ob_sm_id, &ob_sm_id,
- SM_ERR_LEN, sm_err);
- if (ob_sm_conn == NULL)
- g_warning("Failed to connect to session manager: %s", sm_err);
- else {
- SmPropValue val_prog;
- SmPropValue val_uid;
- SmPropValue val_hint;
- SmPropValue val_pri;
- SmPropValue val_pid;
- SmProp prop_cmd = { SmCloneCommand, SmLISTofARRAY8, 1, };
- SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8, };
- SmProp prop_prog = { SmProgram, SmARRAY8, 1, };
- SmProp prop_uid = { SmUserID, SmARRAY8, 1, };
- SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
- SmProp prop_pid = { SmProcessID, SmARRAY8, 1, };
- SmProp prop_pri = { "_GSM_Priority", SmCARD8, 1, };
- SmProp *props[7];
- gulong hint, pri;
- gchar pid[32];
- gint i, j;
- gboolean has_id;
-
- for (i = 1; i < argc - 1; ++i)
- if (strcmp(argv[i], "--sm-client-id") == 0)
- break;
- has_id = (i < argc - 1);
-
- prop_cmd.vals = g_new(SmPropValue, (has_id ? argc-2 : argc));
- prop_cmd.num_vals = (has_id ? argc-2 : argc);
- for (i = 0, j = 0; i < argc; ++i, ++j) {
- if (strcmp (argv[i], "--sm-client-id") == 0) {
- ++i, --j; /* skip the next as well, keep j where it is */
- } else {
- prop_cmd.vals[j].value = argv[i];
- prop_cmd.vals[j].length = strlen(argv[i]);
- }
- }
-
- prop_res.vals = g_new(SmPropValue, (has_id ? argc : argc+2));
- prop_res.num_vals = (has_id ? argc : argc+2);
- for (i = 0, j = 0; i < argc; ++i, ++j) {
- if (strcmp (argv[i], "--sm-client-id") == 0) {
- ++i, --j; /* skip the next as well, keep j where it is */
- } else {
- prop_res.vals[j].value = argv[i];
- prop_res.vals[j].length = strlen(argv[i]);
- }
- }
- prop_res.vals[j].value = "--sm-client-id";
- prop_res.vals[j++].length = strlen("--sm-client-id");
- prop_res.vals[j].value = ob_sm_id;
- prop_res.vals[j++].length = strlen(ob_sm_id);
-
- val_prog.value = argv[0];
- val_prog.length = strlen(argv[0]);
-
- val_uid.value = g_strdup(g_get_user_name());
- val_uid.length = strlen(val_uid.value);
-
- hint = SmRestartImmediately;
- val_hint.value = &hint;
- val_hint.length = 1;
-
- sprintf(pid, "%ld", (long)getpid());
- val_pid.value = pid;
- val_pid.length = strlen(pid);
-
- /* priority with gnome-session-manager, low to run before other apps */
- pri = 20;
- val_pri.value = &pri;
- val_pri.length = 1;
-
- prop_prog.vals = &val_prog;
- prop_uid.vals = &val_uid;
- prop_hint.vals = &val_hint;
- prop_pid.vals = &val_pid;
- prop_pri.vals = &val_pri;
-
- props[0] = &prop_prog;
- props[1] = &prop_cmd;
- props[2] = &prop_res;
- props[3] = &prop_uid;
- props[4] = &prop_hint;
- props[5] = &prop_pid;
- props[6] = &prop_pri;
-
- SmcSetProperties(ob_sm_conn, 7, props);
-
- g_free(val_uid.value);
- g_free(prop_cmd.vals);
- g_free(prop_res.vals);
-
- g_message("Connected to session manager with id %s", ob_sm_id);
- }
- g_free (ob_sm_id);
-#endif
-}
-
-static void sm_shutdown()
-{
-#ifdef USE_SM
- if (ob_sm_conn) {
- SmPropValue val_hint;
- SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
- SmProp *props[1];
- gulong hint;
-
- /* when we exit, we want to reset this to a more friendly state */
- hint = SmRestartIfRunning;
- val_hint.value = &hint;
- val_hint.length = 1;
-
- prop_hint.vals = &val_hint;
-
- props[0] = &prop_hint;
-
- SmcSetProperties(ob_sm_conn, 1, props);
-
- SmcCloseConnection(ob_sm_conn, 0, NULL);
- }
-#endif
-}
-
static void signal_handler(const ObEvent *e, void *data)
{
int s;
g_print("Syntax: openbox [options]\n\n");
g_print("Options:\n\n");
#ifdef USE_SM
- g_print(" --sm-client-id ID Specify session management ID\n");
- g_print(" --sm-disable Disable connection to session manager\n");
+ g_print(" --sm-disable Disable connection to session manager\n");
+ g_print(" --sm-client-id ID Specify session management ID\n");
+ g_print(" --sm-save-file FILE Specify file to load a saved session\n"
+ " from\n");
#endif
- g_print(" --help Display this help and exit\n");
- g_print(" --version Display the version and exit\n");
- g_print(" --sync Run in synchronous mode (this is slow and\n"
- " meant for debugging X routines)\n");
+ g_print(" --replace Replace the currently running window "
+ "manager\n");
+ g_print(" --help Display this help and exit\n");
+ g_print(" --version Display the version and exit\n");
+ g_print(" --sync Run in synchronous mode (this is slow and\n"
+ " meant for debugging X routines)\n");
+ g_print(" --debug Display debugging output\n");
g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
}
} else if (!strcmp(argv[i], "--help")) {
print_help();
exit(0);
+ } else if (!strcmp(argv[i], "--g-fatal-warnings")) {
+ g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+ } else if (!strcmp(argv[i], "--replace")) {
+ ob_replace_wm = TRUE;
} else if (!strcmp(argv[i], "--sync")) {
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 = argv[++i];
+ 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
}
}
-#ifdef USE_SM
-static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
- Bool shutdown, int interact_style, Bool fast)
-{
- g_message("got SAVE YOURSELF from session manager");
- SmcSaveYourselfDone(conn, TRUE);
-}
-
-static void sm_die(SmcConn conn, SmPointer data)
-{
- ob_exit();
- g_message("got DIE from session manager");
-}
-
-static void sm_save_complete(SmcConn conn, SmPointer data)
-{
- g_message("got SAVE COMPLETE from session manager");
-}
-
-static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
-{
- g_message("got SHUTDOWN CANCELLED from session manager");
-}
-#endif
-
-static void exit_with_error(gchar *msg)
+void ob_exit_with_error(gchar *msg)
{
g_critical(msg);
- sm_shutdown();
+ session_shutdown();
exit(EXIT_FAILURE);
}
Cursor ob_cursor(ObCursor cursor)
{
g_assert(cursor < OB_NUM_CURSORS);
- return ob_cursors[cursor];
+ return cursors[cursor];
}
KeyCode ob_keycode(ObKey key)
{
g_assert(key < OB_NUM_KEYS);
- return ob_keys[key];
+ return keys[key];
}
ObState ob_state()