clarify comment

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 7a2d079e858c9c726df696751336b5c827842dd2..8950a31e1499e42a2e34d296e6207973c8f9f6a9 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,5 +1,6 @@
 #include "event.h"
 #include "openbox.h"
+#include "grab.h"
 #include "framerender.h"
 #include "client.h"
 #include "config.h"
@@ -40,8 +41,7 @@ void focus_startup()
                                 -100, -100, 1, 1, 0,
                                  CopyFromParent, InputOutput, CopyFromParent,
                                  CWOverrideRedirect, &attrib);
-    XMapWindow(ob_display, focus_backup);
-    stacking_raise_internal(focus_backup);
+    XMapRaised(ob_display, focus_backup);
 
     /* start with nothing focused */
     focus_set_client(NULL);
@@ -122,13 +122,17 @@ static gboolean focus_under_pointer()
 
     if (ob_pointer_pos(&x, &y)) {
         for (it = stacking_list; it != NULL; it = it->next) {
-            Client *c = it->data;
-            if (c->desktop == screen_desktop &&
-                RECT_CONTAINS(c->frame->area, x, y))
-                break;
+            if (WINDOW_IS_CLIENT(it->data)) {
+                Client *c = WINDOW_AS_CLIENT(it->data);
+                if (c->desktop == screen_desktop &&
+                    RECT_CONTAINS(c->frame->area, x, y))
+                    break;
+            }
         }
-        if (it != NULL)
+        if (it != NULL) {
+            g_assert(WINDOW_IS_CLIENT(it->data));
             return client_normal(it->data) && client_focus(it->data);
+        }
     }
     return FALSE;
 }
@@ -215,7 +219,8 @@ void focus_fallback(FallbackType type)
         if (type != Fallback_Unfocusing || it->data != old)
             if (client_normal(it->data) &&
                 /* dont fall back to 'anonymous' fullscreen windows. theres no
-                   checks for this is in transient/group fallbacks. */
+                   checks for this is in transient/group fallbacks, so they can
+                   be fallback targets there. */
                 !((Client*)it->data)->fullscreen &&
                 client_focus(it->data))
                 return;
@@ -261,21 +266,19 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
     Client *ft;
 
     if (cancel) {
-        /*if (first) client_focus(first); XXX*/
         if (focus_cycle_target)
             frame_adjust_focus(focus_cycle_target->frame, FALSE);
         if (focus_client)
             frame_adjust_focus(focus_client->frame, TRUE);
         goto done_cycle;
     } else if (done) {
-        if (focus_cycle_target) {
-            if (focus_cycle_target->iconic)
-                client_iconify(focus_cycle_target, FALSE, FALSE);
-            client_focus(focus_cycle_target);
-            stacking_raise(focus_cycle_target);
-        }
+        if (focus_cycle_target)
+            client_activate(focus_cycle_target);
         goto done_cycle;
     }
+    if (!first)
+        grab_pointer(TRUE, None);
+
     if (!first) first = focus_client;
     if (!focus_cycle_target) focus_cycle_target = focus_client;
 
@@ -317,7 +320,10 @@ done_cycle:
     focus_cycle_target = NULL;
     g_list_free(order);
     order = NULL;
+
     popup_cycle(ft, FALSE);
+    grab_pointer(FALSE, None);
+
     return NULL;
 }