X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=d1a3f99bf3f0237d4d7c5f1306f1c9dabcc59df3;hb=b89cc5859068fd5543dc9e7da3f469fb0c0a7a1c;hp=3cf8fbe246171f6eb720722f599202150db8489d;hpb=9676757a08b3e2e508c47f7795326bda8e54dc53;p=chaz%2Fopenbox
diff --git a/openbox/session.c b/openbox/session.c
index 3cf8fbe2..d1a3f99b 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -401,14 +401,28 @@ static void sm_save_yourself_2(SmcConn conn, SmPointer data)
SmcSaveYourselfDone(conn, success);
}
-
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");
+#ifdef DEBUG
+ {
+ const gchar *sname =
+ (save_type == SmSaveLocal ? "SmSaveLocal" :
+ (save_type == SmSaveGlobal ? "SmSaveGlobal" :
+ (save_type == SmSaveBoth ? "SmSaveBoth" : "INVALID!!")));
+ ob_debug_type(OB_DEBUG_SM, "Session save requested, type %s", sname);
+ }
+#endif
+
+ if (save_type == SmSaveGlobal) {
+ /* we have no data to save. we only store state to get back to where
+ we were, we don't keep open writable files or anything */
+ SmcSaveYourselfDone(conn, TRUE);
+ return;
+ }
vendor = SmcVendor(sm_conn);
ob_debug_type(OB_DEBUG_SM, "Session manager's vendor: %s", vendor);
@@ -476,10 +490,14 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
if (screen_desktop_names) {
gint i;
+ gchar *t;
fprintf(f, "\n");
- for (i = 0; screen_desktop_names[i]; ++i)
- fprintf(f, " %s\n", screen_desktop_names[i]);
+ for (i = 0; screen_desktop_names[i]; ++i){
+ t = g_markup_escape_text(screen_desktop_names[i], -1);
+ fprintf(f, " %s\n", t);
+ g_free(t);
+ }
fprintf(f, "\n");
}
@@ -534,8 +552,11 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
if (c->sm_client_id)
fprintf(f, "\n", c->sm_client_id);
- else
- fprintf(f, "\n", c->wm_command);
+ else {
+ t = g_markup_escape_text(c->wm_command, -1);
+ fprintf(f, "\n", t);
+ g_free(t);
+ }
t = g_markup_escape_text(c->name, -1);
fprintf(f, "\t%s\n", t);
@@ -664,6 +685,7 @@ static void session_load_file(const gchar *path)
i = obt_parse_instance_new();
if (!obt_parse_load_file(i, path, "openbox_session")) {
+ ob_debug_type(OB_DEBUG_SM, "ERROR: session file is missing root node");
obt_parse_instance_unref(i);
return;
}
@@ -697,6 +719,7 @@ static void session_load_file(const gchar *path)
}
}
+ ob_debug_type(OB_DEBUG_SM, "loading windows");
for (node = obt_parse_find_node(node->children, "window"); node != NULL;
node = obt_parse_find_node(node->next, "window"))
{
@@ -761,9 +784,11 @@ static void session_load_file(const gchar *path)
/* 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);
+ ob_debug_type(OB_DEBUG_SM, "loaded %s", state->name);
continue;
session_load_bail:
+ ob_debug_type(OB_DEBUG_SM, "loading FAILED");
session_state_free(state);
}
@@ -798,6 +823,7 @@ static void session_load_file(const gchar *path)
!strcmp(s1->class, s2->class) &&
!strcmp(s1->role, s2->role))
{
+ ob_debug_type(OB_DEBUG_SM, "removing duplicate %s", s2->name);
session_state_free(s2);
session_saved_state =
g_list_delete_link(session_saved_state, jt);
@@ -806,6 +832,7 @@ static void session_load_file(const gchar *path)
}
if (founddup) {
+ ob_debug_type(OB_DEBUG_SM, "removing duplicate %s", s1->name);
session_state_free(s1);
session_saved_state = g_list_delete_link(session_saved_state, it);
}
@@ -818,7 +845,7 @@ void session_request_logout(gboolean silent)
{
if (sm_conn) {
SmcRequestSaveYourself(sm_conn,
- SmSaveBoth,
+ SmSaveGlobal,
TRUE, /* logout */
(silent ?
SmInteractStyleNone : SmInteractStyleAny),