new method for loading menu files etc

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 9949dea3a68fb337ad79a025e75b5985450d45ed..283294296b444c2c4a7394a407c97b5b40710f06 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -190,6 +190,7 @@ void focus_fallback(ObFocusFallbackType type)
             }
         }
 
+#if 0
         /* try for group relations */
         if (old->group) {
             GSList *sit;
@@ -204,6 +205,7 @@ void focus_fallback(ObFocusFallbackType type)
                                 return;
                             }
         }
+#endif
     }
 
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
@@ -278,7 +280,7 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
         goto done_cycle;
     } else if (done) {
         if (focus_cycle_target)
-            client_activate(focus_cycle_target);
+            client_activate(focus_cycle_target, FALSE);
         goto done_cycle;
     }
 
@@ -309,6 +311,7 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
            desktop */
         if (ft->transients == NULL && client_normal(ft) &&
             ((ft->can_focus || ft->focus_notify) &&
+             !ft->skip_taskbar &&
              (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))) {
             if (ft != focus_cycle_target) { /* prevents flicker */
                 if (focus_cycle_target)