#include "stacking.h"
#include "event.h"
#include "screen.h"
-#include "render/render.h"
-#include "render/theme.h"
+#include "obrender/render.h"
+#include "obrender/theme.h"
ObPopup *popup_new(void)
{
XSetWindowAttributes attrib;
- ObPopup *self = g_new0(ObPopup, 1);
+ ObPopup *self = g_slice_new0(ObPopup);
self->obwin.type = OB_WINDOW_CLASS_INTERNAL;
self->gravity = NorthWestGravity;
self->x = self->y = self->textw = self->h = 0;
- self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
+ self->a_bg = RrAppearanceCopy(ob_rr_theme->osd_bg);
self->a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
self->iconwm = self->iconhm = 1;
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(obt_display, self->bg);
XDestroyWindow(obt_display, self->text);
RrAppearanceFree(self->a_bg);
RrAppearanceFree(self->a_text);
window_remove(self->bg);
stacking_remove(self);
- g_free(self);
+ g_slice_free(ObPopup, self);
}
}
stacking_raise(INTERNAL_AS_WINDOW(self));
self->mapped = TRUE;
self->delay_mapped = FALSE;
+ self->delay_timer = 0;
return FALSE; /* don't repeat */
}
-void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
+void popup_delay_show(ObPopup *self, gulong msec, gchar *text)
{
gint l, t, r, b;
gint x, y, w, h;
gint emptyx, emptyy; /* empty space between elements */
gint textx, texty, textw, texth;
gint iconx, icony, iconw, iconh;
- Rect *area, mon;
+ const Rect *area;
+ Rect mon;
+ gboolean hasicon = self->hasicon;
/* 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)
+ if (hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
RrMargins(self->a_bg, &l, &t, &r, &b);
else
l = t = r = b = 0;
iconx = textx = l + ob_rr_theme->paddingx;
emptyx = l + r + ob_rr_theme->paddingx * 2;
- if (self->hasicon) {
+ if (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 */
+ icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
} else
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)
+ if (!hasicon)
{
textx = texty = 0;
texth += emptyy;
emptyx = emptyy = 0;
}
+ if (texth > textw) textw = texth;
+ popup_set_text_align(self, RR_JUSTIFY_CENTER);
+
w = textw + emptyx + iconw;
/* cap it at maxw/minw */
if (self->maxw) w = MIN(w, self->maxw);
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);
+ /* If the popup belongs to a client (eg, the moveresize popup), get
+ * the monitor for that client, otherwise do other stuff */
+ if (self->client) {
+ m = client_monitor(self->client);
+ } else {
+ /* 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);
+ x = MAX(MIN(x, area->x+area->width-w), area->x);
+ y = MAX(MIN(y, area->y+area->height-h), area->y);
if (m == screen_num_monitors) {
RECT_SET(mon, x, y, w, h);
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);
+ x = MAX(MIN(x, area->x+area->width-w), area->x);
+ y = MAX(MIN(y, area->y+area->height-h), area->y);
}
/* set the windows/appearances up */
/* 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)
+ if (hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
RrPaint(self->a_bg, self->bg, w, h);
if (textw) {
RrPaint(self->a_text, self->text, textw, texth);
}
- if (self->hasicon)
+ if (hasicon)
self->draw_icon(iconx, icony, iconw, iconh, self->draw_icon_data);
/* do the actual showing */
if (!self->mapped) {
- if (usec) {
+ if (msec) {
/* don't kill previous show timers */
if (!self->delay_mapped) {
- obt_main_loop_timeout_add(ob_main_loop, usec,
- popup_show_timeout, self,
- g_direct_equal, NULL);
+ self->delay_timer =
+ g_timeout_add(msec, popup_show_timeout, self);
self->delay_mapped = TRUE;
}
} else {
event_end_ignore_all_enters(ignore_start);
} else if (self->delay_mapped) {
- obt_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
+ g_source_remove(self->delay_timer);
+ self->delay_timer = 0;
self->delay_mapped = FALSE;
}
}
{
ObIconPopup *self;
- self = g_new0(ObIconPopup, 1);
+ self = g_slice_new0(ObIconPopup);
self->popup = popup_new();
self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
self->icon = XCreateWindow(obt_display, self->popup->bg,
XDestroyWindow(obt_display, self->icon);
RrAppearanceFree(self->a_icon);
popup_free(self->popup);
- g_free(self);
+ g_slice_free(ObIconPopup, self);
}
}
-void icon_popup_delay_show(ObIconPopup *self, gulong usec,
- gchar *text, const ObClientIcon *icon)
+void icon_popup_delay_show(ObIconPopup *self, gulong msec,
+ 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);
+ popup_delay_show(self->popup, msec, text);
}
void icon_popup_icon_size_multiplier(ObIconPopup *self, guint wm, guint hm)
{
ObPagerPopup *self;
- self = g_new(ObPagerPopup, 1);
+ self = g_slice_new(ObPagerPopup);
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->hilight = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
+ self->unhilight = RrAppearanceCopy(ob_rr_theme->osd_unhilite_bg);
self->popup->hasicon = TRUE;
self->popup->draw_icon = pager_popup_draw_icon;
RrAppearanceFree(self->hilight);
RrAppearanceFree(self->unhilight);
popup_free(self->popup);
- g_free(self);
+ g_slice_free(ObPagerPopup, self);
}
}
-void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
+void pager_popup_delay_show(ObPagerPopup *self, gulong msec,
gchar *text, guint desk)
{
guint i;
self->desks = screen_num_desktops;
self->curdesk = desk;
- popup_delay_show(self->popup, usec, text);
+ popup_delay_show(self->popup, msec, text);
}
void pager_popup_icon_size_multiplier(ObPagerPopup *self, guint wm, guint hm)
projects / mikachu / openbox.git / blobdiff