#include <X11/Xlib.h>
#include <glib.h>
-#define ICON_SIZE 40
-#define ICON_HILITE_WIDTH 2
-#define ICON_HILITE_MARGIN 1
+#define HILITE_SIZE 40
+#define HILITE_WIDTH 2
+#define HILITE_MARGIN 1
+#define HILITE_OFFSET (HILITE_WIDTH + HILITE_MARGIN)
+#define ICON_SIZE (HILITE_SIZE - 2*HILITE_OFFSET)
#define OUTSIDE_BORDER 3
#define TEXT_BORDER 2
RrAppearance *a_bg;
RrAppearance *a_text;
+ RrAppearance *a_hilite_text;
RrAppearance *a_icon;
- RrPixel32 *hilite_rgba;
-
gboolean mapped;
};
void focus_cycle_popup_startup(gboolean reconfig)
{
XSetWindowAttributes attrib;
+ RrPixel32 *p;
single_popup = icon_popup_new();
popup.obwin.type = OB_WINDOW_CLASS_INTERNAL;
popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
- popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
+ popup.a_hilite_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
+ popup.a_text = RrAppearanceCopy(ob_rr_theme->a_unfocused_label);
popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear);
+ popup.a_hilite_text->surface.parent = popup.a_bg;
popup.a_text->surface.parent = popup.a_bg;
popup.a_icon->surface.parent = popup.a_bg;
RrAppearanceAddTextures(popup.a_icon, 2);
- popup.a_icon->texture[1].type = RR_TEXTURE_RGBA;
+ popup.a_icon->texture[0].type = RR_TEXTURE_RGBA;
attrib.override_redirect = True;
attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color);
popup.n_targets = 0;
popup.last_target = NULL;
- popup.hilite_rgba = NULL;
+ /* set up the hilite texture for the icon */
+ popup.a_icon->texture[1].data.rgba.width = HILITE_SIZE;
+ popup.a_icon->texture[1].data.rgba.height = HILITE_SIZE;
+ popup.a_icon->texture[1].data.rgba.alpha = 0xff;
+ p = g_new(RrPixel32, HILITE_SIZE * HILITE_SIZE);
+ popup.a_icon->texture[1].data.rgba.data = p;
+
+ /* create the hilite under the target icon */
+ {
+ RrPixel32 color;
+ gint x, y, o;
+
+ color = ((ob_rr_theme->osd_color->r & 0xff) << RrDefaultRedOffset) +
+ ((ob_rr_theme->osd_color->g & 0xff) << RrDefaultGreenOffset) +
+ ((ob_rr_theme->osd_color->b & 0xff) << RrDefaultBlueOffset);
+
+ o = 0;
+ for (x = 0; x < HILITE_SIZE; x++)
+ for (y = 0; y < HILITE_SIZE; y++) {
+ guchar a;
+
+ if (x < HILITE_WIDTH ||
+ x >= HILITE_SIZE - HILITE_WIDTH ||
+ y < HILITE_WIDTH ||
+ y >= HILITE_SIZE - HILITE_WIDTH)
+ {
+ /* the border of the target */
+ a = 0x88;
+ }
+ else {
+ /* the background of the target */
+ a = 0x22;
+ }
+
+ p[o++] = color + (a << RrDefaultAlphaOffset);
+ }
+ }
stacking_add(INTERNAL_AS_WINDOW(&popup));
window_add(&popup.bg, INTERNAL_AS_WINDOW(&popup));
popup.targets = g_list_delete_link(popup.targets, popup.targets);
}
- g_free(popup.hilite_rgba);
- popup.hilite_rgba = NULL;
-
XDestroyWindow(obt_display, popup.bg);
RrAppearanceFree(popup.a_icon);
+ RrAppearanceFree(popup.a_hilite_text);
RrAppearanceFree(popup.a_text);
RrAppearanceFree(popup.a_bg);
}
gint x, y, w, h;
Rect *screen_area = NULL;
gint rgbax, rgbay, rgbaw, rgbah;
- gint innerw, innerh;
gint i;
GList *it;
const ObFocusCyclePopupTarget *newtarget;
t = mt + OUTSIDE_BORDER;
b = mb + OUTSIDE_BORDER;
- /* get the icon pictures' sizes */
- innerw = ICON_SIZE - (ICON_HILITE_WIDTH + ICON_HILITE_MARGIN) * 2;
- innerh = ICON_SIZE - (ICON_HILITE_WIDTH + ICON_HILITE_MARGIN) * 2;
-
/* get the width from the text and keep it within limits */
w = l + r + p->maxtextw;
w = MIN(w, MAX(screen_area->width/3, POPUP_WIDTH)); /* max width */
/* find the height of the dialog */
#warning limit the height and scroll entries somehow
- h = t + b + (p->n_targets * ICON_SIZE) + OUTSIDE_BORDER;
+ h = t + b + (p->n_targets * HILITE_SIZE);
/* find the position for the popup (include the outer borders) */
x = screen_area->x + (screen_area->width -
if (!p->mapped) {
/* position the background but don't draw it*/
XMoveResizeWindow(obt_display, p->bg, x, y, w, h);
-
- /* set up the hilite texture for the icon */
- p->a_icon->texture[0].data.rgba.width = ICON_SIZE;
- p->a_icon->texture[0].data.rgba.height = ICON_SIZE;
- p->a_icon->texture[0].data.rgba.alpha = 0xff;
- p->hilite_rgba = g_new(RrPixel32, ICON_SIZE * ICON_SIZE);
- p->a_icon->texture[0].data.rgba.data = p->hilite_rgba;
}
/* find the focused target */
/* save the target */
newtarget = target;
newtargetx = l;
- newtargety = t + i * ICON_SIZE;
+ newtargety = t + i * HILITE_SIZE;
if (!p->mapped)
break; /* if we're not dimensioning, then we're done */
g_assert(newtarget != NULL);
- /* create the hilite under the target icon */
- {
- RrPixel32 color;
- gint i, j, o;
-
- color = ((ob_rr_theme->osd_color->r & 0xff) << RrDefaultRedOffset) +
- ((ob_rr_theme->osd_color->g & 0xff) << RrDefaultGreenOffset) +
- ((ob_rr_theme->osd_color->b & 0xff) << RrDefaultBlueOffset);
-
- o = 0;
- for (x = 0; x < ICON_SIZE; x++)
- for (y = 0; y < ICON_SIZE; y++) {
- guchar a;
-
- if (x < ICON_HILITE_WIDTH ||
- x >= ICON_SIZE - ICON_HILITE_WIDTH ||
- y < ICON_HILITE_WIDTH ||
- y >= ICON_SIZE - ICON_HILITE_WIDTH)
- {
- /* the border of the target */
- a = 0x88;
- }
- else {
- /* the background of the target */
- a = 0x22;
- }
-
- p->hilite_rgba[o++] =
- color + (a << RrDefaultAlphaOffset);
- }
- }
-
/* * * draw everything * * */
/* draw the background */
for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
const ObFocusCyclePopupTarget *target = it->data;
- /* have to redraw the targetted icon and last targetted icon,
- they can pick up the hilite changes in the backgroud */
+ /* have to redraw the targetted icon and last targetted icon
+ * to update the hilite */
if (!p->mapped || newtarget == target || p->last_target == target) {
const ObClientIcon *icon;
- gint innerx, innery;
+ gint innerx, innery, textx, texty;
+ gint textw /* texth = ICON_SIZE */;
+ RrAppearance *text;
/* find the dimensions of the icon inside it */
innerx = l;
- innerx += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN;
- innery = t + i * ICON_SIZE;
- innery += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN;
+ innery = t + i * HILITE_SIZE;
+
+ /* find the dimensions of the text box */
+ textx = innerx + HILITE_SIZE + TEXT_BORDER;
+ texty = innery + HILITE_OFFSET;
+ textw = w
+ /* left edge */ - innerx - HILITE_SIZE - TEXT_BORDER
+ /* right edge */ - OUTSIDE_BORDER - TEXT_BORDER;
/* move the icon */
XMoveResizeWindow(obt_display, target->iconwin,
- innerx, innery, innerw, innerh);
+ innerx, innery, HILITE_SIZE, HILITE_SIZE);
/* move the text */
XMoveResizeWindow(obt_display, target->textwin,
- innerx + ICON_SIZE, innery,
- w - innerx - ICON_SIZE - OUTSIDE_BORDER, innerh);
+ textx, texty,
+ textw, ICON_SIZE);
/* get the icon from the client */
- icon = client_icon(target->client, innerw, innerh);
- p->a_icon->texture[1].data.rgba.width = icon->width;
- p->a_icon->texture[1].data.rgba.height = icon->height;
- p->a_icon->texture[1].data.rgba.alpha =
+ 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 =
target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
- p->a_icon->texture[1].data.rgba.data = icon->data;
+ p->a_icon->texture[0].data.rgba.data = icon->data;
/* Draw the hilite? */
-#warning do i have to add more obrender interface thingers to get it to draw the icon inside the hilight? sigh
- p->a_icon->texture[0].type = (target == newtarget) ?
+ p->a_icon->texture[1].type = (target == newtarget) ?
RR_TEXTURE_RGBA : RR_TEXTURE_NONE;
/* draw the icon */
p->a_icon->surface.parentx = innerx;
p->a_icon->surface.parenty = innery;
- RrPaint(p->a_icon, target->iconwin, innerw, innerh);
+ RrPaint(p->a_icon, target->iconwin, HILITE_SIZE, HILITE_SIZE);
/* draw the text */
- p->a_text->texture[0].data.text.string = target->text;
- p->a_text->surface.parentx = innerx + ICON_SIZE;
- p->a_text->surface.parenty = innery;
- RrPaint(p->a_text, target->textwin, w - innerx - ICON_SIZE - OUTSIDE_BORDER, innerh);
+ text = (target == newtarget) ? p->a_hilite_text : p->a_text;
+ text->texture[0].data.text.string = target->text;
+ text->surface.parentx = textx;
+ text->surface.parenty = texty;
+ RrPaint(text, target->textwin, textw, ICON_SIZE);
}
}
}
popup.n_targets = 0;
popup.last_target = NULL;
-
- g_free(popup.hilite_rgba);
- popup.hilite_rgba = NULL;
}
void focus_cycle_popup_single_show(struct _ObClient *c,
}
text = popup_get_name(c);
- icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE));
+ icon_popup_show(single_popup, text, client_icon(c, HILITE_SIZE,
+ HILITE_SIZE));
g_free(text);
screen_hide_desktop_popup();
}
projects / chaz / openbox / blobdiff