#include "render/render.h"
#include "render/theme.h"
-ObPopup *popup_new()
+ObPopup *popup_new(void)
{
XSetWindowAttributes attrib;
ObPopup *self = g_new0(ObPopup, 1);
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);
XMapWindow(ob_display, self->text);
stacking_add(INTERNAL_AS_WINDOW(self));
+ g_hash_table_insert(window_map, &self->bg, self);
return self;
}
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);
}
self->a_text->texture[0].data.text.string = text;
self->textw = RrMinWidth(self->a_text);
} else
- self->textw = 0;
+ self->textw = 0;
}
void popup_height_to_string(ObPopup *self, gchar *text)
static gboolean popup_show_timeout(gpointer data)
{
ObPopup *self = data;
-
+
XMapWindow(ob_display, self->bg);
stacking_raise(INTERNAL_AS_WINDOW(self));
self->mapped = TRUE;
{
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;
-
- area = screen_physical_area();
+ 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
texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
- if (!(self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL))
+ /* when there is no icon, then fill the whole dialog with the text
+ appearance
+ */
+ if (!self->hasicon)
{
textx = texty = 0;
texth += emptyy;
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);
+ /* 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);
RrPaint(self->a_icon, self->icon, w, h);
}
-ObIconPopup *icon_popup_new()
+ObIconPopup *icon_popup_new(void)
{
ObIconPopup *self;
self = g_new0(ObIconPopup, 1);
- self->popup = popup_new(TRUE);
+ 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,
}
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);
}
}
}
-ObPagerPopup *pager_popup_new()
+ObPagerPopup *pager_popup_new(void)
{
ObPagerPopup *self;
self = g_new(ObPagerPopup, 1);
- self->popup = popup_new(TRUE);
+ self->popup = popup_new();
self->desks = 0;
self->wins = g_new(Window, self->desks);
for (i = self->desks; i < screen_num_desktops; ++i) {
XSetWindowAttributes attr;
- attr.border_pixel =
+ 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,