Merge branch 'backport' into work

Conflicts:

	openbox/screen.c

1 files changed, 14 insertions, 0 deletions

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index d6d5584c..cc2b3b36 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -735,3 +735,17 @@ void focus_cycle_popup_single_hide(void)
 {
     icon_popup_hide(single_popup);
 }
+
+gboolean focus_cycle_popup_is_showing(ObClient *client)
+{
+    if (popup.mapped) {
+        GList *it;
+
+        for (it = popup.targets; it; it = g_list_next(it)) {
+            ObFocusCyclePopupTarget *t = it->data;
+            if (t->client == client)
+                return TRUE;
+        }
+    }
+    return FALSE;
+}