#include "moveresize.h"
#include "frame.h"
#include "extensions.h"
-#include "parse.h"
#include "grab.h"
#include "plugin.h"
#include "timer.h"
#include "group.h"
#include "config.h"
#include "gettext.h"
+#include "parser/parse.h"
#include "render/render.h"
-#include "render/font.h"
#include "render/theme.h"
#ifdef HAVE_FCNTL_H
# include <sys/types.h>
#endif
+#ifdef USE_SM
+#include <X11/SM/SMlib.h>
+#endif
+
#include <X11/cursorfont.h>
-Display *ob_display = NULL;
-int ob_screen;
-Window ob_root;
-State ob_state;
-gboolean ob_shutdown = FALSE;
-gboolean ob_restart = FALSE;
-char *ob_restart_path = NULL;
-gboolean ob_remote = TRUE;
-gboolean ob_sync = FALSE;
-Cursors ob_cursors;
-char *ob_rc_path = NULL;
-
-void signal_handler(const ObEvent *e, void *data);
-void parse_args(int argc, char **argv);
+#ifdef USE_SM
+gboolean ob_sm_use = TRUE;
+SmcConn ob_sm_conn;
+gchar *ob_sm_id = NULL;
+#endif
+
+RrInstance *ob_rr_inst = NULL;
+RrTheme *ob_rr_theme = NULL;
+Display *ob_display = NULL;
+int ob_screen;
+Window ob_root;
+State ob_state;
+gboolean ob_shutdown = FALSE;
+gboolean ob_restart = FALSE;
+char *ob_restart_path = NULL;
+gboolean ob_remote = TRUE;
+gboolean ob_sync = FALSE;
+Cursors ob_cursors;
+char *ob_rc_path = NULL;
+
+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;
sigset_t sigset;
char *path;
- char *theme;
+ xmlDocPtr doc;
+ xmlNodePtr node;
ob_state = State_Starting;
parse_args(argc, argv);
ob_display = XOpenDisplay(NULL);
- if (ob_display == NULL) {
- /* print a message and exit */
- g_critical("Failed to open the display.");
- exit(1);
- }
- if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) {
- /* print a message and exit */
- g_critical("Failed to set display as close-on-exec.");
- exit(1);
- }
+ if (ob_display == NULL)
+ 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.");
+
+ sm_startup(argc, argv);
#ifdef USE_LIBSN
ob_sn_display = sn_display_new(ob_display, NULL, NULL);
ob_screen = DefaultScreen(ob_display);
ob_root = RootWindow(ob_display, ob_screen);
+ ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
+ if (ob_rr_inst == NULL)
+ exit_with_error("Failed to initialize the render library.");
+
/* XXX fork self onto other screens */
XSynchronize(ob_display, ob_sync);
/* anything that is going to read data from the rc file needs to be
in this group */
timer_startup();
- render_startup();
- font_startup();
- theme_startup();
event_startup();
grab_startup();
plugin_startup();
/* set up the kernel config shit */
config_startup();
/* parse/load user options */
- parse_config();
+ 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 */
- theme = theme_load(config_theme);
- g_free(theme);
- if (!theme) return 1;
+ ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
+ if (ob_rr_theme == NULL)
+ exit_with_error("Unable to load a theme.");
window_startup();
menu_startup();
window_shutdown();
grab_shutdown();
event_shutdown();
- theme_shutdown();
- render_shutdown();
timer_shutdown();
config_shutdown();
}
dispatch_shutdown();
+ RrThemeFree(ob_rr_theme);
+ RrInstanceFree(ob_rr_inst);
+
+ sm_shutdown();
+
XCloseDisplay(ob_display);
if (ob_restart) {
return 0;
}
-void signal_handler(const ObEvent *e, void *data)
+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_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(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;
}
}
-void print_version()
+static void print_version()
{
g_print("Openbox %s\n\n", PACKAGE_VERSION);
g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
g_print("under certain conditions. See the file COPYING for details.\n\n");
}
-void print_help()
+static void print_help()
{
print_version();
g_print("Syntax: %s [options]\n\n", BINARY);
g_print("Options:\n\n");
- g_print(" -rc PATH Specify the path to the rc file to use\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 meant\n"
- " for debugging X routines)\n");
+ g_print(" -rc PATH Specify the path to the rc file to use\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");
+#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("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
}
-void parse_args(int argc, char **argv)
+static void parse_args(int argc, char **argv)
{
int i;
ob_sync = TRUE;
} else if (!strcmp(argv[i], "-rc")) {
if (i == argc - 1) /* no args left */
- g_printerr("-rc requires an argument\n");
+ g_printerr(_("-rc requires an argument\n"));
else
ob_rc_path = argv[++i];
+#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];
+ } else if (!strcmp(argv[i], "-sm-disable")) {
+ ob_sm_use = FALSE;
+#endif
} else {
g_printerr("Invalid option: '%s'\n\n", argv[i]);
print_help();
return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
}
+
+#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_shutdown = TRUE;
+ 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)
+{
+ g_critical(msg);
+ sm_shutdown();
+ exit(EXIT_FAILURE);
+}