woot sexy

[chaz/openbox] / openbox / session.c

diff --git a/openbox/session.c b/openbox/session.c
index 0eb5c63a20c31f634cb54f21f514c345a2523ec8..9b94065edbc4c66569a8d53de5a87f4f38654b50 100644 (file)
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -112,13 +112,13 @@ static void save_commands()
     g_free(prop_cmd.vals);
 }
 
-static void remove_two_args(int *argc, char ***argv, int index)
+static void remove_args(int *argc, char ***argv, int index, int num)
 {
     int i;
 
-    for (i = index; i < index + 2; ++i)
-        (*argv)[i] = (*argv)[i+2];
-    *argc -= 2;
+    for (i = index; i < index + num; ++i)
+        (*argv)[i] = (*argv)[i+num];
+    *argc -= num;
 }
 
 static void parse_args(int *argc, char ***argv)
@@ -131,7 +131,7 @@ static void parse_args(int *argc, char ***argv)
                 g_printerr(_("--sm-client-id requires an argument\n"));
             else {
                 sm_id = g_strdup((*argv)[i+1]);
-                remove_two_args(argc, argv, i);
+                remove_args(argc, argv, i, 2);
                 ++i;
             }
         } else if (!strcmp((*argv)[i], "--sm-save-file")) {
@@ -139,11 +139,12 @@ static void parse_args(int *argc, char ***argv)
                 g_printerr(_("--sm-save-file requires an argument\n"));
             else {
                 save_file = g_strdup((*argv)[i+1]);
-                remove_two_args(argc, argv, i);
+                remove_args(argc, argv, i, 2);
                 ++i;
             }
         } else if (!strcmp((*argv)[i], "--sm-disable")) {
             sm_disable = TRUE;
+            remove_args(argc, argv, i, 1);
         }
     }
 }
@@ -337,8 +338,6 @@ static gboolean session_save()
         fprintf(f, "<openbox_session id=\"%s\">\n\n", sm_id);
 
         for (it = stacking_list; it; it = g_list_next(it)) {
-            guint num;
-            gint32 *dimensions;
             gint prex, prey, prew, preh;
             ObClient *c;
             gchar *t;
@@ -358,15 +357,19 @@ static gboolean session_save()
             prey = c->area.y;
             prew = c->area.width;
             preh = c->area.height;
-            if (PROP_GETA32(c->window, openbox_premax, cardinal,
-                            (guint32**)&dimensions, &num)) {
-                if (num == 4) {
-                    prex = dimensions[0];
-                    prey = dimensions[1];
-                    prew = dimensions[2];
-                    preh = dimensions[3];
-                }
-                g_free(dimensions);
+            if (c->fullscreen) {
+                prex = c->pre_fullscreen_area.x;
+                prey = c->pre_fullscreen_area.x;
+                prew = c->pre_fullscreen_area.width;
+                preh = c->pre_fullscreen_area.height;
+            }
+            if (c->max_horz) {
+                prex = c->pre_max_area.x;
+                prew = c->pre_max_area.width;
+            }
+            if (c->max_vert) {
+                prey = c->pre_max_area.y;
+                preh = c->pre_max_area.height;
             }
 
             fprintf(f, "<window id=\"%s\">\n", c->sm_client_id);