#include "openbox.h"
#include "client.h"
#include "prop.h"
+#include "focus.h"
#include "screen.h"
#include "gettext.h"
#include "parser/parse.h"
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 gboolean session_connect();
-static void session_load_file(gchar *path);
-static gboolean session_save_to_file();
+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();
if (sm_conn) {
/* if permanent is true then we will change our session state so that
the SM won't run us again */
- session_setup_restart_style(!permanent);
+ if (permanent)
+ session_setup_restart_style(FALSE);
SmcCloseConnection(sm_conn, 0, NULL);
SmcSaveCompleteProcMask |
SmcShutdownCancelledProcMask,
&cb, oldid, &ob_sm_id,
- SM_ERR_LEN, sm_err);
+ 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)
ob_debug("Failed to connect to session manager: %s\n", sm_err);
return sm_conn != NULL;
.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);
.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);
static void session_setup_restart_style(gboolean restart)
{
- char restart_hint = restart ? SmRestartImmediately : SmRestartIfRunning;
+ gchar restart_hint = restart ? SmRestartImmediately : SmRestartIfRunning;
SmPropValue vals = {
.value = &restart_hint,
.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);
.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);
.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);
.num_vals = sm_argc,
.vals = vals
};
+ SmProp *list = ∝
+ 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);
}
- SmProp *list = ∝
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
.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-save-file");
- vals[i].length = strlen("--sm-save-file") + 1;
- vals[i+1].value = ob_sm_save_file;
- vals[i+1].length = strlen(ob_sm_save_file) + 1;
+ 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-client-id");
- vals[i+2].length = strlen("--sm-client-id") + 1;
- vals[i+3].value = ob_sm_id;
- vals[i+3].length = strlen(ob_sm_id) + 1;
+ 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);
- SmProp *list = ∝
SmcSetProperties(sm_conn, 1, &list);
g_free(prop.name);
g_free(prop.type);
g_free(vals);
}
+static ObSMSaveData *sm_save_get_data()
+{
+ ObSMSaveData *savedata = g_new0(ObSMSaveData, 1);
+ 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);
- success = session_save_to_file();
+ if (savedata == NULL)
+ savedata = sm_save_get_data();
+ success = session_save_to_file(savedata);
+ g_free(savedata);
/* tell the session manager how to restore this state */
if (success) session_setup_restart_command();
static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
Bool shutdown, gint interact_style, Bool fast)
{
+ ObSMSaveData *savedata = NULL;
+ gchar *vendor;
+
ob_debug_type(OB_DEBUG_SM, "Session save requested\n");
- if (!SmcRequestSaveYourselfPhase2(conn, sm_save_yourself_2, data)) {
+
+ 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);
}
}
ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled\n");
}
-static gboolean session_save_to_file()
+static gboolean session_save_to_file(const ObSMSaveData *savedata)
{
FILE *f;
GList *it;
fprintf(f, "<?xml version=\"1.0\"?>\n\n");
fprintf(f, "<openbox_session>\n\n");
- fprintf(f, "<desktop>%d</desktop>\n", screen_desktop);
+ fprintf(f, "<desktop>%d</desktop>\n", savedata->desktop);
/* they are ordered top to bottom in stacking order */
for (it = stacking_list; it; it = g_list_next(it)) {
continue;
if (!c->sm_client_id) {
- ob_debug_type(OB_DEBUG_SM, "Client %s does not have a client "
- "id set, so we can't save its state\n",
+ ob_debug_type(OB_DEBUG_SM, "Client %s does not have a "
+ "session id set\n",
c->title);
- continue;
+ 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",
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<x>%d</x>\n", prex);
fprintf(f, "\t<y>%d</y>\n", prey);
fprintf(f, "\t<max_vert />\n");
if (c->undecorated)
fprintf(f, "\t<undecorated />\n");
- if (client_focused(c))
+ if (savedata->focus_client == c)
fprintf(f, "\t<focused />\n");
fprintf(f, "</window>\n\n");
}
{
if (state) {
g_free(state->id);
+ g_free(state->command);
g_free(state->name);
g_free(state->class);
g_free(state->role);
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: %s \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);
- 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, " state type: %s \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 void session_load_file(gchar *path)
+static void session_load_file(const gchar *path)
{
xmlDocPtr doc;
xmlNodePtr node, n;
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("windowtype", node->children)))
+ goto session_load_bail;
+ state->type = parse_int(doc, n);
if (!(n = parse_find_node("desktop", node->children)))
goto session_load_bail;
state->desktop = parse_int(doc, n);