Some fixes for the pager popups, and avoid a crash if you destroy a popup while it...
[mikachu/openbox.git] / openbox / popup.c
index f20aa00..5cbe034 100644 (file)
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   popup.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "popup.h"
+
 #include "openbox.h"
 #include "frame.h"
+#include "client.h"
+#include "stacking.h"
+#include "event.h"
+#include "screen.h"
+#include "mainloop.h"
 #include "render/render.h"
 #include "render/theme.h"
 
-typedef struct Popup {
-    gboolean hasicon;
-    Window bg;
-    Window icon;
-    Window text;
-    Appearance *a_bg;
-    Appearance *a_icon;
-    Appearance *a_text;
-    int gravity;
-    int x;
-    int y;
-    int w;
-    int h;
-} Popup;
-
-Popup *popup_new(gboolean hasicon)
-{
-    Popup *self = g_new(Popup, 1);
-    self->hasicon = hasicon;
-    self->bg = None;
-    self->a_text = NULL;
+ObPopup *popup_new(void)
+{
+    XSetWindowAttributes attrib;
+    ObPopup *self = g_new0(ObPopup, 1);
+
+    self->obwin.type = Window_Internal;
     self->gravity = NorthWestGravity;
-    self->x = self->y = self->w = self->h = 0;
+    self->x = self->y = self->textw = self->h = 0;
+    self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
+    self->a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
+    self->iconwm = self->iconhm = 1;
+
+    attrib.override_redirect = True;
+    self->bg = XCreateWindow(ob_display, RootWindow(ob_display, ob_screen),
+                             0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
+                             InputOutput, RrVisual(ob_rr_inst),
+                             CWOverrideRedirect, &attrib);
+
+    self->text = XCreateWindow(ob_display, self->bg,
+                               0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
+                               InputOutput, RrVisual(ob_rr_inst), 0, NULL);
+
+    XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->obwidth);
+    XSetWindowBorder(ob_display, self->bg,
+                     RrColorPixel(ob_rr_theme->osd_border_color));
+
+    XMapWindow(ob_display, self->text);
+
+    stacking_add(INTERNAL_AS_WINDOW(self));
+    g_hash_table_insert(window_map, &self->bg, self);
     return self;
 }
 
-void popup_free(Popup *self)
+void popup_free(ObPopup *self)
 {
-    if (self->bg) {
+    if (self) {
+        popup_hide(self); /* make sure it's not showing or is being delayed and
+                             will be shown */
         XDestroyWindow(ob_display, self->bg);
         XDestroyWindow(ob_display, self->text);
-        XDestroyWindow(ob_display, self->icon);
-        appearance_free(self->a_bg);
-        if (self->hasicon)
-            appearance_free(self->a_icon);
+        RrAppearanceFree(self->a_bg);
+        RrAppearanceFree(self->a_text);
+        g_hash_table_remove(window_map, &self->bg);
+        stacking_remove(self);
+        g_free(self);
     }
-    if (self->a_text)
-        appearance_free(self->a_text);
-    g_free(self);
 }
 
-void popup_position(Popup *self, int gravity, int x, int y)
+void popup_position(ObPopup *self, gint gravity, gint x, gint y)
 {
     self->gravity = gravity;
     self->x = x;
     self->y = y;
 }
 
-void popup_size(Popup *self, int w, int h)
+void popup_text_width(ObPopup *self, gint w)
 {
-    self->w = w;
-    self->h = h;
+    self->textw = w;
 }
 
-void popup_size_to_string(Popup *self, char *text)
+void popup_min_width(ObPopup *self, gint minw)
 {
-    int textw, texth;
-    int iconw;
+    self->minw = minw;
+}
 
-    if (!self->a_text)
-        self->a_text = appearance_copy(theme_app_hilite_label);
+void popup_max_width(ObPopup *self, gint maxw)
+{
+    self->maxw = maxw;
+}
 
-    self->a_text->texture[0].data.text.string = text;
-    appearance_minsize(self->a_text, &textw, &texth);
-    textw += theme_bevel * 2;
-    texth += theme_bevel * 2;
+void popup_height(ObPopup *self, gint h)
+{
+    gint texth;
 
-    self->h = texth + theme_bevel * 2;
-    iconw = (self->hasicon ? texth : 0);
-    self->w = textw + iconw + theme_bevel * 3;
+    /* don't let the height be smaller than the text */
+    texth = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
+    self->h = MAX(h, texth);
 }
 
-void popup_show(Popup *self, char *text, Icon *icon)
+void popup_text_width_to_string(ObPopup *self, gchar *text)
 {
-    XSetWindowAttributes attrib;
-    int x, y, w, h;
-    int textw, texth;
-    int iconw;
-
-    /* create the shit if needed */
-    if (!self->bg) {
-        attrib.override_redirect = True;
-        self->bg = XCreateWindow(ob_display, ob_root,
-                                 0, 0, 1, 1, 0, render_depth, InputOutput,
-                                 render_visual, CWOverrideRedirect, &attrib);
-
-        XSetWindowBorderWidth(ob_display, self->bg, theme_bwidth);
-        XSetWindowBorder(ob_display, self->bg, theme_b_color->pixel);
-
-        self->text = XCreateWindow(ob_display, self->bg,
-                                   0, 0, 1, 1, 0, render_depth, InputOutput,
-                                   render_visual, 0, NULL);
-        if (self->hasicon)
-            self->icon = XCreateWindow(ob_display, self->bg,
-                                       0, 0, 1, 1, 0,
-                                       render_depth, InputOutput,
-                                       render_visual, 0, NULL);
-
-        XMapWindow(ob_display, self->text);
-        XMapWindow(ob_display, self->icon);
-
-        self->a_bg = appearance_copy(theme_app_hilite_bg);
-        if (self->hasicon)
-            self->a_icon = appearance_copy(theme_app_icon);
+    if (text[0] != '\0') {
+        self->a_text->texture[0].data.text.string = text;
+        self->textw = RrMinWidth(self->a_text);
+    } else
+        self->textw = 0;
+}
+
+void popup_height_to_string(ObPopup *self, gchar *text)
+{
+    self->h = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
+}
+
+void popup_text_width_to_strings(ObPopup *self, gchar **strings, gint num)
+{
+    gint i, maxw;
+
+    maxw = 0;
+    for (i = 0; i < num; ++i) {
+        popup_text_width_to_string(self, strings[i]);
+        maxw = MAX(maxw, self->textw);
     }
-    if (!self->a_text)
-        self->a_text = appearance_copy(theme_app_hilite_label);
+    self->textw = maxw;
+}
+
+void popup_set_text_align(ObPopup *self, RrJustify align)
+{
+    self->a_text->texture[0].data.text.justify = align;
+}
+
+static gboolean popup_show_timeout(gpointer data)
+{
+    ObPopup *self = data;
+
+    XMapWindow(ob_display, self->bg);
+    stacking_raise(INTERNAL_AS_WINDOW(self));
+    self->mapped = TRUE;
+    self->delay_mapped = FALSE;
+
+    return FALSE; /* don't repeat */
+}
+
+void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
+{
+    gint l, t, r, b;
+    gint x, y, w, h;
+    guint m;
+    gint emptyx, emptyy; /* empty space between elements */
+    gint textx, texty, textw, texth;
+    gint iconx, icony, iconw, iconh;
+    Rect *area, mon;
+
+    /* when there is no icon and the text is not parent relative, then
+       fill the whole dialog with the text appearance, don't use the bg at all
+    */
+    if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
+        RrMargins(self->a_bg, &l, &t, &r, &b);
+    else
+        l = t = r = b = 0;
 
     /* set up the textures */
     self->a_text->texture[0].data.text.string = text;
-    if (self->hasicon) {
-        if (icon) {
-            self->a_icon->texture[0].type = RGBA;
-            self->a_icon->texture[0].data.rgba.width = icon->width;
-            self->a_icon->texture[0].data.rgba.height = icon->height;
-            self->a_icon->texture[0].data.rgba.data = icon->data;
-        } else
-            self->a_icon->texture[0].type = NoTexture;
+
+    /* measure the text out */
+    if (text[0] != '\0') {
+        RrMinSize(self->a_text, &textw, &texth);
+    } else {
+        textw = 0;
+        texth = RrMinHeight(self->a_text);
     }
 
-    /* measure the shit out */
-    appearance_minsize(self->a_text, &textw, &texth);
-    textw += theme_bevel * 2;
-    texth += theme_bevel * 2;
+    /* get the height, which is also used for the icon width */
+    emptyy = t + b + ob_rr_theme->paddingy * 2;
+    if (self->h)
+        texth = self->h - emptyy;
+    h = texth * self->iconhm + emptyy;
 
-    /* set the sizes up and reget the text sizes from the calculated
-       outer sizes */
-    if (self->h) {
-        h = self->h;
-        texth = h - (theme_bevel * 2);
-    } else
-        h = texth + theme_bevel * 2;
-    iconw = (self->hasicon ? texth : 0);
-    if (self->w) {
-        w = self->w;
-        textw = w - (iconw + theme_bevel * 3);
+    if (self->textw)
+        textw = self->textw;
+
+    iconx = textx = l + ob_rr_theme->paddingx;
+
+    emptyx = l + r + ob_rr_theme->paddingx * 2;
+    if (self->hasicon) {
+        iconw = texth * self->iconwm;
+        iconh = texth * self->iconhm;
+        textx += iconw + ob_rr_theme->paddingx;
+        if (textw)
+            emptyx += ob_rr_theme->paddingx; /* between the icon and text */
     } else
-        w = textw + iconw + theme_bevel * 3;
+        iconw = 0;
+
+    texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
+    icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
+
+    /* when there is no icon, then fill the whole dialog with the text
+       appearance
+    */
+    if (!self->hasicon)
+    {
+        textx = texty = 0;
+        texth += emptyy;
+        textw += emptyx;
+        emptyx = emptyy = 0;
+    }
+
+    w = textw + emptyx + iconw;
+    /* cap it at maxw/minw */
+    if (self->maxw) w = MIN(w, self->maxw);
+    if (self->minw) w = MAX(w, self->minw);
+    textw = w - emptyx - iconw;
+
     /* sanity checks to avoid crashes! */
     if (w < 1) w = 1;
     if (h < 1) h = 1;
-    if (textw < 1) textw = 1;
     if (texth < 1) texth = 1;
 
     /* set up the x coord */
     x = self->x;
     switch (self->gravity) {
-    case NorthGravity:
-    case CenterGravity:
-    case SouthGravity:
+    case NorthGravity: case CenterGravity: case SouthGravity:
         x -= w / 2;
         break;
-    case NorthEastGravity:
-    case EastGravity:
-    case SouthEastGravity:
+    case NorthEastGravity: case EastGravity: case SouthEastGravity:
         x -= w;
         break;
     }
@@ -165,51 +240,332 @@ void popup_show(Popup *self, char *text, Icon *icon)
     /* set up the y coord */
     y = self->y;
     switch (self->gravity) {
-    case WestGravity:
-    case CenterGravity:
-    case EastGravity:
+    case WestGravity: case CenterGravity: case EastGravity:
         y -= h / 2;
         break;
-    case SouthWestGravity:
-    case SouthGravity:
-    case SouthEastGravity:
+    case SouthWestGravity: case SouthGravity: case SouthEastGravity:
         y -= h;
         break;
     }
 
+    /* Find the monitor which contains the biggest part of the popup.
+     * If the popup is completely off screen, limit it to the intersection
+     * of all monitors and then try again. If it's still off screen, put it
+     * on monitor 0. */
+    RECT_SET(mon, x, y, w, h);
+    m = screen_find_monitor(&mon);
+    area = screen_physical_area_monitor(m);
+
+    x=MAX(MIN(x, area->x+area->width-w),area->x);
+    y=MAX(MIN(y, area->y+area->height-h),area->y);
+
+    g_free(area);
+
+    if (m == screen_num_monitors) {
+        RECT_SET(mon, x, y, w, h);
+        m = screen_find_monitor(&mon);
+        if (m == screen_num_monitors)
+            m = 0;
+        area = screen_physical_area_monitor(m);
+
+        x=MAX(MIN(x, area->x+area->width-w),area->x);
+        y=MAX(MIN(y, area->y+area->height-h),area->y);
+
+        g_free(area);
+    }
+
     /* set the windows/appearances up */
-    RECT_SET(self->a_bg->area, 0, 0, w, h);
     XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
+    /* when there is no icon and the text is not parent relative, then
+       fill the whole dialog with the text appearance, don't use the bg at all
+    */
+    if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
+        RrPaint(self->a_bg, self->bg, w, h);
 
-    RECT_SET(self->a_text->area, 0, 0, textw, texth); 
-    RECT_SET(self->a_text->texture[0].position, theme_bevel, theme_bevel,
-             textw - theme_bevel * 2, texth - theme_bevel * 2);
-    self->a_text->surface.data.planar.parent = self->a_bg;
-    self->a_text->surface.data.planar.parentx = iconw + theme_bevel * 2;
-    self->a_text->surface.data.planar.parenty = theme_bevel;
-    XMoveResizeWindow(ob_display, self->text,
-                      iconw + theme_bevel * 2, theme_bevel, textw, texth);
-
-    if (self->hasicon) {
-        if (iconw < 1) iconw = 1; /* sanity check for crashes */
-        RECT_SET(self->a_icon->area, 0, 0, iconw, texth);
-        RECT_SET(self->a_icon->texture[0].position, 0, 0, iconw, texth);
-        self->a_icon->surface.data.planar.parent = self->a_bg;
-        self->a_icon->surface.data.planar.parentx = theme_bevel;
-        self->a_icon->surface.data.planar.parenty = theme_bevel;
-        XMoveResizeWindow(ob_display, self->icon,
-                          theme_bevel, theme_bevel, iconw, texth);
+    if (textw) {
+        self->a_text->surface.parent = self->a_bg;
+        self->a_text->surface.parentx = textx;
+        self->a_text->surface.parenty = texty;
+        XMoveResizeWindow(ob_display, self->text, textx, texty, textw, texth);
+        RrPaint(self->a_text, self->text, textw, texth);
     }
 
-    paint(self->bg, self->a_bg);
-    paint(self->text, self->a_text);
     if (self->hasicon)
-        paint(self->icon, self->a_icon);
+        self->draw_icon(iconx, icony, iconw, iconh, self->draw_icon_data);
 
-    XMapWindow(ob_display, self->bg);
+    /* do the actual showing */
+    if (!self->mapped) {
+        if (usec) {
+            /* don't kill previous show timers */
+            if (!self->delay_mapped) {
+                ob_main_loop_timeout_add(ob_main_loop, usec,
+                                         popup_show_timeout, self,
+                                         g_direct_equal, NULL);
+                self->delay_mapped = TRUE;
+            }
+        } else {
+            popup_show_timeout(self);
+        }
+    }
+}
+
+void popup_hide(ObPopup *self)
+{
+    if (self->mapped) {
+        gulong ignore_start;
+
+        /* kill enter events cause by this unmapping */
+        ignore_start = event_start_ignore_all_enters();
+
+        XUnmapWindow(ob_display, self->bg);
+        self->mapped = FALSE;
+
+        event_end_ignore_all_enters(ignore_start);
+    } else if (self->delay_mapped) {
+        ob_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE);
+        self->delay_mapped = FALSE;
+    }
+}
+
+static void icon_popup_draw_icon(gint x, gint y, gint w, gint h, gpointer data)
+{
+    ObIconPopup *self = data;
+
+    self->a_icon->surface.parent = self->popup->a_bg;
+    self->a_icon->surface.parentx = x;
+    self->a_icon->surface.parenty = y;
+    XMoveResizeWindow(ob_display, self->icon, x, y, w, h);
+    RrPaint(self->a_icon, self->icon, w, h);
+}
+
+ObIconPopup *icon_popup_new(void)
+{
+    ObIconPopup *self;
+
+    self = g_new0(ObIconPopup, 1);
+    self->popup = popup_new();
+    self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
+    self->icon = XCreateWindow(ob_display, self->popup->bg,
+                               0, 0, 1, 1, 0,
+                               RrDepth(ob_rr_inst), InputOutput,
+                               RrVisual(ob_rr_inst), 0, NULL);
+    XMapWindow(ob_display, self->icon);
+
+    self->popup->hasicon = TRUE;
+    self->popup->draw_icon = icon_popup_draw_icon;
+    self->popup->draw_icon_data = self;
+
+    return self;
+}
+
+void icon_popup_free(ObIconPopup *self)
+{
+    if (self) {
+        XDestroyWindow(ob_display, self->icon);
+        RrAppearanceFree(self->a_icon);
+        popup_free(self->popup);
+        g_free(self);
+    }
+}
+
+void icon_popup_delay_show(ObIconPopup *self, gulong usec,
+                           gchar *text, RrImage *icon)
+{
+    if (icon) {
+        RrAppearanceClearTextures(self->a_icon);
+        self->a_icon->texture[0].type = RR_TEXTURE_IMAGE;
+        self->a_icon->texture[0].data.image.alpha = 0xff;
+        self->a_icon->texture[0].data.image.image = icon;
+    } else {
+        RrAppearanceClearTextures(self->a_icon);
+        self->a_icon->texture[0].type = RR_TEXTURE_NONE;
+    }
+
+    popup_delay_show(self->popup, usec, text);
+}
+
+void icon_popup_icon_size_multiplier(ObIconPopup *self, guint wm, guint hm)
+{
+    /* cap them at 1 */
+    self->popup->iconwm = MAX(1, wm);
+    self->popup->iconhm = MAX(1, hm);
+}
+
+static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
+                                  gpointer data)
+{
+    ObPagerPopup *self = data;
+    gint x, y;
+    guint rown, n;
+    guint horz_inc;
+    guint vert_inc;
+    guint r, c;
+    gint eachw, eachh;
+    const guint cols = screen_desktop_layout.columns;
+    const guint rows = screen_desktop_layout.rows;
+    const gint linewidth = ob_rr_theme->obwidth;
+
+    eachw = (w - ((cols + 1) * linewidth)) / cols;
+    eachh = (h - ((rows + 1) * linewidth)) / rows;
+    /* make them squares */
+    eachw = eachh = MIN(eachw, eachh);
+
+    /* center */
+    px += (w - (cols * (eachw + linewidth) + linewidth)) / 2;
+    py += (h - (rows * (eachh + linewidth) + linewidth)) / 2;
+
+    if (eachw <= 0 || eachh <= 0)
+        return;
+
+    switch (screen_desktop_layout.orientation) {
+    case OB_ORIENTATION_HORZ:
+        switch (screen_desktop_layout.start_corner) {
+        case OB_CORNER_TOPLEFT:
+            n = 0;
+            horz_inc = 1;
+            vert_inc = cols;
+            break;
+        case OB_CORNER_TOPRIGHT:
+            n = cols - 1;
+            horz_inc = -1;
+            vert_inc = cols;
+            break;
+        case OB_CORNER_BOTTOMRIGHT:
+            n = rows * cols - 1;
+            horz_inc = -1;
+            vert_inc = -screen_desktop_layout.columns;
+            break;
+        case OB_CORNER_BOTTOMLEFT:
+            n = (rows - 1) * cols;
+            horz_inc = 1;
+            vert_inc = -cols;
+            break;
+        default:
+            g_assert_not_reached();
+        }
+        break;
+    case OB_ORIENTATION_VERT:
+        switch (screen_desktop_layout.start_corner) {
+        case OB_CORNER_TOPLEFT:
+            n = 0;
+            horz_inc = rows;
+            vert_inc = 1;
+            break;
+        case OB_CORNER_TOPRIGHT:
+            n = rows * (cols - 1);
+            horz_inc = -rows;
+            vert_inc = 1;
+            break;
+        case OB_CORNER_BOTTOMRIGHT:
+            n = rows * cols - 1;
+            horz_inc = -rows;
+            vert_inc = -1;
+            break;
+        case OB_CORNER_BOTTOMLEFT:
+            n = rows - 1;
+            horz_inc = rows;
+            vert_inc = -1;
+            break;
+        default:
+            g_assert_not_reached();
+        }
+        break;
+    default:
+        g_assert_not_reached();
+    }
+
+    rown = n;
+    for (r = 0, y = 0; r < rows; ++r, y += eachh + linewidth)
+    {
+        for (c = 0, x = 0; c < cols; ++c, x += eachw + linewidth)
+        {
+            RrAppearance *a;
+
+            if (n < self->desks) {
+                a = (n == self->curdesk ? self->hilight : self->unhilight);
+
+                a->surface.parent = self->popup->a_bg;
+                a->surface.parentx = x + px;
+                a->surface.parenty = y + py;
+                XMoveResizeWindow(ob_display, self->wins[n],
+                                  x + px, y + py, eachw, eachh);
+                RrPaint(a, self->wins[n], eachw, eachh);
+            }
+            n += horz_inc;
+        }
+        n = rown += vert_inc;
+    }
+}
+
+ObPagerPopup *pager_popup_new(void)
+{
+    ObPagerPopup *self;
+
+    self = g_new(ObPagerPopup, 1);
+    self->popup = popup_new();
+
+    self->desks = 0;
+    self->wins = g_new(Window, self->desks);
+    self->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_fg);
+    self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_fg);
+
+    self->popup->hasicon = TRUE;
+    self->popup->draw_icon = pager_popup_draw_icon;
+    self->popup->draw_icon_data = self;
+
+    return self;
+}
+
+void pager_popup_free(ObPagerPopup *self)
+{
+    if (self) {
+        guint i;
+
+        for (i = 0; i < self->desks; ++i)
+            XDestroyWindow(ob_display, self->wins[i]);
+        g_free(self->wins);
+        RrAppearanceFree(self->hilight);
+        RrAppearanceFree(self->unhilight);
+        popup_free(self->popup);
+        g_free(self);
+    }
+}
+
+void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
+                            gchar *text, guint desk)
+{
+    guint i;
+
+    if (screen_num_desktops < self->desks)
+        for (i = screen_num_desktops; i < self->desks; ++i)
+            XDestroyWindow(ob_display, self->wins[i]);
+
+    if (screen_num_desktops != self->desks)
+        self->wins = g_renew(Window, self->wins, screen_num_desktops);
+
+    if (screen_num_desktops > self->desks)
+        for (i = self->desks; i < screen_num_desktops; ++i) {
+            XSetWindowAttributes attr;
+
+            attr.border_pixel =
+                RrColorPixel(ob_rr_theme->osd_border_color);
+            self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
+                                          0, 0, 1, 1, ob_rr_theme->obwidth,
+                                          RrDepth(ob_rr_inst), InputOutput,
+                                          RrVisual(ob_rr_inst), CWBorderPixel,
+                                          &attr);
+            XMapWindow(ob_display, self->wins[i]);
+        }
+
+    self->desks = screen_num_desktops;
+    self->curdesk = desk;
+
+    popup_delay_show(self->popup, usec, text);
 }
 
-void popup_hide(Popup *self)
+void pager_popup_icon_size_multiplier(ObPagerPopup *self, guint wm, guint hm)
 {
-    XUnmapWindow(ob_display, self->bg);
+    /* cap them at 1 */
+    self->popup->iconwm = MAX(1, wm);
+    self->popup->iconhm = MAX(1, hm);
 }