make focus cycling work when not interactive

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 3927272c5b6cabad247bff0339c1bca1a147d99e..6e738d4a0642c3b5529816c0019e1f1226831ff3 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,3 +1,4 @@
+#include "debug.h"
 #include "event.h"
 #include "openbox.h"
 #include "grab.h"
@@ -8,7 +9,6 @@
 #include "screen.h"
 #include "group.h"
 #include "prop.h"
-#include "dispatch.h"
 #include "focus.h"
 #include "stacking.h"
 #include "popup.h"
@@ -17,18 +17,16 @@
 #include <glib.h>
 #include <assert.h>
 
-ObClient *focus_client = NULL;
-GList **focus_order = NULL; /* these lists are created when screen_startup
-                               sets the number of desktops */
+ObClient *focus_client;
+GList **focus_order; /* these lists are created when screen_startup
+                        sets the number of desktops */
 
-static ObClient *focus_cycle_target = NULL;
-static Popup *focus_cycle_popup = NULL;
+static ObClient *focus_cycle_target;
+static Popup *focus_cycle_popup;
 
 void focus_startup()
 {
 
-    focus_client = NULL;
-
     focus_cycle_popup = popup_new(TRUE);
 
     /* start with nothing focused */
@@ -42,10 +40,8 @@ void focus_shutdown()
     for (i = 0; i < screen_num_desktops; ++i)
         g_list_free(focus_order[i]);
     g_free(focus_order);
-    focus_order = NULL;
 
     popup_free(focus_cycle_popup);
-    focus_cycle_popup = NULL;
 
     /* reset focus to root */
     XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
@@ -68,7 +64,7 @@ void focus_set_client(ObClient *client)
     ObClient *old;
 
 #ifdef DEBUG_FOCUS
-    g_message("focus_set_client 0x%lx", client ? client->window : 0);
+    ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0);
 #endif
 
     /* uninstall the old colormap, and install the new one */
@@ -84,7 +80,7 @@ void focus_set_client(ObClient *client)
 
     /* in the middle of cycling..? kill it. */
     if (focus_cycle_target)
-        focus_cycle(TRUE, TRUE, TRUE, TRUE);
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
 
     old = focus_client;
     focus_client = client;
@@ -94,15 +90,11 @@ void focus_set_client(ObClient *client)
         push_to_top(client);
 
     /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */
-    if (ob_state != OB_STATE_EXITING) {
+    if (ob_state() != OB_STATE_EXITING) {
         active = client ? client->window : None;
-        PROP_SET32(ob_root, net_active_window, window, active);
+        PROP_SET32(RootWindow(ob_display, ob_screen),
+                   net_active_window, window, active);
     }
-
-    if (focus_client != NULL)
-        dispatch_client(Event_Client_Focus, focus_client, 0, 0);
-    if (old != NULL)
-        dispatch_client(Event_Client_Unfocus, old, 0, 0);
 }
 
 static gboolean focus_under_pointer()
@@ -110,7 +102,7 @@ static gboolean focus_under_pointer()
     int x, y;
     GList *it;
 
-    if (ob_pointer_pos(&x, &y)) {
+    if (screen_pointer_pos(&x, &y)) {
         for (it = stacking_list; it != NULL; it = it->next) {
             if (WINDOW_IS_CLIENT(it->data)) {
                 ObClient *c = WINDOW_AS_CLIENT(it->data);
@@ -192,6 +184,7 @@ void focus_fallback(ObFocusFallbackType type)
             }
         }
 
+#if 0
         /* try for group relations */
         if (old->group) {
             GSList *sit;
@@ -206,6 +199,7 @@ void focus_fallback(ObFocusFallbackType type)
                                 return;
                             }
         }
+#endif
     }
 
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
@@ -242,7 +236,7 @@ static void popup_cycle(ObClient *c, gboolean show)
 */
         /* XXX the size and the font extents need to be related on some level
          */
-        popup_size(focus_cycle_popup, 320, 48);
+        popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
 
         /* use the transient's parent's title/icon */
         while (p->transient_for && p->transient_for != OB_TRAN_GROUP)
@@ -263,8 +257,8 @@ static void popup_cycle(ObClient *c, gboolean show)
     }
 }
 
-ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                    gboolean cancel)
+void focus_cycle(gboolean forward, gboolean linear,
+                 gboolean dialog, gboolean done, gboolean cancel)
 {
     static ObClient *first = NULL;
     static ObClient *t = NULL;
@@ -277,14 +271,11 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
             frame_adjust_focus(focus_cycle_target->frame, FALSE);
         if (focus_client)
             frame_adjust_focus(focus_client->frame, TRUE);
+        focus_cycle_target = NULL;
         goto done_cycle;
-    } else if (done) {
-        if (focus_cycle_target)
-            client_activate(focus_cycle_target);
+    } else if (done && dialog) {
         goto done_cycle;
     }
-    if (!first)
-        grab_pointer(TRUE, None);
 
     if (!first) first = focus_client;
     if (!focus_cycle_target) focus_cycle_target = focus_client;
@@ -313,6 +304,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)
@@ -320,12 +312,15 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
                 focus_cycle_target = ft;
                 frame_adjust_focus(focus_cycle_target->frame, TRUE);
             }
-            popup_cycle(ft, config_focus_popup);
-            return ft;
+            popup_cycle(ft, dialog);
+            return;
         }
     } while (it != start);
 
 done_cycle:
+    if (done && focus_cycle_target)
+        client_activate(focus_cycle_target, FALSE);
+
     t = NULL;
     first = NULL;
     focus_cycle_target = NULL;
@@ -333,9 +328,52 @@ done_cycle:
     order = NULL;
 
     popup_cycle(ft, FALSE);
-    grab_pointer(FALSE, None);
 
-    return NULL;
+    return;
+}
+
+void focus_directional_cycle(ObDirection dir,
+                             gboolean dialog, gboolean done, gboolean cancel)
+{
+    static ObClient *first = NULL;
+    ObClient *ft;
+
+    if (cancel) {
+        if (focus_cycle_target)
+            frame_adjust_focus(focus_cycle_target->frame, FALSE);
+        if (focus_client)
+            frame_adjust_focus(focus_client->frame, TRUE);
+        focus_cycle_target = NULL;
+        goto done_cycle;
+    } else if (done && dialog) {
+        goto done_cycle;
+    }
+
+    if (!first) first = focus_client;
+    if (!focus_cycle_target) focus_cycle_target = focus_client;
+
+    if ((ft = client_find_directional(focus_cycle_target, dir))) {
+        if (ft != focus_cycle_target) {/* prevents flicker */
+            if (focus_cycle_target)
+                frame_adjust_focus(focus_cycle_target->frame, FALSE);
+            focus_cycle_target = ft;
+            frame_adjust_focus(focus_cycle_target->frame, TRUE);
+        }
+        popup_cycle(ft, dialog);
+    }
+    if (dialog)
+        return;
+
+done_cycle:
+    if (done && focus_cycle_target)
+        client_activate(focus_cycle_target, FALSE);
+
+    first = NULL;
+    focus_cycle_target = NULL;
+
+    popup_cycle(ft, FALSE);
+
+    return;
 }
 
 void focus_order_add_new(ObClient *c)