make the dock's hiding always have at least 1px on screen

[chaz/openbox] / openbox / focus_cycle_popup.c

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 89468493470b044cbfb0727614e30c957e1ad05d..9a6f2420e7cb17928650e2e0f452f044236eb6db 100644 (file)
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -22,7 +22,6 @@
 #include "client.h"
 #include "screen.h"
 #include "focus.h"
-#include "focus_cycle.h"
 #include "openbox.h"
 #include "window.h"
 #include "event.h"
@@ -97,7 +96,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);
@@ -129,12 +128,14 @@ 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) {
@@ -147,6 +148,7 @@ void focus_cycle_popup_shutdown(gboolean reconfig)
     }
 
     g_free(popup.hilite_rgba);
+    popup.hilite_rgba = NULL;
 
     XDestroyWindow(ob_display, popup.text);
     XDestroyWindow(ob_display, popup.bg);
@@ -175,11 +177,11 @@ 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_cycle_target_valid(ft,
-                                     iconic_windows,
-                                     all_desktops,
-                                     dock_windows,
-                                     desktop_windows))
+        if (focus_valid_target(ft, TRUE,
+                               iconic_windows,
+                               all_desktops,
+                               dock_windows,
+                               desktop_windows))
         {
             gchar *text = popup_get_name(ft);
 
@@ -211,31 +213,26 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
 static gchar *popup_get_name(ObClient *c)
 {
     ObClient *p;
-    gchar *title = NULL;
+    gchar *title;
     const gchar *desk = NULL;
     gchar *ret;
 
-    /* find our highest direct parent, including non-normal windows */
-    for (p = c; p->transient_for && p->transient_for != OB_TRAN_GROUP;
-         p = p->transient_for);
+    /* find our highest direct parent */
+    p = client_search_top_direct_parent(c);
 
     if (c->desktop != DESKTOP_ALL && c->desktop != screen_desktop)
         desk = screen_desktop_names[c->desktop];
 
-    /* use the transient's parent's title/icon if we don't have one */
-    if (p != c && !strcmp("", (c->iconic ? c->icon_title : c->title)))
-        title = g_strdup(p->iconic ? p->icon_title : p->title);
+    title = c->iconic ? c->icon_title : c->title;
 
-    if (title == NULL)
-        title = g_strdup(c->iconic ? c->icon_title : c->title);
+    /* use the transient's parent's title/icon if we don't have one */
+    if (p != c && title[0] == '\0')
+        title = p->iconic ? p->icon_title : p->title;
 
     if (desk)
         ret = g_strdup_printf("%s [%s]", title, desk);
-    else {
-        ret = title;
-        title = NULL;
-    }
-    g_free(title);
+    else
+        ret = g_strdup(title);
 
     return ret;
 }
@@ -245,7 +242,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     gint ml, mt, mr, mb;
     gint l, t, r, b;
     gint x, y, w, h;
-    Rect *screen_area;
+    Rect *screen_area = NULL;
     gint icons_per_row;
     gint icon_rows;
     gint textx, texty, textw, texth;
@@ -257,8 +254,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     const ObFocusCyclePopupTarget *newtarget;
     gint newtargetx, newtargety;
 
-    /* XXX find the middle monitor? */
-    screen_area = screen_physical_area_monitor(0);
+    screen_area = screen_physical_area_active();
 
     /* get the outside margins */
     RrMargins(p->a_bg, &ml, &mt, &mr, &mb);
@@ -440,6 +436,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     RrPaint(p->a_text, p->text, textw, texth);
 
     p->last_target = newtarget;
+
+    g_free(screen_area);
 }
 
 void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
@@ -461,10 +459,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;
 
@@ -511,21 +510,23 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
         g_assert(popup.targets == NULL);
 
         /* position the popup */
-        a = screen_physical_area_monitor(0);
+        a = screen_physical_area_active();
         icon_popup_position(single_popup, CenterGravity,
                             a->x + a->width / 2, a->y + a->height / 2);
         icon_popup_height(single_popup, POPUP_HEIGHT);
         icon_popup_min_width(single_popup, POPUP_WIDTH);
         icon_popup_max_width(single_popup, MAX(a->width/3, POPUP_WIDTH));
         icon_popup_text_width(single_popup, popup.maxtextw);
+        g_free(a);
     }
 
     text = popup_get_name(c);
     icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE));
     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);
 }