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(ObPopup *self)
{
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);
RrAppearanceFree(self->a_bg);
RrAppearanceFree(self->a_text);
+ g_hash_table_remove(window_map, &self->bg);
stacking_remove(self);
g_free(self);
}
{
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;
- RECT_SET(mon, self->x, self->y, 1, 1);
- area = screen_physical_area_monitor(screen_find_monitor(&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
*/
break;
}
- x=MAX(MIN(x, area->width-w),0);
- y=MAX(MIN(y, area->height-h),0);
+ /* 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 */
XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
popup_show_timeout(self);
}
}
-
- g_free(area);
}
void popup_hide(ObPopup *self)
event_end_ignore_all_enters(ignore_start);
} else if (self->delay_mapped) {
- ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
+ ob_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE);
self->delay_mapped = FALSE;
}
}
}
void icon_popup_delay_show(ObIconPopup *self, gulong usec,
- gchar *text, const ObClientIcon *icon)
+ gchar *text, RrImage *icon)
{
if (icon) {
- self->a_icon->texture[0].type = RR_TEXTURE_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.alpha = 0xff;
- self->a_icon->texture[0].data.rgba.data = icon->data;
- } else
+ 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);
}