-/* This session code is largely inspired by metacity code. */
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
-#ifndef USE_SM
+ session.c for the Openbox window manager
+ Copyright (c) 2003-2007 Dana Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
+/* This session code is largely inspired by metacity code. */
#include "session.h"
-#include "client.h"
-GList *session_saved_state;
+struct _ObClient;
-void session_startup(int *argc, char ***argv) {}
-void session_shutdown() {}
-GList* session_state_find(ObClient *c) { return NULL; }
-gboolean session_state_cmp(ObSessionState *s, ObClient *c) { return FALSE; }
-void session_state_free(ObSessionState *state) {}
+GList *session_saved_state = NULL;
+gint session_desktop = -1;
+gint session_num_desktops = 0;
+gboolean session_desktop_layout_present = FALSE;
+ObDesktopLayout session_desktop_layout;
+GSList *session_desktop_names = NULL;
+#ifndef USE_SM
+void session_startup(gint argc, gchar **argv) {}
+void session_shutdown(gboolean permanent) {}
+GList* session_state_find(struct _ObClient *c) { return NULL; }
+void session_request_logout(gboolean silent) {}
#else
#include "debug.h"
#include "openbox.h"
-#include "session.h"
#include "client.h"
#include "prop.h"
+#include "focus.h"
#include "gettext.h"
#include "parser/parse.h"
#include <X11/SM/SMlib.h>
-GList *session_saved_state;
+#define SM_ERR_LEN 1024
+
+static SmcConn sm_conn;
+static gint sm_argc;
+static gchar **sm_argv;
-static gboolean sm_disable;
-static SmcConn sm_conn;
-static gchar *save_file;
-static gchar *sm_id;
-static gint sm_argc;
-static gchar **sm_argv;
+/* Data saved from the first level save yourself */
+typedef struct {
+ ObClient *focus_client;
+ gint desktop;
+} ObSMSaveData;
-static void session_load(char *path);
-static gboolean session_save();
+static gboolean session_connect();
-static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
- Bool shutdown, int interact_style, Bool fast);
+static void session_load_file(const gchar *path);
+static gboolean session_save_to_file(const ObSMSaveData *savedata);
+
+static void session_setup_program();
+static void session_setup_user();
+static void session_setup_restart_style(gboolean restart);
+static void session_setup_pid();
+static void session_setup_priority();
+static void session_setup_clone_command();
+static void session_setup_restart_command();
+
+static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
+ Bool shutdown, gint 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);
-static void save_commands()
+static gboolean session_state_cmp(ObSessionState *s, ObClient *c);
+static void session_state_free(ObSessionState *state);
+
+void session_startup(gint argc, gchar **argv)
{
- SmProp *props[2];
- SmProp prop_cmd = { SmCloneCommand, SmLISTofARRAY8, 1, };
- SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8, };
- gint i;
+ gchar *dir;
- prop_cmd.vals = g_new(SmPropValue, sm_argc);
- prop_cmd.num_vals = sm_argc;
- for (i = 0; i < sm_argc; ++i) {
- prop_cmd.vals[i].value = sm_argv[i];
- prop_cmd.vals[i].length = strlen(sm_argv[i]);
- }
+ if (!ob_sm_use) return;
- prop_res.vals = g_new(SmPropValue, sm_argc + 2);
- prop_res.num_vals = sm_argc + 2;
- for (i = 0; i < sm_argc; ++i) {
- prop_res.vals[i].value = sm_argv[i];
- prop_res.vals[i].length = strlen(sm_argv[i]);
+ sm_argc = argc;
+ sm_argv = argv;
+
+ dir = g_build_filename(parse_xdg_data_home_path(),
+ "openbox", "sessions", NULL);
+ if (!parse_mkdir_path(dir, 0700)) {
+ g_message(_("Unable to make directory \"%s\": %s"),
+ dir, g_strerror(errno));
}
- if (save_file) {
- prop_res.vals[i].value = "--sm-save-file";
- prop_res.vals[i++].length = strlen("--sm-save-file");
- prop_res.vals[i].value = save_file;
- prop_res.vals[i++].length = strlen(save_file);
+ if (ob_sm_save_file != NULL) {
+ if (ob_sm_restore) {
+ ob_debug_type(OB_DEBUG_SM, "Loading from session file %s\n",
+ ob_sm_save_file);
+ session_load_file(ob_sm_save_file);
+ }
} else {
- prop_res.vals[i].value = "--sm-client-id";
- prop_res.vals[i++].length = strlen("--sm-client-id");
- prop_res.vals[i].value = sm_id;
- prop_res.vals[i++].length = strlen(sm_id);
+ gchar *filename;
+
+ /* this algo is from metacity */
+ filename = g_strdup_printf("%u-%u-%u.obs",
+ (guint)time(NULL),
+ (guint)getpid(),
+ g_random_int());
+ ob_sm_save_file = g_build_filename(dir, filename, NULL);
+ g_free(filename);
}
- props[0] = &prop_res;
- props[1] = &prop_cmd;
- SmcSetProperties(sm_conn, 2, props);
+ if (session_connect()) {
+ session_setup_program();
+ session_setup_user();
+ session_setup_restart_style(TRUE);
+ session_setup_pid();
+ session_setup_priority();
+ session_setup_clone_command();
+ }
- g_free(prop_res.vals);
- g_free(prop_cmd.vals);
+ g_free(dir);
}
-static void remove_two_args(int *argc, char ***argv, int index)
+void session_shutdown(gboolean permanent)
{
- int i;
+ if (!ob_sm_use) return;
- for (i = index; i < index + 2; ++i)
- (*argv)[i] = (*argv)[i+2];
- *argc -= 2;
-}
+ if (sm_conn) {
+ /* if permanent is true then we will change our session state so that
+ the SM won't run us again */
+ if (permanent)
+ session_setup_restart_style(FALSE);
-static void parse_args(int *argc, char ***argv)
-{
- int i;
-
- for (i = 1; i < *argc; ++i) {
- if (!strcmp((*argv)[i], "--sm-client-id")) {
- if (i == *argc - 1) /* no args left */
- g_printerr(_("--sm-client-id requires an argument\n"));
- else {
- sm_id = g_strdup((*argv)[i+1]);
- remove_two_args(argc, argv, i);
- ++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 {
- save_file = g_strdup((*argv)[i+1]);
- remove_two_args(argc, argv, i);
- ++i;
- }
- } else if (!strcmp((*argv)[i], "--sm-disable")) {
- sm_disable = TRUE;
+ SmcCloseConnection(sm_conn, 0, NULL);
+
+ while (session_saved_state) {
+ session_state_free(session_saved_state->data);
+ session_saved_state = g_list_delete_link(session_saved_state,
+ session_saved_state);
}
}
}
-void session_startup(int *argc, char ***argv)
+/*! Connect to the session manager and set up our callback functions */
+static gboolean session_connect()
{
-#define SM_ERR_LEN 1024
-
SmcCallbacks cb;
- char sm_err[SM_ERR_LEN];
-
- parse_args(argc, argv);
-
- if (sm_disable)
- return;
-
- if (save_file)
- session_load(save_file);
-
- sm_argc = *argc;
- sm_argv = *argv;
+ gchar *oldid;
+ gchar sm_err[SM_ERR_LEN];
+ /* set up our callback functions */
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;
+ /* connect to the server */
+ oldid = ob_sm_id;
+ ob_debug_type(OB_DEBUG_SM, "Connecting to SM with id: %s\n",
+ oldid ? oldid : "(null)");
sm_conn = SmcOpenConnection(NULL, NULL, 1, 0,
SmcSaveYourselfProcMask |
SmcDieProcMask |
SmcSaveCompleteProcMask |
SmcShutdownCancelledProcMask,
- &cb, sm_id, &sm_id,
- SM_ERR_LEN, sm_err);
+ &cb, oldid, &ob_sm_id,
+ SM_ERR_LEN-1, sm_err);
+ g_free(oldid);
+ ob_debug_type(OB_DEBUG_SM, "Connected to SM with id: %s\n", ob_sm_id);
if (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_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[6];
- gchar hint, pri;
- gchar pid[32];
-
- val_prog.value = sm_argv[0];
- val_prog.length = strlen(sm_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_uid;
- props[2] = &prop_hint;
- props[3] = &prop_pid;
- props[4] = &prop_pri;
-
- SmcSetProperties(sm_conn, 5, props);
-
- g_free(val_uid.value);
-
- save_commands();
- }
+ ob_debug("Failed to connect to session manager: %s\n", sm_err);
+ return sm_conn != NULL;
}
-void session_shutdown()
+static void session_setup_program()
{
- g_free(save_file);
- g_free(sm_id);
+ SmPropValue vals = {
+ .value = sm_argv[0],
+ .length = strlen(sm_argv[0]) + 1
+ };
+ SmProp prop = {
+ .name = g_strdup(SmProgram),
+ .type = g_strdup(SmARRAY8),
+ .num_vals = 1,
+ .vals = &vals
+ };
+ SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting program: %s\n", sm_argv[0]);
+ SmcSetProperties(sm_conn, 1, &list);
+ g_free(prop.name);
+ g_free(prop.type);
+}
- if (sm_conn) {
- SmPropValue val_hint;
- SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
- SmProp *props[1];
- gulong hint;
+static void session_setup_user()
+{
+ char *user = g_strdup(g_get_user_name());
+
+ SmPropValue vals = {
+ .value = user,
+ .length = strlen(user) + 1
+ };
+ SmProp prop = {
+ .name = g_strdup(SmUserID),
+ .type = g_strdup(SmARRAY8),
+ .num_vals = 1,
+ .vals = &vals
+ };
+ SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting user: %s\n", user);
+ SmcSetProperties(sm_conn, 1, &list);
+ g_free(prop.name);
+ g_free(prop.type);
+ g_free(user);
+}
- /* when we exit, we want to reset this to a more friendly state */
- hint = SmRestartIfRunning;
- val_hint.value = &hint;
- val_hint.length = 1;
+static void session_setup_restart_style(gboolean restart)
+{
+ gchar restart_hint = restart ? SmRestartImmediately : SmRestartIfRunning;
+
+ SmPropValue vals = {
+ .value = &restart_hint,
+ .length = 1
+ };
+ SmProp prop = {
+ .name = g_strdup(SmRestartStyleHint),
+ .type = g_strdup(SmCARD8),
+ .num_vals = 1,
+ .vals = &vals
+ };
+ SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting restart: %d\n", restart);
+ SmcSetProperties(sm_conn, 1, &list);
+ g_free(prop.name);
+ g_free(prop.type);
+}
- prop_hint.vals = &val_hint;
+static void session_setup_pid()
+{
+ gchar *pid = g_strdup_printf("%ld", (glong) getpid());
+
+ SmPropValue vals = {
+ .value = pid,
+ .length = strlen(pid) + 1
+ };
+ SmProp prop = {
+ .name = g_strdup(SmProcessID),
+ .type = g_strdup(SmARRAY8),
+ .num_vals = 1,
+ .vals = &vals
+ };
+ SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting pid: %s\n", pid);
+ SmcSetProperties(sm_conn, 1, &list);
+ g_free(prop.name);
+ g_free(prop.type);
+ g_free(pid);
+}
- props[0] = &prop_hint;
+/*! This is a gnome-session-manager extension */
+static void session_setup_priority()
+{
+ gchar priority = 20; /* 20 is a lower prioity to run before other apps */
+
+ SmPropValue vals = {
+ .value = &priority,
+ .length = 1
+ };
+ SmProp prop = {
+ .name = g_strdup("_GSM_Priority"),
+ .type = g_strdup(SmCARD8),
+ .num_vals = 1,
+ .vals = &vals
+ };
+ SmProp *list = ∝
+ ob_debug_type(OB_DEBUG_SM, "Setting priority: %d\n", priority);
+ SmcSetProperties(sm_conn, 1, &list);
+ g_free(prop.name);
+ g_free(prop.type);
+}
- SmcSetProperties(sm_conn, 1, props);
+static void session_setup_clone_command()
+{
+ gint i;
- SmcCloseConnection(sm_conn, 0, NULL);
+ SmPropValue *vals = g_new(SmPropValue, sm_argc);
+ SmProp prop = {
+ .name = g_strdup(SmCloneCommand),
+ .type = g_strdup(SmLISTofARRAY8),
+ .num_vals = sm_argc,
+ .vals = vals
+ };
+ SmProp *list = ∝
- while (session_saved_state) {
- session_state_free(session_saved_state->data);
- session_saved_state = g_list_delete_link(session_saved_state,
- session_saved_state);
- }
+ ob_debug_type(OB_DEBUG_SM, "Setting clone command: (%d)\n", sm_argc);
+ for (i = 0; i < sm_argc; ++i) {
+ vals[i].value = sm_argv[i];
+ vals[i].length = strlen(sm_argv[i]) + 1;
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value);
}
+
+ SmcSetProperties(sm_conn, 1, &list);
+ g_free(prop.name);
+ g_free(prop.type);
+ g_free(vals);
}
-static void sm_save_yourself_phase2(SmcConn conn, SmPointer data)
+static void session_setup_restart_command()
+{
+ gint i;
+
+ SmPropValue *vals = g_new(SmPropValue, sm_argc + 4);
+ SmProp prop = {
+ .name = g_strdup(SmRestartCommand),
+ .type = g_strdup(SmLISTofARRAY8),
+ .num_vals = sm_argc + 4,
+ .vals = vals
+ };
+ SmProp *list = ∝
+
+ ob_debug_type(OB_DEBUG_SM, "Setting restart command: (%d)\n", sm_argc+4);
+ for (i = 0; i < sm_argc; ++i) {
+ vals[i].value = sm_argv[i];
+ vals[i].length = strlen(sm_argv[i]) + 1;
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value);
+ }
+
+ vals[i].value = g_strdup("--sm-client-id");
+ vals[i].length = strlen("--sm-client-id") + 1;
+ vals[i+1].value = ob_sm_id;
+ vals[i+1].length = strlen(ob_sm_id) + 1;
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i].value);
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+1].value);
+
+ vals[i+2].value = g_strdup("--sm-save-file");
+ vals[i+2].length = strlen("--sm-save-file") + 1;
+ vals[i+3].value = ob_sm_save_file;
+ vals[i+3].length = strlen(ob_sm_save_file) + 1;
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+2].value);
+ ob_debug_type(OB_DEBUG_SM, " %s\n", vals[i+3].value);
+
+ SmcSetProperties(sm_conn, 1, &list);
+ g_free(prop.name);
+ g_free(prop.type);
+ g_free(vals[i].value);
+ g_free(vals[i+2].value);
+ g_free(vals);
+}
+
+static ObSMSaveData *sm_save_get_data()
+{
+ ObSMSaveData *savedata = g_new0(ObSMSaveData, 1);
+ /* save the active desktop and client.
+ we don't bother to preemptively save the other desktop state like
+ number and names of desktops, cuz those shouldn't be changing during
+ the save.. */
+ savedata->focus_client = focus_client;
+ savedata->desktop = screen_desktop;
+ return savedata;
+}
+
+static void sm_save_yourself_2(SmcConn conn, SmPointer data)
{
gboolean success;
+ ObSMSaveData *savedata = data;
+
+ /* save the current state */
+ ob_debug_type(OB_DEBUG_SM, "Session save phase 2 requested\n");
+ ob_debug_type(OB_DEBUG_SM,
+ " Saving session to file '%s'\n", ob_sm_save_file);
+ if (savedata == NULL)
+ savedata = sm_save_get_data();
+ success = session_save_to_file(savedata);
+ g_free(savedata);
- success = session_save();
- save_commands();
+ /* tell the session manager how to restore this state */
+ if (success) session_setup_restart_command();
+ ob_debug_type(OB_DEBUG_SM, "Saving is done (success = %d)\n", success);
SmcSaveYourselfDone(conn, success);
}
-static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
- Bool shutdown, int interact_style, Bool fast)
+
+static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
+ Bool shutdown, gint interact_style, Bool fast)
{
- if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_phase2, data)) {
- ob_debug("SAVE YOURSELF PHASE 2 failed\n");
+ ObSMSaveData *savedata = NULL;
+ gchar *vendor;
+
+ ob_debug_type(OB_DEBUG_SM, "Session save requested\n");
+
+ vendor = SmcVendor(sm_conn);
+ ob_debug_type(OB_DEBUG_SM, "Session manager's vendor: %s\n", vendor);
+
+ if (!strcmp(vendor, "KDE")) {
+ /* ksmserver guarantees that phase 1 will complete before allowing any
+ clients interaction, so we can save this sanely here before they
+ get messed up from interaction */
+ savedata = sm_save_get_data();
+ }
+ free(vendor);
+
+ if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_2, savedata)) {
+ ob_debug_type(OB_DEBUG_SM, "Requst for phase 2 failed\n");
+ g_free(savedata);
SmcSaveYourselfDone(conn, FALSE);
}
}
static void sm_die(SmcConn conn, SmPointer data)
{
- ob_exit();
+ ob_debug_type(OB_DEBUG_SM, "Die requested\n");
+ ob_exit(0);
}
static void sm_save_complete(SmcConn conn, SmPointer data)
{
+ ob_debug_type(OB_DEBUG_SM, "Save complete\n");
}
static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
{
+ ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled\n");
}
-static gboolean session_save()
+static gboolean session_save_to_file(const ObSMSaveData *savedata)
{
- gchar *filename;
FILE *f;
GList *it;
gboolean success = TRUE;
- /* this algo is from metacity */
- filename = g_strdup_printf("%d-%d-%u.obs",
- (int) time(NULL),
- (int) getpid(),
- g_random_int());
- save_file = g_build_filename(g_get_home_dir(), ".openbox", "sessions",
- filename, NULL);
- g_free(filename);
-
- f = fopen(save_file, "w");
+ f = fopen(ob_sm_save_file, "w");
if (!f) {
success = FALSE;
- g_warning("unable to save the session to %s: %s",
- save_file, strerror(errno));
+ g_message(_("Unable to save the session to \"%s\": %s"),
+ ob_sm_save_file, g_strerror(errno));
} else {
- guint stack_pos = 0;
-
fprintf(f, "<?xml version=\"1.0\"?>\n\n");
- fprintf(f, "<openbox_session id=\"%s\">\n\n", sm_id);
+ fprintf(f, "<openbox_session>\n\n");
+
+ fprintf(f, "<desktop>%d</desktop>\n", savedata->desktop);
+
+ fprintf(f, "<numdesktops>%d</numdesktops>\n", screen_num_desktops);
+
+ fprintf(f, "<desktoplayout>\n");
+ fprintf(f, " <orientation>%d</orientation>\n",
+ screen_desktop_layout.orientation);
+ fprintf(f, " <startcorner>%d</startcorner>\n",
+ screen_desktop_layout.start_corner);
+ fprintf(f, " <columns>%d</columns>\n",
+ screen_desktop_layout.columns);
+ fprintf(f, " <rows>%d</rows>\n",
+ screen_desktop_layout.rows);
+ fprintf(f, "</desktoplayout>\n");
+
+ if (screen_desktop_names) {
+ gint i;
+
+ fprintf(f, "<desktopnames>\n");
+ for (i = 0; screen_desktop_names[i]; ++i)
+ fprintf(f, " <name>%s</name>\n", screen_desktop_names[i]);
+ fprintf(f, "</desktopnames>\n");
+ }
+ /* they are ordered top to bottom in stacking order */
for (it = stacking_list; it; it = g_list_next(it)) {
- guint num;
- gint32 *dimensions;
gint prex, prey, prew, preh;
ObClient *c;
gchar *t;
if (!client_normal(c))
continue;
- if (!c->sm_client_id)
- continue;
+ if (!c->sm_client_id) {
+ ob_debug_type(OB_DEBUG_SM, "Client %s does not have a "
+ "session id set\n",
+ c->title);
+ if (!c->wm_command) {
+ ob_debug_type(OB_DEBUG_SM, "Client %s does not have an "
+ "oldskool wm_command set either. We won't "
+ "be saving its data\n",
+ c->title);
+ continue;
+ }
+ }
+
+ ob_debug_type(OB_DEBUG_SM, "Saving state for client %s\n",
+ c->title);
prex = c->area.x;
prey = c->area.y;
prew = c->area.width;
preh = c->area.height;
- if (PROP_GETA32(c->window, openbox_premax, cardinal,
- (guint32**)&dimensions, &num)) {
- if (num == 4) {
- prex = dimensions[0];
- prey = dimensions[1];
- prew = dimensions[2];
- preh = dimensions[3];
- }
- g_free(dimensions);
+ if (c->fullscreen) {
+ prex = c->pre_fullscreen_area.x;
+ prey = c->pre_fullscreen_area.x;
+ prew = c->pre_fullscreen_area.width;
+ preh = c->pre_fullscreen_area.height;
+ }
+ if (c->max_horz) {
+ prex = c->pre_max_area.x;
+ prew = c->pre_max_area.width;
+ }
+ if (c->max_vert) {
+ prey = c->pre_max_area.y;
+ preh = c->pre_max_area.height;
}
- fprintf(f, "<window id=\"%s\">\n", c->sm_client_id);
+ if (c->sm_client_id)
+ fprintf(f, "<window id=\"%s\">\n", c->sm_client_id);
+ else
+ fprintf(f, "<window command=\"%s\">\n", c->wm_command);
t = g_markup_escape_text(c->name, -1);
fprintf(f, "\t<name>%s</name>\n", t);
fprintf(f, "\t<role>%s</role>\n", t);
g_free(t);
+ fprintf(f, "\t<windowtype>%d</windowtype>\n", c->type);
+
fprintf(f, "\t<desktop>%d</desktop>\n", c->desktop);
- fprintf(f, "\t<stacking>%d</stacking>\n", stack_pos);
fprintf(f, "\t<x>%d</x>\n", prex);
fprintf(f, "\t<y>%d</y>\n", prey);
fprintf(f, "\t<width>%d</width>\n", prew);
fprintf(f, "\t<max_horz />\n");
if (c->max_vert)
fprintf(f, "\t<max_vert />\n");
+ if (c->undecorated)
+ fprintf(f, "\t<undecorated />\n");
+ if (savedata->focus_client == c)
+ fprintf(f, "\t<focused />\n");
fprintf(f, "</window>\n\n");
-
- ++stack_pos;
}
fprintf(f, "</openbox_session>\n");
if (fflush(f)) {
success = FALSE;
- g_warning("error while saving the session to %s: %s",
- save_file, strerror(errno));
+ g_message(_("Error while saving the session to \"%s\": %s"),
+ ob_sm_save_file, g_strerror(errno));
}
fclose(f);
}
return success;
}
-void session_state_free(ObSessionState *state)
+static void session_state_free(ObSessionState *state)
{
if (state) {
g_free(state->id);
+ g_free(state->command);
g_free(state->name);
g_free(state->class);
g_free(state->role);
}
}
-gboolean session_state_cmp(ObSessionState *s, ObClient *c)
+static gboolean session_state_cmp(ObSessionState *s, ObClient *c)
{
- return (c->sm_client_id &&
- !strcmp(s->id, c->sm_client_id) &&
- !strcmp(s->name, c->name) &&
- !strcmp(s->class, c->class) &&
- !strcmp(s->role, c->role));
+ ob_debug_type(OB_DEBUG_SM, "Comparing client against saved state: \n");
+ ob_debug_type(OB_DEBUG_SM, " client id: %s \n", c->sm_client_id);
+ ob_debug_type(OB_DEBUG_SM, " client name: %s \n", c->name);
+ ob_debug_type(OB_DEBUG_SM, " client class: %s \n", c->class);
+ ob_debug_type(OB_DEBUG_SM, " client role: %s \n", c->role);
+ ob_debug_type(OB_DEBUG_SM, " client type: %d \n", c->type);
+ ob_debug_type(OB_DEBUG_SM, " client command: %s \n",
+ c->wm_command ? c->wm_command : "(null)");
+ ob_debug_type(OB_DEBUG_SM, " state id: %s \n", s->id);
+ ob_debug_type(OB_DEBUG_SM, " state name: %s \n", s->name);
+ ob_debug_type(OB_DEBUG_SM, " state class: %s \n", s->class);
+ ob_debug_type(OB_DEBUG_SM, " state role: %s \n", s->role);
+ ob_debug_type(OB_DEBUG_SM, " state type: %d \n", s->type);
+ ob_debug_type(OB_DEBUG_SM, " state command: %s \n",
+ s->command ? s->command : "(null)");
+
+ if ((c->sm_client_id && s->id && !strcmp(c->sm_client_id, s->id)) ||
+ (c->wm_command && s->command && !strcmp(c->wm_command, s->command)))
+ {
+ return (!strcmp(s->name, c->name) &&
+ !strcmp(s->class, c->class) &&
+ !strcmp(s->role, c->role) &&
+ /* the check for type is to catch broken clients, like
+ firefox, which open a different window on startup
+ with the same info as the one we saved. only do this
+ check for old windows that dont use xsmp, others should
+ know better ! */
+ (!s->command || c->type == s->type));
+ }
+ return FALSE;
}
GList* session_state_find(ObClient *c)
return it;
}
-static gint stack_sort(const ObSessionState *s1, const ObSessionState *s2)
-{
- return s1->stacking - s2->stacking;
-}
-
-static void session_load(char *path)
+static void session_load_file(const gchar *path)
{
xmlDocPtr doc;
- xmlNodePtr node, n;
- gchar *id;
+ xmlNodePtr node, n, m;
+ GList *it, *inext;
if (!parse_load(path, "openbox_session", &doc, &node))
return;
- if (!parse_attr_string("id", node, &id))
- return;
- g_free(sm_id);
- sm_id = id;
+ if ((n = parse_find_node("desktop", node->children)))
+ session_desktop = parse_int(doc, n);
+
+ if ((n = parse_find_node("numdesktops", node->children)))
+ session_num_desktops = parse_int(doc, n);
+
+ if ((n = parse_find_node("desktoplayout", node->children))) {
+ /* make sure they are all there for it to be valid */
+ if ((m = parse_find_node("orientation", n->children)))
+ session_desktop_layout.orientation = parse_int(doc, m);
+ if (m && (m = parse_find_node("startcorner", n->children)))
+ session_desktop_layout.start_corner = parse_int(doc, m);
+ if (m && (m = parse_find_node("columns", n->children)))
+ session_desktop_layout.columns = parse_int(doc, m);
+ if (m && (m = parse_find_node("rows", n->children)))
+ session_desktop_layout.rows = parse_int(doc, m);
+ session_desktop_layout_present = m != NULL;
+ }
- node = parse_find_node("window", node->children);
- while (node) {
+ if ((n = parse_find_node("desktopnames", node->children))) {
+ for (m = parse_find_node("name", n->children); m;
+ m = parse_find_node("name", m->next))
+ {
+ session_desktop_names = g_slist_append(session_desktop_names,
+ parse_string(doc, m));
+ }
+ }
+
+ for (node = parse_find_node("window", node->children); node != NULL;
+ node = parse_find_node("window", node->next))
+ {
ObSessionState *state;
state = g_new0(ObSessionState, 1);
if (!parse_attr_string("id", node, &state->id))
+ if (!parse_attr_string("command", node, &state->command))
goto session_load_bail;
if (!(n = parse_find_node("name", node->children)))
goto session_load_bail;
if (!(n = parse_find_node("role", node->children)))
goto session_load_bail;
state->role = parse_string(doc, n);
- if (!(n = parse_find_node("stacking", node->children)))
+ if (!(n = parse_find_node("windowtype", node->children)))
goto session_load_bail;
- state->stacking = parse_int(doc, n);
+ state->type = parse_int(doc, n);
if (!(n = parse_find_node("desktop", node->children)))
goto session_load_bail;
state->desktop = parse_int(doc, n);
parse_find_node("max_horz", node->children) != NULL;
state->max_vert =
parse_find_node("max_vert", node->children) != NULL;
-
- /* save this */
- session_saved_state = g_list_prepend(session_saved_state, state);
- goto session_load_ok;
+ state->undecorated =
+ parse_find_node("undecorated", node->children) != NULL;
+ state->focused =
+ parse_find_node("focused", node->children) != NULL;
+
+ /* save this. they are in the file in stacking order, so preserve
+ that order here */
+ session_saved_state = g_list_append(session_saved_state, state);
+ continue;
session_load_bail:
session_state_free(state);
+ }
- session_load_ok:
+ /* Remove any duplicates. This means that if two windows (or more) are
+ saved with the same session state, we won't restore a session for any
+ of them because we don't know what window to put what on. AHEM FIREFOX.
- node = parse_find_node("window", node->next);
- }
+ This is going to be an O(2^n) kind of operation unfortunately.
+ */
+ for (it = session_saved_state; it; it = inext) {
+ GList *jt, *jnext;
+ gboolean founddup = FALSE;
+ ObSessionState *s1 = it->data;
+
+ inext = g_list_next(it);
+
+ for (jt = g_list_next(it); jt; jt = jnext) {
+ ObSessionState *s2 = jt->data;
+ gboolean match;
+
+ jnext = g_list_next(jt);
- /* sort them by their stacking order */
- session_saved_state = g_list_sort(session_saved_state,
- (GCompareFunc)stack_sort);
+ if (s1->id && s2->id)
+ match = strcmp(s1->id, s2->id) == 0;
+ else if (s1->command && s2->command)
+ match = strcmp(s1->command, s2->command) == 0;
+ else
+ match = FALSE;
+
+ if (match &&
+ !strcmp(s1->name, s2->name) &&
+ !strcmp(s1->class, s2->class) &&
+ !strcmp(s1->role, s2->role))
+ {
+ session_state_free(s2);
+ session_saved_state =
+ g_list_delete_link(session_saved_state, jt);
+ founddup = TRUE;
+ }
+ }
+
+ if (founddup) {
+ session_state_free(s1);
+ session_saved_state = g_list_delete_link(session_saved_state, it);
+ }
+ }
xmlFreeDoc(doc);
}
+void session_request_logout(gboolean silent)
+{
+ if (sm_conn) {
+ SmcRequestSaveYourself(sm_conn,
+ SmSaveGlobal,
+ TRUE, /* logout */
+ (silent ?
+ SmInteractStyleNone : SmInteractStyleAny),
+ TRUE, /* if false, with GSM, it shows the old
+ logout prompt */
+ TRUE); /* global */
+ }
+ else
+ g_message(_("Not connected to a session manager"));
+}
+
#endif
projects / mikachu / openbox.git / blobdiff