X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=c941e8daf3270dcd1166dd9ce2c16d7876bf3dfc;hb=c2b3a49e692b723bd277ef4360f89b9aaae4afd6;hp=ffb9894f0b14b5355c53e8201d9bf47ff8caa6c7;hpb=db251b082845b3dd9181bc556a7a55f2113fb315;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index ffb9894f..c941e8da 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -61,7 +61,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,7 +78,7 @@ 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(guint32, num_support);
     supported[i++] = prop_atoms.net_current_desktop;
@@ -129,14 +129,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;
 */
 
@@ -295,7 +302,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);
 
@@ -417,6 +423,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);