From 16fcb1213d4ccfccd4e4a8ad5e8b0c826dc5c16e Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 28 May 2007 00:33:58 +0000
Subject: [PATCH] when you focus a window, bring any modal children it has to
 that desktop when falling back, return the window which actually was focused
 by client_focus let you focus cycle to windows when their modal window is on
 another desktop (it will be brought over)

---
 openbox/client.c      | 20 +++++++++++++++-----
 openbox/client.h      |  3 +++
 openbox/focus.c       |  2 ++
 openbox/focus_cycle.c |  6 +++++-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/openbox/client.c b/openbox/client.c
index dbbba7de..477575a8 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -3463,6 +3463,8 @@ gboolean client_can_focus(ObClient *self)
 
 gboolean client_focus(ObClient *self)
 {
+    client_bring_modal_windows(self);
+
     /* choose the correct target */
     self = client_focus_target(self);
 
@@ -3582,15 +3584,18 @@ void client_activate(ObClient *self, gboolean here, gboolean user)
         client_hilite(self, TRUE);
 }
 
-static void client_bring_helper_windows_recursive(ObClient *self,
-                                                  guint desktop)
+static void client_bring_windows_recursive(ObClient *self,
+                                           guint desktop,
+                                           gboolean helpers,
+                                           gboolean modals)
 {
     GSList *it;
 
     for (it = self->transients; it; it = g_slist_next(it))
-        client_bring_helper_windows_recursive(it->data, desktop);
+        client_bring_windows_recursive(it->data, desktop, helpers, modals);
 
-    if (client_helper(self) &&
+    if (((helpers && client_helper(self)) ||
+         (modals && self->modal))&&
         self->desktop != desktop && self->desktop != DESKTOP_ALL)
     {
         client_set_desktop(self, desktop, FALSE);
@@ -3599,7 +3604,12 @@ static void client_bring_helper_windows_recursive(ObClient *self,
 
 void client_bring_helper_windows(ObClient *self)
 {
-    client_bring_helper_windows_recursive(self, self->desktop);
+    client_bring_windows_recursive(self, self->desktop, TRUE, FALSE);
+}
+
+void client_bring_modal_windows(ObClient *self)
+{
+    client_bring_windows_recursive(self, self->desktop, FALSE, TRUE);
 }
 
 gboolean client_focused(ObClient *self)
diff --git a/openbox/client.h b/openbox/client.h
index 755b973a..3d81b270 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -562,6 +562,9 @@ void client_activate(ObClient *self, gboolean here, gboolean user);
   stuff windows. */
 void client_bring_helper_windows(ObClient *self);
 
+/*! Bring all of its modal windows to its desktop. */
+void client_bring_modal_windows(ObClient *self);
+
 /*! Calculates the stacking layer for the client window */
 void client_calc_layer(ObClient *self);
 
diff --git a/openbox/focus.c b/openbox/focus.c
index 59dd0d0d..87f589f2 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -166,6 +166,8 @@ ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer)
     focus_nothing();
 
     new = focus_fallback_target(allow_refocus, allow_pointer, old);
+    /* get what was really focused */
+    if (new) new = client_focus_target(new);
 
     return new;
 }
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 46f5f058..74cabac6 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -150,7 +150,11 @@ gboolean focus_cycle_target_valid(ObClient *ft,
                 !ft->skip_taskbar);
 
     /* it's not going to just send fous off somewhere else (modal window) */
-    ok = ok && ft == client_focus_target(ft);
+    {
+        ObClient *cft = client_focus_target(ft);
+        ok = ok && (ft == cft || (cft->desktop != DESKTOP_ALL &&
+                                  cft->desktop != ft->desktop));
+    }
 
     return ok;
 }
-- 
2.39.2