Hide the focus popup if we change desktops and one of the windows in it disappears

[chaz/openbox] / openbox / focus_cycle_popup.c

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 595fb9df752488caa76a0556787bf5880aaf0ec9..d01be03cf02970a119be9ddbc4cb7ee2b6efffef 100644 (file)
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -42,6 +42,7 @@ typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget;
 struct _ObFocusCyclePopupTarget
 {
     ObClient *client;
+    RrImage *icon;
     gchar *text;
     Window win;
 };
@@ -96,7 +97,7 @@ void focus_cycle_popup_startup(gboolean reconfig)
 {
     XSetWindowAttributes attrib;
 
-    single_popup = icon_popup_new(TRUE);
+    single_popup = icon_popup_new();
 
     popup.obwin.type = Window_Internal;
     popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
@@ -106,7 +107,8 @@ void focus_cycle_popup_startup(gboolean reconfig)
     popup.a_text->surface.parent = popup.a_bg;
     popup.a_icon->surface.parent = popup.a_bg;
 
-    popup.a_icon->texture[0].type = RR_TEXTURE_RGBA;
+    RrAppearanceClearTextures(popup.a_icon);
+    popup.a_icon->texture[0].type = RR_TEXTURE_IMAGE;
 
     RrAppearanceAddTextures(popup.a_bg, 1);
     popup.a_bg->texture[0].type = RR_TEXTURE_RGBA;
@@ -128,24 +130,29 @@ void focus_cycle_popup_startup(gboolean reconfig)
     XMapWindow(ob_display, popup.text);
 
     stacking_add(INTERNAL_AS_WINDOW(&popup));
+    g_hash_table_insert(window_map, &popup.bg, &popup);
 }
 
 void focus_cycle_popup_shutdown(gboolean reconfig)
 {
     icon_popup_free(single_popup);
 
+    g_hash_table_remove(window_map, &popup.bg);
     stacking_remove(INTERNAL_AS_WINDOW(&popup));
 
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;
 
+        RrImageUnref(t->icon);
         g_free(t->text);
         XDestroyWindow(ob_display, t->win);
+        g_free(t);
 
         popup.targets = g_list_delete_link(popup.targets, popup.targets);
     }
 
     g_free(popup.hilite_rgba);
+    popup.hilite_rgba = NULL;
 
     XDestroyWindow(ob_display, popup.text);
     XDestroyWindow(ob_display, popup.bg);
@@ -174,11 +181,12 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
     for (it = g_list_last(focus_order); it; it = g_list_previous(it)) {
         ObClient *ft = it->data;
 
-        if (focus_valid_target(ft,
+        if (focus_valid_target(ft, TRUE,
                                iconic_windows,
                                all_desktops,
                                dock_windows,
-                               desktop_windows))
+                               desktop_windows,
+                               FALSE))
         {
             gchar *text = popup_get_name(ft);
 
@@ -193,6 +201,8 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
 
                 t->client = ft;
                 t->text = text;
+                t->icon = client_icon(t->client);
+                RrImageRef(t->icon); /* own the icon so it won't go away */
                 t->win = create_window(p->bg, 0, 0, NULL);
 
                 XMapWindow(ob_display, t->win);
@@ -251,7 +261,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     const ObFocusCyclePopupTarget *newtarget;
     gint newtargetx, newtargety;
 
-    screen_area = screen_physical_area_active();
+    screen_area = screen_physical_area_primary(FALSE);
 
     /* get the outside margins */
     RrMargins(p->a_bg, &ml, &mt, &mr, &mb);
@@ -396,8 +406,6 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
         /* have to redraw the targetted icon and last targetted icon,
            they can pick up the hilite changes in the backgroud */
         if (!p->mapped || newtarget == target || p->last_target == target) {
-            const ObClientIcon *icon;
-            ObClientIcon *thumb;
             const gint row = i / icons_per_row; /* starting from 0 */
             const gint col = i % icons_per_row; /* starting from 0 */
             gint innerx, innery;
@@ -413,27 +421,14 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
                               innerx, innery, innerw, innerh);
 
             /* get the icon from the client */
-            if ((thumb = client_thumbnail(target->client))) {
-                p->a_icon->texture[0].data.rgba.width = thumb->width;
-                p->a_icon->texture[0].data.rgba.height = thumb->height;
-                p->a_icon->texture[0].data.rgba.alpha =
-                    target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
-                p->a_icon->texture[0].data.rgba.data = thumb->data;
-            } else {
-                icon = client_icon(target->client, innerw, innerh);
-                p->a_icon->texture[0].data.rgba.width = icon->width;
-                p->a_icon->texture[0].data.rgba.height = icon->height;
-                p->a_icon->texture[0].data.rgba.alpha =
-                    target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
-                p->a_icon->texture[0].data.rgba.data = icon->data;
-            }
+            p->a_icon->texture[0].data.image.alpha =
+                target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
+            p->a_icon->texture[0].data.image.image = target->icon;
 
             /* draw the icon */
             p->a_icon->surface.parentx = innerx;
             p->a_icon->surface.parenty = innery;
             RrPaint(p->a_icon, target->win, innerw, innerh);
-
-            clienticon_free(thumb);
         }
     }
 
@@ -467,10 +462,11 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
         XMapWindow(ob_display, popup.bg);
         XFlush(ob_display);
         popup.mapped = TRUE;
+        screen_hide_desktop_popup();
     }
 }
 
-void focus_cycle_popup_hide()
+void focus_cycle_popup_hide(void)
 {
     gulong ignore_start;
 
@@ -486,8 +482,10 @@ void focus_cycle_popup_hide()
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;
 
+        RrImageUnref(t->icon);
         g_free(t->text);
         XDestroyWindow(ob_display, t->win);
+        g_free(t);
 
         popup.targets = g_list_delete_link(popup.targets, popup.targets);
     }
@@ -517,7 +515,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
         g_assert(popup.targets == NULL);
 
         /* position the popup */
-        a = screen_physical_area_active();
+        a = screen_physical_area_primary(FALSE);
         icon_popup_position(single_popup, CenterGravity,
                             a->x + a->width / 2, a->y + a->height / 2);
         icon_popup_height(single_popup, POPUP_HEIGHT);
@@ -528,11 +526,26 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
     }
 
     text = popup_get_name(c);
-    icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE));
+    icon_popup_show(single_popup, text, client_icon(c));
     g_free(text);
+    screen_hide_desktop_popup();
 }
 
-void focus_cycle_popup_single_hide()
+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;
+}