remove focusLast and focusLastOnDesktop

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index b1b1a561c1da8678044757f4fe9529dc883f1a49..e5640256689949044a8c9f7b02dfda77b5043746 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -350,6 +350,8 @@ void screen_set_num_desktops(guint num)
 
     g_assert(num > 0);
 
+    if (screen_num_desktops == num) return;
+
     old = screen_num_desktops;
     screen_num_desktops = num;
     PROP_SET32(RootWindow(ob_display, ob_screen),
@@ -396,7 +398,6 @@ void screen_set_desktop(guint num)
 {
     GList *it;
     guint old;
-    XEvent e;
      
     g_assert(num < screen_num_desktops);
 
@@ -433,18 +434,6 @@ void screen_set_desktop(guint num)
                 frame_hide(c->frame);
         }
     }
-
-    XSync(ob_display, FALSE);
-    /* focus the last focused window on the desktop, and ignore enter events
-       from the switch so it doesnt mess with the focus */
-    while (XCheckTypedEvent(ob_display, EnterNotify, &e));
-#ifdef DEBUG_FOCUS
-    ob_debug("switch fallback\n");
-#endif
-    focus_fallback(OB_FOCUS_FALLBACK_DESKTOP);
-#ifdef DEBUG_FOCUS
-    ob_debug("/switch fallback\n");
-#endif
 }
 
 static void get_row_col(guint d, guint *r, guint *c)