fix the popup text width, cuz the way its calculated changed

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 392aa9d164228b5b497c3ace11576c0286ed70a1..b234386783d72a243bae86508585f39d49a6b633 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -25,9 +25,22 @@
 #include "stacking.h"
 #include "event.h"
 #include "screen.h"
+#include "mainloop.h"
 #include "render/render.h"
 #include "render/theme.h"
 
+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 */
+}
+
 ObPopup *popup_new(gboolean hasicon)
 {
     XSetWindowAttributes attrib;
@@ -78,6 +91,7 @@ void popup_position(ObPopup *self, gint gravity, gint x, gint y)
 void popup_width(ObPopup *self, gint w)
 {
     self->w = w;
+    self->maxw = w;
 }
 
 void popup_height(ObPopup *self, gint h)
@@ -91,19 +105,9 @@ void popup_height(ObPopup *self, gint h)
 
 void popup_width_to_string(ObPopup *self, gchar *text, gint max)
 {
-    gint textw, iconw;
-
     self->a_text->texture[0].data.text.string = text;
-    textw = RrMinWidth(self->a_text);
-    if (self->hasicon) {
-        gint texth = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
-        iconw = texth;
-    } else
-        iconw = 0;
-    self->w = textw + iconw + ob_rr_theme->paddingx * (self->hasicon ? 3 : 2);
-    /* cap it at "max" */
-    if (max > 0)
-        self->w = MIN(self->w, max);
+    self->w = RrMinWidth(self->a_text);
+    self->maxw = max;
 }
 
 void popup_height_to_string(ObPopup *self, gchar *text)
@@ -111,12 +115,12 @@ void popup_height_to_string(ObPopup *self, gchar *text)
     self->h = RrMinHeight(self->a_text) + ob_rr_theme->paddingy * 2;
 }
 
-void popup_width_to_strings(ObPopup *self, gchar **strings, gint max)
+void popup_width_to_strings(ObPopup *self, gchar **strings, gint num, gint max)
 {
     gint i, maxw;
 
     maxw = 0;
-    for (i = 0; strings[i] != NULL; ++i) {
+    for (i = 0; i < num; ++i) {
         popup_width_to_string(self, strings[i], max);
         maxw = MAX(maxw, self->w);
     }
@@ -128,10 +132,11 @@ void popup_set_text_align(ObPopup *self, RrJustify align)
     self->a_text->texture[0].data.text.justify = align;
 }
 
-void popup_show(ObPopup *self, gchar *text)
+void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 {
     gint l, t, r, b;
     gint x, y, w, h;
+    gint xpadding, ypadding;
     gint textw, texth;
     gint iconw;
     Rect *area; /* won't go outside this */
@@ -153,21 +158,27 @@ void popup_show(ObPopup *self, gchar *text)
     RrMinSize(self->a_text, &textw, &texth);
     texth += ob_rr_theme->paddingy * 2;
 
+    ypadding = (t+b + ob_rr_theme->paddingy * 2);
+
     /* set the sizes up and reget the text sizes from the calculated
        outer sizes */
     if (self->h) {
         h = self->h;
-        texth = h - (t+b + ob_rr_theme->paddingy * 2);
+        texth = h - ypadding;
     } else
-        h = t+b + texth + ob_rr_theme->paddingy * 2;
+        h = texth + ypadding;
+
     iconw = (self->hasicon ? texth : 0);
-    if (self->w) {
-        w = self->w;
-        textw = w - (l+r + iconw + ob_rr_theme->paddingx *
-                     (self->hasicon ? 3 : 2));
-    } else
-        w = l+r + textw + iconw + ob_rr_theme->paddingx *
-            (self->hasicon ? 3 : 2);
+    xpadding = l+r + iconw + ob_rr_theme->paddingx *
+        (self->hasicon ? 3 : 2);
+
+    if (self->w)
+        textw = self->w;
+    w = textw + xpadding;
+    /* cap it at "maxw" */
+    if (self->maxw) w = MIN(w, self->maxw);
+    textw = w - xpadding;
+
     /* sanity checks to avoid crashes! */
     if (w < 1) w = 1;
     if (h < 1) h = 1;
@@ -230,10 +241,19 @@ void popup_show(ObPopup *self, gchar *text)
                             iconw, texth, self->draw_icon_data);
     }
 
+    /* do the actual showing */
     if (!self->mapped) {
-        XMapWindow(ob_display, self->bg);
-        stacking_raise(INTERNAL_AS_WINDOW(self));
-        self->mapped = TRUE;
+        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);
+        }
     }
 }
 
@@ -245,6 +265,9 @@ void popup_hide(ObPopup *self)
 
         /* kill enter events cause by this unmapping */
         event_ignore_queued_enters();
+    } else if (self->delay_mapped) {
+        ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
+        self->delay_mapped = FALSE;
     }
 }
 
@@ -288,8 +311,8 @@ void icon_popup_free(ObIconPopup *self)
     }
 }
 
-void icon_popup_show(ObIconPopup *self,
-                     gchar *text, const ObClientIcon *icon)
+void icon_popup_delay_show(ObIconPopup *self, gulong usec,
+                           gchar *text, const ObClientIcon *icon)
 {
     if (icon) {
         self->a_icon->texture[0].type = RR_TEXTURE_RGBA;
@@ -299,7 +322,7 @@ void icon_popup_show(ObIconPopup *self,
     } else
         self->a_icon->texture[0].type = RR_TEXTURE_NONE;
 
-    popup_show(self->popup, text);
+    popup_delay_show(self->popup, usec, text);
 }
 
 static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
@@ -427,6 +450,7 @@ ObPagerPopup *pager_popup_new()
     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;
 
@@ -448,7 +472,8 @@ void pager_popup_free(ObPagerPopup *self)
     }
 }
 
-void pager_popup_show(ObPagerPopup *self, gchar *text, guint desk)
+void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
+                            gchar *text, guint desk)
 {
     guint i;
 
@@ -475,5 +500,5 @@ void pager_popup_show(ObPagerPopup *self, gchar *text, guint desk)
     self->desks = screen_num_desktops;
     self->curdesk = desk;
 
-    popup_show(self->popup, text);
+    popup_delay_show(self->popup, usec, text);
 }