X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=740ce07bda605eead2fef130a61a528570a10231;hb=1ee19207fbcf8c0918858d83d04b308ecd6988a7;hp=22036917a85a2719fc9de5701db976b8c7599af5;hpb=6538a5ccb2199d518b854baa6d790387b448484e;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 22036917..740ce07b 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -42,13 +42,23 @@ ObClient *focus_cycle_target;
 
 static ObIconPopup *focus_cycle_popup;
 
+static void focus_cycle_destructor(ObClient *c)
+{
+    /* end cycling if the target disappears */
+    if (focus_cycle_target == c)
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
+}
+
 void focus_startup(gboolean reconfig)
 {
     focus_cycle_popup = icon_popup_new(TRUE);
 
-    if (!reconfig)
+    if (!reconfig) {
+        client_add_destructor((GDestroyNotify) focus_cycle_destructor);
+
         /* start with nothing focused */
         focus_set_client(NULL);
+    }
 }
 
 void focus_shutdown(gboolean reconfig)
@@ -58,6 +68,8 @@ void focus_shutdown(gboolean reconfig)
     icon_popup_free(focus_cycle_popup);
 
     if (!reconfig) {
+        client_remove_destructor((GDestroyNotify) focus_cycle_destructor);
+
         for (i = 0; i < screen_num_desktops; ++i)
             g_list_free(focus_order[i]);
         g_free(focus_order);
@@ -167,8 +179,9 @@ void focus_fallback(ObFocusFallbackType type)
     */
     focus_set_client(NULL);
 
-    if (config_focus_follow && focus_under_pointer())
-        return;
+    if (!config_focus_last && config_focus_follow)
+        if (focus_under_pointer())
+            return;
 
     if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
         /* try for transient relations */
@@ -281,7 +294,7 @@ void focus_cycle(gboolean forward, gboolean linear,
     static ObClient *t = NULL;
     static GList *order = NULL;
     GList *it, *start, *list;
-    ObClient *ft;
+    ObClient *ft = NULL;
 
     if (cancel) {
         if (focus_cycle_target)