X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=488ecce12172491d2e30ee0d8a4756b0c3052e75;hb=746015e88c51dda43b26f35abc25050c502d319b;hp=463eb9be6b97cfb44d8c8396e2012f52e8912fb4;hpb=9586e3bf1482a30e29f230a1a987386fcdcec2c9;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 463eb9be..488ecce1 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -96,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);
@@ -174,7 +174,7 @@ 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,
@@ -251,7 +251,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
     const ObFocusCyclePopupTarget *newtarget;
     gint newtargetx, newtargety;
 
-    screen_area = screen_physical_area_monitor_active();
+    screen_area = screen_physical_area_active();
 
     /* get the outside margins */
     RrMargins(p->a_bg, &ml, &mt, &mr, &mb);
@@ -456,10 +456,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;
 
@@ -506,7 +507,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
         g_assert(popup.targets == NULL);
 
         /* position the popup */
-        a = screen_physical_area_monitor_active();
+        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);
@@ -519,9 +520,10 @@ 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));
     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);
 }