X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=5918aa1312778f08f319e8e86295f7a34c097c71;hb=809619497d73598a9f3c2bd2e4b8968297af6bfd;hp=bcf80ad0e8f72c7a60bd04ce30897f3468fa0d8f;hpb=de988813681ed46b480cc4e53dbe449773210ac4;p=chaz%2Fopenbox
diff --git a/openbox/session.c b/openbox/session.c
index bcf80ad0..5918aa13 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -24,6 +24,10 @@ struct _ObClient;
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) {}
@@ -36,7 +40,6 @@ GList* session_state_find(struct _ObClient *c) { return NULL; }
#include "client.h"
#include "prop.h"
#include "focus.h"
-#include "screen.h"
#include "gettext.h"
#include "parser/parse.h"
@@ -102,9 +105,11 @@ void session_startup(gint argc, gchar **argv)
}
if (ob_sm_save_file != NULL) {
- ob_debug_type(OB_DEBUG_SM, "Loading from session file %s\n",
- ob_sm_save_file);
- session_load_file(ob_sm_save_file);
+ 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 {
gchar *filename;
@@ -136,7 +141,8 @@ void session_shutdown(gboolean permanent)
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);
@@ -175,8 +181,9 @@ static gboolean session_connect()
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;
@@ -195,6 +202,7 @@ static void session_setup_program()
.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);
@@ -215,6 +223,7 @@ static void session_setup_user()
.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);
@@ -223,7 +232,7 @@ static void session_setup_user()
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,
@@ -236,6 +245,7 @@ static void session_setup_restart_style(gboolean restart)
.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);
@@ -256,6 +266,7 @@ static void session_setup_pid()
.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);
@@ -278,6 +289,7 @@ static void session_setup_priority()
.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);
@@ -294,13 +306,15 @@ static void session_setup_clone_command()
.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);
@@ -318,23 +332,29 @@ static void session_setup_restart_command()
.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);
@@ -346,6 +366,10 @@ static void session_setup_restart_command()
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;
@@ -394,6 +418,7 @@ static void sm_save_yourself(SmcConn conn, SmPointer data, gint save_type,
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);
}
}
@@ -431,6 +456,28 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
fprintf(f, "%d\n", savedata->desktop);
+ fprintf(f, "%d\n", screen_num_desktops);
+
+ fprintf(f, "\n");
+ fprintf(f, " %d\n",
+ screen_desktop_layout.orientation);
+ fprintf(f, " %d\n",
+ screen_desktop_layout.start_corner);
+ fprintf(f, " %d\n",
+ screen_desktop_layout.columns);
+ fprintf(f, " %d\n",
+ screen_desktop_layout.rows);
+ fprintf(f, "\n");
+
+ if (screen_desktop_names) {
+ gint i;
+
+ fprintf(f, "\n");
+ for (i = 0; screen_desktop_names[i]; ++i)
+ fprintf(f, " %s\n", screen_desktop_names[i]);
+ fprintf(f, "\n");
+ }
+
/* they are ordered top to bottom in stacking order */
for (it = stacking_list; it; it = g_list_next(it)) {
gint prex, prey, prew, preh;
@@ -497,6 +544,8 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
fprintf(f, "\t%s\n", t);
g_free(t);
+ fprintf(f, "\t%d\n", c->type);
+
fprintf(f, "\t%d\n", c->desktop);
fprintf(f, "\t%d\n", prex);
fprintf(f, "\t%d\n", prey);
@@ -560,12 +609,14 @@ static gboolean session_state_cmp(ObSessionState *s, ObClient *c)
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)");
@@ -574,7 +625,13 @@ static gboolean session_state_cmp(ObSessionState *s, ObClient *c)
{
return (!strcmp(s->name, c->name) &&
!strcmp(s->class, c->class) &&
- !strcmp(s->role, c->role));
+ !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;
}
@@ -596,7 +653,8 @@ GList* session_state_find(ObClient *c)
static void session_load_file(const gchar *path)
{
xmlDocPtr doc;
- xmlNodePtr node, n;
+ xmlNodePtr node, n, m;
+ GList *it, *inext;
if (!parse_load(path, "openbox_session", &doc, &node))
return;
@@ -604,6 +662,31 @@ static void session_load_file(const gchar *path)
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;
+ }
+
+ 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))
{
@@ -623,6 +706,9 @@ static void session_load_file(const gchar *path)
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);
@@ -671,6 +757,50 @@ static void session_load_file(const gchar *path)
session_state_free(state);
}
+ /* 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.
+
+ 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);
+
+ 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);
}