struct _ObFocusCyclePopupTarget
{
ObClient *client;
+ RrImage *icon;
gchar *text;
Window iconwin;
/* This is used when the popup is in list mode */
may or may not be used */
RrAppearanceAddTextures(popup.a_icon, 2);
- popup.a_icon->texture[0].type = RR_TEXTURE_RGBA;
+ RrAppearanceClearTextures(popup.a_icon);
+ popup.a_icon->texture[0].type = RR_TEXTURE_IMAGE;
+ RrAppearanceClearTextures(popup.a_arrow);
popup.a_arrow->texture[0].type = RR_TEXTURE_MASK;
popup.a_arrow->texture[0].data.mask.color =
ob_rr_theme->osd_color;
while(popup.targets) {
ObFocusCyclePopupTarget *t = popup.targets->data;
+ RrImageUnref(t->icon);
g_free(t->text);
XDestroyWindow(obt_display, t->iconwin);
XDestroyWindow(obt_display, t->textwin);
+ g_free(t);
popup.targets = g_list_delete_link(popup.targets, popup.targets);
}
t->client = ft;
t->text = text;
+ t->icon = client_icon(t->client);
+ RrImageRef(t->icon); /* own the icon so it won't go away */
t->iconwin = create_window(p->bg, 0, 0, NULL);
t->textwin = create_window(p->bg, 0, 0, NULL);
/* get the text height */
texth = RrMinHeight(p->a_hilite_text);
if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
- texth = MAX(MAX(texth, RrMinHeight(p->a_text)), ICON_SIZE);
+ texth = MAX(MAX(texth, RrMinHeight(p->a_text)), HILITE_SIZE);
else
texth += TEXT_BORDER * 2;
/* row and column start from 0 */
const gint row = i / icons_per_row - p->scroll;
const gint col = i % icons_per_row;
- const ObClientIcon *icon;
gint iconx, icony;
gint list_mode_textx, list_mode_texty;
RrAppearance *text;
/* find the dimensions of the text box */
list_mode_textx = iconx + HILITE_SIZE + TEXT_BORDER;
- list_mode_texty = icony + HILITE_OFFSET;
+ list_mode_texty = icony;
/* position the icon */
XMoveResizeWindow(obt_display, target->iconwin,
}
/* get the icon from the client */
- icon = client_icon(target->client, ICON_SIZE, ICON_SIZE);
- p->a_icon->texture[0].data.rgba.width = icon->width;
- p->a_icon->texture[0].data.rgba.height = icon->height;
- p->a_icon->texture[0].data.rgba.twidth = ICON_SIZE;
- p->a_icon->texture[0].data.rgba.theight = ICON_SIZE;
- p->a_icon->texture[0].data.rgba.tx = HILITE_OFFSET;
- p->a_icon->texture[0].data.rgba.ty = HILITE_OFFSET;
- p->a_icon->texture[0].data.rgba.alpha =
+ p->a_icon->texture[0].data.image.twidth = ICON_SIZE;
+ p->a_icon->texture[0].data.image.theight = ICON_SIZE;
+ p->a_icon->texture[0].data.image.tx = HILITE_OFFSET;
+ p->a_icon->texture[0].data.image.ty = HILITE_OFFSET;
+ p->a_icon->texture[0].data.image.alpha =
target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
- p->a_icon->texture[0].data.rgba.data = icon->data;
+ p->a_icon->texture[0].data.image.image = target->icon;
/* Draw the hilite? */
p->a_icon->texture[1].type = (target == newtarget) ?
while(popup.targets) {
ObFocusCyclePopupTarget *t = popup.targets->data;
+ RrImageUnref(t->icon);
g_free(t->text);
XDestroyWindow(obt_display, t->iconwin);
XDestroyWindow(obt_display, t->textwin);
}
text = popup_get_name(c);
- icon_popup_show(single_popup, text, client_icon(c, HILITE_SIZE,
- HILITE_SIZE));
+ icon_popup_show(single_popup, text, client_icon(c));
g_free(text);
screen_hide_desktop_popup();
}