move focus cycling into its own file

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 6140e5eba1124050d53eee2c6348fa9fc99025fb..e1607f4ec85392fd1e6496a41952e0bc19c81c69 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "framerender.h"
 #include "mainloop.h"
-#include "focus.h"
+#include "focus_cycle.h"
 #include "moveresize.h"
 #include "screen.h"
 #include "render/theme.h"
@@ -528,11 +528,9 @@ void frame_adjust_state(ObFrame *self)
 
 void frame_adjust_focus(ObFrame *self, gboolean hilite)
 {
-    if (self->focused != hilite) {
-        self->focused = hilite;
-        framerender_frame(self);
-        XFlush(ob_display);
-    }
+    self->focused = hilite;
+    framerender_frame(self);
+    XFlush(ob_display);
 }
 
 void frame_adjust_title(ObFrame *self)
@@ -1171,6 +1169,10 @@ void frame_end_iconify_animation(ObFrame *self)
 
     if (!self->visible)
         XUnmapWindow(ob_display, self->window);
+    else
+        /* Send a ConfigureNotify when the animation is done, this fixes
+           KDE's pager showing the window in the wrong place. */
+        client_reconfigure(self->client);
 
     /* we're not animating any more ! */
     self->iconify_animation_going = 0;