X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=1a81b90dbe81ad3546c79f987a379a167866db75;hb=HEAD;hp=f44d3b4c949e8c8c74c9b5eee762fb8d5f971a84;hpb=73671503fa34581bbe52e3d8cf38014bd29dd2c6;p=chaz%2Fopenbox

diff --git a/openbox/session.c b/openbox/session.c
index f44d3b4c..1a81b90d 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    session.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   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
@@ -18,28 +18,32 @@
 
 /* This session code is largely inspired by metacity code. */
 
-#ifndef USE_SM
-
 #include "session.h"
-#include "client.h"
 
-GList *session_saved_state;
+struct _ObClient;
 
-void session_startup(gint argc, gchar **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) {}
+gboolean session_connected(void) { return FALSE; }
 #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 "obt/xml.h"
+#include "obt/paths.h"
 
 #include <time.h>
 #include <errno.h>
@@ -52,18 +56,30 @@ void session_state_free(ObSessionState *state) {}
 
 #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;
+
+/* Data saved from the first level save yourself */
+typedef struct {
+    ObClient *focus_client;
+    gint      desktop;
+} ObSMSaveData;
 
-static gboolean    sm_disable;
-static SmcConn     sm_conn;
-static gchar      *save_file;
-static gchar      *sm_id;
-static gint        sm_argc;
-static gchar     **sm_argv;
-static gchar      *sm_sessions_path;
+static gboolean session_connect();
 
-static void session_load(gchar *path);
-static gboolean session_save();
+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);
@@ -71,262 +87,427 @@ 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;
+    ObtPaths *p;
 
-    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;
+
+    sm_argc = argc;
+    sm_argv = argv;
+
+    p = obt_paths_new();
+    dir = g_build_filename(obt_paths_cache_home(p),
+                           "openbox", "sessions", NULL);
+    obt_paths_unref(p), p = NULL;
 
-    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]);
+    if (!obt_paths_mkdir_path(dir, 0700)) {
+        g_message(_("Unable to make directory \"%s\": %s"),
+                  dir, g_strerror(errno));
     }
 
-    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",
+                          ob_sm_save_file);
+            session_load_file(ob_sm_save_file);
+        }
+    } else {
+        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_args(gint *argc, gchar ***argv, gint index, gint num)
+void session_shutdown(gboolean permanent)
 {
-    gint i;
+    if (!ob_sm_use) return;
 
-    for (i = index; i < index + num; ++i)
-        (*argv)[i] = (*argv)[i+num];
-    *argc -= num;
-}
+    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(gint *argc, gchar ***argv)
-{
-    gint i;
+        SmcCloseConnection(sm_conn, 0, NULL);
 
-    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_args(argc, argv, i, 2);
-                ++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_args(argc, argv, i, 2);
-                ++i;
-            }
-        } else if (!strcmp((*argv)[i], "--sm-disable")) {
-            sm_disable = TRUE;
-            remove_args(argc, argv, i, 1);
+        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(gint argc, gchar **argv)
+gboolean session_connected(void)
 {
-#define SM_ERR_LEN 1024
+    return !!sm_conn;
+}
 
+/*! Connect to the session manager and set up our callback functions */
+static gboolean session_connect(void)
+{
     SmcCallbacks cb;
+    gchar *oldid;
     gchar sm_err[SM_ERR_LEN];
-    gint i;
-
-    sm_argc = argc;
-    sm_argv = g_new(gchar*, argc);
-    for (i = 0; i < argc; ++i)
-        sm_argv[i] = argv[i];
-
-    parse_args(&sm_argc, &sm_argv);
-
-    if (sm_disable) {
-        g_free(sm_argv);
-        return;
-    }
-
-    sm_sessions_path = g_build_filename(parse_xdg_data_home_path(),
-                                        "openbox", "sessions", NULL);
-    if (!parse_mkdir_path(sm_sessions_path, 0700))
-        g_warning(_("Unable to make directory '%s': %s"),
-                  sm_sessions_path, g_strerror(errno));
-
-    if (save_file)
-        session_load(save_file);
-    else {
-        gchar *filename;
-
-        /* this algo is from metacity */
-        filename = g_strdup_printf("%d-%d-%u.obs",
-                                   (gint) time(NULL),
-                                   (gint) getpid(),
-                                   g_random_int());
-        save_file = g_build_filename(sm_sessions_path, filename, NULL);
-        g_free(filename);
-    }
 
+    /* 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",
+                  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", ob_sm_id);
     if (sm_conn == NULL)
-        ob_debug("Failed to connect to session manager: %s\n", 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;
-
-        g_snprintf(pid, sizeof(pid), "%ld", (glong) 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", sm_err);
+    return sm_conn != NULL;
 }
 
-void session_shutdown()
+static void session_setup_program(void)
 {
-    if (sm_disable)
-        return;
+    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 = &prop;
+    ob_debug_type(OB_DEBUG_SM, "Setting program: %s", sm_argv[0]);
+    SmcSetProperties(sm_conn, 1, &list);
+    g_free(prop.name);
+    g_free(prop.type);
+}
 
-    g_free(sm_sessions_path);
-    g_free(save_file);
-    g_free(sm_id);
-    g_free(sm_argv);
+static void session_setup_user(void)
+{
+    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 = &prop;
+    ob_debug_type(OB_DEBUG_SM, "Setting user: %s", user);
+    SmcSetProperties(sm_conn, 1, &list);
+    g_free(prop.name);
+    g_free(prop.type);
+    g_free(user);
+}
 
-    if (sm_conn) {
-        SmcCloseConnection(sm_conn, 0, NULL);
+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 = &prop;
+    ob_debug_type(OB_DEBUG_SM, "Setting restart: %d", restart);
+    SmcSetProperties(sm_conn, 1, &list);
+    g_free(prop.name);
+    g_free(prop.type);
+}
 
-        while (session_saved_state) {
-            session_state_free(session_saved_state->data);
-            session_saved_state = g_list_delete_link(session_saved_state,
-                                                     session_saved_state);
-        }
+static void session_setup_pid(void)
+{
+    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 = &prop;
+    ob_debug_type(OB_DEBUG_SM, "Setting pid: %s", pid);
+    SmcSetProperties(sm_conn, 1, &list);
+    g_free(prop.name);
+    g_free(prop.type);
+    g_free(pid);
+}
+
+/*! This is a gnome-session-manager extension */
+static void session_setup_priority(void)
+{
+    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 = &prop;
+    ob_debug_type(OB_DEBUG_SM, "Setting priority: %d", priority);
+    SmcSetProperties(sm_conn, 1, &list);
+    g_free(prop.name);
+    g_free(prop.type);
+}
+
+static void session_setup_clone_command(void)
+{
+    gint i;
+
+    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 = &prop;
+
+    ob_debug_type(OB_DEBUG_SM, "Setting clone command: (%d)", 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", vals[i].value);
+    }
+
+    SmcSetProperties(sm_conn, 1, &list);
+    g_free(prop.name);
+    g_free(prop.type);
+    g_free(vals);
+}
+
+static void session_setup_restart_command(void)
+{
+    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 = &prop;
+
+    ob_debug_type(OB_DEBUG_SM, "Setting restart command: (%d)", 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", 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", vals[i].value);
+    ob_debug_type(OB_DEBUG_SM, "    %s", 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", vals[i+2].value);
+    ob_debug_type(OB_DEBUG_SM, "    %s", 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(void)
+{
+    ObSMSaveData *savedata = g_slice_new0(ObSMSaveData);
+    /* 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_phase2(SmcConn conn, SmPointer data)
+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");
+    ob_debug_type(OB_DEBUG_SM,
+                  "  Saving session to file '%s'", ob_sm_save_file);
+    if (savedata == NULL)
+        savedata = sm_save_get_data();
+    success = session_save_to_file(savedata);
+    g_slice_free(ObSMSaveData, 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)", success);
     SmcSaveYourselfDone(conn, success);
 }
 
 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;
+
+#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);
+
+    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");
+        g_slice_free(ObSMSaveData, savedata);
         SmcSaveYourselfDone(conn, FALSE);
     }
 }
 
 static void sm_die(SmcConn conn, SmPointer data)
 {
+    ob_debug_type(OB_DEBUG_SM, "Die requested");
     ob_exit(0);
 }
 
 static void sm_save_complete(SmcConn conn, SmPointer data)
 {
+    ob_debug_type(OB_DEBUG_SM, "Save complete");
 }
 
 static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
 {
+    ob_debug_type(OB_DEBUG_SM, "Shutdown cancelled");
 }
 
-static gboolean session_save()
+static gboolean session_save_to_file(const ObSMSaveData *savedata)
 {
     FILE *f;
     GList *it;
     gboolean success = TRUE;
 
-    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, g_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;
+            gchar *t;
+
+            fprintf(f, "<desktopnames>\n");
+            for (i = 0; screen_desktop_names[i]; ++i){
+                t = g_markup_escape_text(screen_desktop_names[i], -1);
+                fprintf(f, "  <name>%s</name>\n", t);
+                g_free(t);
+            }
+            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;
             ObClient *c;
@@ -340,8 +521,21 @@ static gboolean session_save()
             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",
+                              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",
+                                  c->title);
+                    continue;
+                }
+            }
+
+            ob_debug_type(OB_DEBUG_SM, "Saving state for client %s",
+                          c->title);
 
             prex = c->area.x;
             prey = c->area.y;
@@ -362,7 +556,13 @@ static gboolean session_save()
                 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 {
+                t = g_markup_escape_text(c->wm_command, -1);
+                fprintf(f, "<window command=\"%s\">\n", t);
+                g_free(t);
+            }
 
             t = g_markup_escape_text(c->name, -1);
             fprintf(f, "\t<name>%s</name>\n", t);
@@ -376,12 +576,14 @@ static gboolean session_save()
             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<height>%d</height>\n", preh);
+            fprintf(f, "\t<opacity>%d</opacity>\n", c->opacity);
             if (c->shaded)
                 fprintf(f, "\t<shaded />\n");
             if (c->iconic)
@@ -400,17 +602,19 @@ static gboolean session_save()
                 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, g_strerror(errno));
+            g_message(_("Error while saving the session to \"%s\": %s"),
+                      ob_sm_save_file, g_strerror(errno));
         }
         fclose(f);
     }
@@ -418,25 +622,51 @@ static gboolean session_save()
     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);
 
-        g_free(state);
+        g_slice_free(ObSessionState, state);
     }
 }
 
-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: ");
+    ob_debug_type(OB_DEBUG_SM, "  client id: %s ", c->sm_client_id);
+    ob_debug_type(OB_DEBUG_SM, "  client name: %s ", c->name);
+    ob_debug_type(OB_DEBUG_SM, "  client class: %s ", c->class);
+    ob_debug_type(OB_DEBUG_SM, "  client role: %s ", c->role);
+    ob_debug_type(OB_DEBUG_SM, "  client type: %d ", c->type);
+    ob_debug_type(OB_DEBUG_SM, "  client command: %s ",
+                  c->wm_command ? c->wm_command : "(null)");
+    ob_debug_type(OB_DEBUG_SM, "  state id: %s ", s->id);
+    ob_debug_type(OB_DEBUG_SM, "  state name: %s ", s->name);
+    ob_debug_type(OB_DEBUG_SM, "  state class: %s ", s->class);
+    ob_debug_type(OB_DEBUG_SM, "  state role: %s ", s->role);
+    ob_debug_type(OB_DEBUG_SM, "  state type: %d ", s->type);
+    ob_debug_type(OB_DEBUG_SM, "  state command: %s ",
+                  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)
@@ -453,97 +683,188 @@ GList* session_state_find(ObClient *c)
     return it;
 }
 
-static gint stack_sort(const ObSessionState *s1, const ObSessionState *s2)
+static void session_load_file(const gchar *path)
 {
-    return s1->stacking - s2->stacking;
-}
+    ObtXmlInst *i;
+    xmlNodePtr node, n, m;
+    GList *it, *inext;
 
-static void session_load(gchar *path)
-{
-    xmlDocPtr doc;
-    xmlNodePtr node, n;
-    gchar *id;
+    i = obt_xml_instance_new();
 
-    if (!parse_load(path, "openbox_session", &doc, &node))
+    if (!obt_xml_load_file(i, path, "openbox_session")) {
+        ob_debug_type(OB_DEBUG_SM, "ERROR: session file is missing root node");
+        obt_xml_instance_unref(i);
         return;
+    }
+    node = obt_xml_root(i);
+
+    if ((n = obt_xml_find_node(node->children, "desktop")))
+        session_desktop = obt_xml_node_int(n);
+
+    if ((n = obt_xml_find_node(node->children, "numdesktops")))
+        session_num_desktops = obt_xml_node_int(n);
+
+    if ((n = obt_xml_find_node(node->children, "desktoplayout"))) {
+        /* make sure they are all there for it to be valid */
+        if ((m = obt_xml_find_node(n->children, "orientation")))
+            session_desktop_layout.orientation = obt_xml_node_int(m);
+        if (m && (m = obt_xml_find_node(n->children, "startcorner")))
+            session_desktop_layout.start_corner = obt_xml_node_int(m);
+        if (m && (m = obt_xml_find_node(n->children, "columns")))
+            session_desktop_layout.columns = obt_xml_node_int(m);
+        if (m && (m = obt_xml_find_node(n->children, "rows")))
+            session_desktop_layout.rows = obt_xml_node_int(m);
+        session_desktop_layout_present = m != NULL;
+    }
 
-    if (!parse_attr_string("id", node, &id))
-        return;
-    g_free(sm_id);
-    sm_id = id;
+    if ((n = obt_xml_find_node(node->children, "desktopnames"))) {
+        for (m = obt_xml_find_node(n->children, "name"); m;
+             m = obt_xml_find_node(m->next, "name"))
+        {
+            session_desktop_names = g_slist_append(session_desktop_names,
+                                                   obt_xml_node_string(m));
+        }
+    }
 
-    node = parse_find_node("window", node->children);
-    while (node) {
+    ob_debug_type(OB_DEBUG_SM, "loading windows");
+    for (node = obt_xml_find_node(node->children, "window"); node != NULL;
+         node = obt_xml_find_node(node->next, "window"))
+    {
         ObSessionState *state;
 
-        state = g_new0(ObSessionState, 1);
+        state = g_slice_new0(ObSessionState);
 
-        if (!parse_attr_string("id", node, &state->id))
+        if (!obt_xml_attr_string(node, "id", &state->id))
+            if (!obt_xml_attr_string(node, "command", &state->command))
             goto session_load_bail;
-        if (!(n = parse_find_node("name", node->children)))
+        if (!(n = obt_xml_find_node(node->children, "name")))
             goto session_load_bail;
-        state->name = parse_string(doc, n);
-        if (!(n = parse_find_node("class", node->children)))
+        state->name = obt_xml_node_string(n);
+        if (!(n = obt_xml_find_node(node->children, "class")))
             goto session_load_bail;
-        state->class = parse_string(doc, n);
-        if (!(n = parse_find_node("role", node->children)))
+        state->class = obt_xml_node_string(n);
+        if (!(n = obt_xml_find_node(node->children, "role")))
             goto session_load_bail;
-        state->role = parse_string(doc, n);
-        if (!(n = parse_find_node("stacking", node->children)))
+        state->role = obt_xml_node_string(n);
+        if (!(n = obt_xml_find_node(node->children, "windowtype")))
             goto session_load_bail;
-        state->stacking = parse_int(doc, n);
-        if (!(n = parse_find_node("desktop", node->children)))
+        state->type = obt_xml_node_int(n);
+        if (!(n = obt_xml_find_node(node->children, "desktop")))
             goto session_load_bail;
-        state->desktop = parse_int(doc, n);
-        if (!(n = parse_find_node("x", node->children)))
+        state->desktop = obt_xml_node_int(n);
+        if (!(n = obt_xml_find_node(node->children, "x")))
             goto session_load_bail;
-        state->x = parse_int(doc, n);
-        if (!(n = parse_find_node("y", node->children)))
+        state->x = obt_xml_node_int(n);
+        if (!(n = obt_xml_find_node(node->children, "y")))
             goto session_load_bail;
-        state->y = parse_int(doc, n);
-        if (!(n = parse_find_node("width", node->children)))
+        state->y = obt_xml_node_int(n);
+        if (!(n = obt_xml_find_node(node->children, "width")))
             goto session_load_bail;
-        state->w = parse_int(doc, n);
-        if (!(n = parse_find_node("height", node->children)))
+        state->w = obt_xml_node_int(n);
+        if (!(n = obt_xml_find_node(node->children, "height")))
             goto session_load_bail;
-        state->h = parse_int(doc, n);
+        state->h = obt_xml_node_int(n);
+        if (!(n = obt_xml_find_node(node->children, "opacity")))
+            goto session_load_bail;
+        state->opacity = obt_xml_node_int(n);
 
         state->shaded =
-            parse_find_node("shaded", node->children) != NULL;
+            obt_xml_find_node(node->children, "shaded") != NULL;
         state->iconic =
-            parse_find_node("iconic", node->children) != NULL;
+            obt_xml_find_node(node->children, "iconic") != NULL;
         state->skip_pager =
-            parse_find_node("skip_pager", node->children) != NULL;
+            obt_xml_find_node(node->children, "skip_pager") != NULL;
         state->skip_taskbar =
-            parse_find_node("skip_taskbar", node->children) != NULL;
+            obt_xml_find_node(node->children, "skip_taskbar") != NULL;
         state->fullscreen =
-            parse_find_node("fullscreen", node->children) != NULL;
+            obt_xml_find_node(node->children, "fullscreen") != NULL;
         state->above =
-            parse_find_node("above", node->children) != NULL;
+            obt_xml_find_node(node->children, "above") != NULL;
         state->below =
-            parse_find_node("below", node->children) != NULL;
+            obt_xml_find_node(node->children, "below") != NULL;
         state->max_horz =
-            parse_find_node("max_horz", node->children) != NULL;
+            obt_xml_find_node(node->children, "max_horz") != 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;
+            obt_xml_find_node(node->children, "max_vert") != NULL;
+        state->undecorated =
+            obt_xml_find_node(node->children, "undecorated") != NULL;
+        state->focused =
+            obt_xml_find_node(node->children, "focused") != 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);
+        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);
+    }
+
+    /* 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;
 
-    session_load_ok:
+            jnext = g_list_next(jt);
 
-        node = parse_find_node("window", node->next);
+            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))
+            {
+                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);
+                founddup = TRUE;
+            }
+        }
+
+        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);
+        }
     }
 
-    /* sort them by their stacking order */
-    session_saved_state = g_list_sort(session_saved_state,
-                                      (GCompareFunc)stack_sort);
+    obt_xml_instance_unref(i);
+}
 
-    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