#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;
void popup_width(ObPopup *self, gint w)
{
self->w = w;
+ self->maxw = w;
}
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)
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);
}
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;
} else
h = t+b + texth + ob_rr_theme->paddingy * 2;
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);
+ if (self->w)
+ textw = self->w;
+ w = l+r + textw + iconw + ob_rr_theme->paddingx *
+ (self->hasicon ? 3 : 2);
+ /* cap it at "maxw" */
+ w = MIN(w, self->maxw);
+
/* sanity checks to avoid crashes! */
if (w < 1) w = 1;
if (h < 1) h = 1;
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);
+ }
}
}
/* 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;
}
}
}
}
-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;
} 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,
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;
}
}
-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;
self->desks = screen_num_desktops;
self->curdesk = desk;
- popup_show(self->popup, text);
+ popup_delay_show(self->popup, usec, text);
}