save and restore the desktop number/layout/names in the session.

[chaz/openbox] / openbox / session.c

diff --git a/openbox/session.c b/openbox/session.c
index 5a084ab60ae62d0dfaecb46a29a9949b6c21edfb..5918aa1312778f08f319e8e86295f7a34c097c71 100644 (file)
--- 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"
 
@@ -363,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;
@@ -449,6 +456,28 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
 
         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)) {
             gint prex, prey, prew, preh;
@@ -515,6 +544,8 @@ static gboolean session_save_to_file(const ObSMSaveData *savedata)
             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);
@@ -578,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)");
 
@@ -592,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;
 }
@@ -614,7 +653,7 @@ 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))
@@ -623,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))
     {
@@ -642,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);