make better?

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 5c0f255f422e784c69ac686420b5b0b22d75838e..a051d25039d2753dcb5b391eba6a10689490d014 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -244,7 +244,7 @@ void screen_set_num_desktops(guint num)
     for (it = client_list; it != NULL; it = it->next) {
         Client *c = it->data;
         if (c->desktop >= num)
-            client_set_desktop(num - 1);
+            client_set_desktop(c, num - 1);
     }
 
     dispatch_ob(Event_Ob_NumDesktops, num, old);
@@ -258,17 +258,18 @@ void screen_set_desktop(guint num)
 {
     GList *it;
     guint old;
+    XEvent e;
      
     g_assert(num < screen_num_desktops);
 
-    g_message("Moving to desktop %u", num);
-  
     old = screen_desktop;
     screen_desktop = num;
     PROP_SET32(ob_root, net_current_desktop, cardinal, num);
 
     if (old == num) return;
 
+    g_message("Moving to desktop %d", num+1);
+
     /* show windows before hiding the rest to lessen the enter/leave events */
 
     /* show windows from top to bottom */
@@ -285,6 +286,12 @@ void screen_set_desktop(guint num)
             engine_frame_hide(c->frame);
     }
 
+    /* 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(TRUE);
+
     dispatch_ob(Event_Ob_Desktop, num, old);
 }