restore the desktop and focused window on restarts if possible

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 174f64526b1708406090ac47e4353a514cc9e79a..03cee447e7456c40093da8f37ac4faf6fe6ebe5d 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1,5 +1,6 @@
 #include "openbox.h"
 #include "prop.h"
+#include "startup.h"
 #include "config.h"
 #include "screen.h"
 #include "client.h"
@@ -25,7 +26,7 @@ guint    screen_desktop         = 0;
 Size     screen_physical_size;
 gboolean screen_showing_desktop;
 DesktopLayout screen_desktop_layout;
-char   **screen_desktop_names;
+char   **screen_desktop_names = NULL;
 
 static Rect  *area = NULL;
 static Strut *strut = NULL;
@@ -48,7 +49,7 @@ gboolean screen_annex()
     XErrorHandler old;
     pid_t pid;
     int i, num_support;
-    Atom *supported;
+    guint32 *supported;
 
     running = FALSE;
     old = XSetErrorHandler(another_running);
@@ -61,7 +62,7 @@ gboolean screen_annex()
     g_message("Managing screen %d", ob_screen);
 
     /* set the mouse cursor for the root window (the default cursor) */
-    XDefineCursor(ob_display, ob_root, ob_cursors.left_ptr);
+    XDefineCursor(ob_display, ob_root, ob_cursors.ptr);
 
     /* set the OPENBOX_PID hint */
     pid = getpid();
@@ -78,9 +79,9 @@ gboolean screen_annex()
     PROP_SET32(support_window, net_supporting_wm_check, window,support_window);
 
     /* set the _NET_SUPPORTED_ATOMS hint */
-    num_support = 48;
+    num_support = 61;
     i = 0;
-    supported = g_new(Atom, num_support);
+    supported = g_new(guint32, num_support);
     supported[i++] = prop_atoms.net_current_desktop;
     supported[i++] = prop_atoms.net_number_of_desktops;
     supported[i++] = prop_atoms.net_desktop_geometry;
@@ -129,14 +130,21 @@ gboolean screen_annex()
     supported[i++] = prop_atoms.net_wm_state_fullscreen;
     supported[i++] = prop_atoms.net_wm_state_above;
     supported[i++] = prop_atoms.net_wm_state_below;
+    supported[i++] = prop_atoms.net_moveresize_window;
+    supported[i++] = prop_atoms.net_wm_moveresize;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_topleft;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_top;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_topright;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_right;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_bottomright;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_bottom;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_bottomleft;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_left;
+    supported[i++] = prop_atoms.net_wm_moveresize_move;
+    supported[i++] = prop_atoms.net_wm_moveresize_size_keyboard;
+    supported[i++] = prop_atoms.net_wm_moveresize_move_keyboard;
     g_assert(i == num_support);
 /*
-  supported[] = prop_atoms.net_wm_moveresize;
-  supported[] = prop_atoms.net_wm_moveresize_size_topleft;
-  supported[] = prop_atoms.net_wm_moveresize_size_topright;
-  supported[] = prop_atoms.net_wm_moveresize_size_bottomleft;
-  supported[] = prop_atoms.net_wm_moveresize_size_bottomright;
-  supported[] = prop_atoms.net_wm_moveresize_move;
   supported[] = prop_atoms.net_wm_action_stick;
 */
 
@@ -159,14 +167,17 @@ void screen_startup()
                                  g_slist_length(config_desktops_names) + 1);
     for (i = 0, it = config_desktops_names; it; ++i, it = it->next)
         screen_desktop_names[i] = it->data; /* dont strdup */
+    screen_desktop_names[i] = NULL;
     PROP_SETSS(ob_root, net_desktop_names, screen_desktop_names);
     g_free(screen_desktop_names); /* dont free the individual strings */
     screen_desktop_names = NULL;
 
     screen_num_desktops = 0;
     screen_set_num_desktops(config_desktops_num);
-    screen_desktop = 0;
-    screen_set_desktop(0);
+    if (startup_desktop >= screen_num_desktops)
+        startup_desktop = 0;
+    screen_desktop = startup_desktop;
+    screen_set_desktop(startup_desktop);
 
     /* don't start in showing-desktop mode */
     screen_showing_desktop = FALSE;
@@ -294,7 +305,6 @@ void screen_set_desktop(guint num)
 
     /* focus the last focused window on the desktop, and ignore enter events
        from the switch so it doesnt mess with the focus */
-    XSync(ob_display, FALSE);
     while (XCheckTypedEvent(ob_display, EnterNotify, &e));
     focus_fallback(Fallback_Desktop);
 
@@ -312,7 +322,7 @@ void screen_update_layout()
     screen_desktop_layout.rows = 1;
     screen_desktop_layout.columns = screen_num_desktops;
 
-    if (PROP_GETA32(ob_root, net_desktop_layout, cardinal, data, &num)) {
+    if (PROP_GETA32(ob_root, net_desktop_layout, cardinal, &data, &num)) {
         if (num == 3 || num == 4) {
             if (data[0] == prop_atoms.net_wm_orientation_vert)
                 screen_desktop_layout.orientation = data[0];
@@ -377,13 +387,16 @@ void screen_update_desktop_names()
 
     /* empty the array */
     g_strfreev(screen_desktop_names);
+    screen_desktop_names = NULL;
 
-    PROP_GETSS(ob_root, net_desktop_names, utf8, &screen_desktop_names);
-
-    for (i = 0; screen_desktop_names[i] && i < screen_num_desktops; ++i);
-    if (i < screen_num_desktops) {
+    if (PROP_GETSS(ob_root, net_desktop_names, utf8, &screen_desktop_names))
+        for (i = 0; screen_desktop_names[i] && i <= screen_num_desktops; ++i);
+    else
+        i = 0;
+    if (i <= screen_num_desktops) {
         screen_desktop_names = g_renew(char*, screen_desktop_names,
                                        screen_num_desktops + 1);
+        screen_desktop_names[screen_num_desktops] = NULL;
         for (; i < screen_num_desktops; ++i)
             screen_desktop_names[i] = g_strdup("Unnamed Desktop");
     }
@@ -413,6 +426,16 @@ void screen_show_desktop(gboolean show)
        }
     }
 
+    if (show) {
+        /* focus desktop */
+        for (it = focus_order[screen_desktop]; it; it = it->next)
+            if (((Client*)it->data)->type == Type_Desktop &&
+                client_focus(it->data))
+                break;
+    } else {
+        focus_fallback(Fallback_NoFocus);
+    }
+
     show = !!show; /* make it boolean */
     PROP_SET32(ob_root, net_showing_desktop, cardinal, show);