/* This is used when the popup is in icon mode */
Window icon_mode_text;
+ Window list_mode_up;
+ Window list_mode_down;
+
GList *targets;
gint n_targets;
RrAppearance *a_text;
RrAppearance *a_hilite_text;
RrAppearance *a_icon;
+ RrAppearance *a_arrow;
gboolean mapped;
ObFocusCyclePopupMode mode;
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_arrow = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
popup.a_hilite_text->surface.parent = popup.a_bg;
popup.a_text->surface.parent = popup.a_bg;
popup.a_icon->texture[0].type = RR_TEXTURE_RGBA;
+ popup.a_arrow->texture[0].type = RR_TEXTURE_MASK;
+ popup.a_arrow->texture[0].data.mask.color =
+ ob_rr_theme->osd_color;
+
attrib.override_redirect = True;
attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color);
popup.bg = create_window(obt_root(ob_screen), ob_rr_theme->obwidth,
/* create the text window used for the icon-mode popup */
popup.icon_mode_text = create_window(popup.bg, 0, 0, NULL);
+ /* create the windows for the up and down arrows */
+ popup.list_mode_up = create_window(popup.bg, 0, 0, NULL);
+ popup.list_mode_down = create_window(popup.bg, 0, 0, NULL);
+
popup.targets = NULL;
popup.n_targets = 0;
popup.last_target = NULL;
{
/* the border of the target */
a = 0x88;
- }
- else {
+ } else {
/* the background of the target */
a = 0x22;
}
g_free(popup.a_icon->texture[1].data.rgba.data);
popup.a_icon->texture[1].data.rgba.data = NULL;
+ XDestroyWindow(obt_display, popup.list_mode_up);
+ XDestroyWindow(obt_display, popup.list_mode_down);
XDestroyWindow(obt_display, popup.icon_mode_text);
XDestroyWindow(obt_display, popup.bg);
+ RrAppearanceFree(popup.a_arrow);
RrAppearanceFree(popup.a_icon);
RrAppearanceFree(popup.a_hilite_text);
RrAppearanceFree(popup.a_text);
p->a_text->texture[0].data.text.string = text;
maxwidth = MAX(maxwidth, RrMinWidth(p->a_text));
- if (!create_targets)
+ if (!create_targets) {
g_free(text);
- else {
+ } else {
ObFocusCyclePopupTarget *t = g_new(ObFocusCyclePopupTarget, 1);
t->client = ft;
/* vars for list mode */
gint list_mode_icon_column_w = HILITE_SIZE + OUTSIDE_BORDER;
+ gint up_arrow_x, down_arrow_x;
+ gint up_arrow_y, down_arrow_y;
+ gboolean showing_arrows = FALSE;
g_assert(p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ||
p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST);
/* how many rows do we need? */
icon_rows = (p->n_targets-1) / icons_per_row + 1;
-
- }
- else {
+ } else {
/* in list mode, there is one column of icons.. */
icons_per_row = 1;
/* maximum is 80% of the screen height */
(4*screen_area->height/5) /* 80% of the screen */
/
MAX(HILITE_SIZE, texth)); /* height of each row */
+ /* but make sure there is always one */
+ icon_rows = MAX(icon_rows, 1);
}
/* get the text width */
/* leave space on the side for the icons */
textw -= list_mode_icon_column_w;
+ if (!p->mapped)
+ /* reset the scrolling when the dialog is first shown */
+ p->scroll = 0;
+
+ /* show the scroll arrows when appropriate */
+ if (p->scroll && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
+ XMapWindow(obt_display, p->list_mode_up);
+ showing_arrows = TRUE;
+ } else
+ XUnmapWindow(obt_display, p->list_mode_up);
+
+ if (p->scroll < p->n_targets - icon_rows &&
+ p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+ {
+ XMapWindow(obt_display, p->list_mode_down);
+ showing_arrows = TRUE;
+ } else
+ XUnmapWindow(obt_display, p->list_mode_down);
+
/* find the height of the dialog */
h = t + b + (icon_rows * MAX(HILITE_SIZE, texth));
if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS)
/* in icon mode the text sits below the icons, so make some space */
h += OUTSIDE_BORDER + texth;
+ else if (showing_arrows)
+ h += ob_rr_theme->up_arrow_mask->height + OUTSIDE_BORDER
+ + ob_rr_theme->down_arrow_mask->height + OUTSIDE_BORDER;
/* center the icons if there is less than one row */
if (icon_rows == 1)
XMoveResizeWindow(obt_display, p->icon_mode_text,
icon_mode_textx, icon_mode_texty, textw, texth);
XMapWindow(obt_display, popup.icon_mode_text);
- }
- else
+ } else {
XUnmapWindow(obt_display, popup.icon_mode_text);
- /* reset the scrolling when the dialog is first shown */
- p->scroll = 0;
+ up_arrow_x = (w - ob_rr_theme->up_arrow_mask->width) / 2;
+ up_arrow_y = t;
+
+ down_arrow_x = (w - ob_rr_theme->down_arrow_mask->width) / 2;
+ down_arrow_y = h - b - ob_rr_theme->down_arrow_mask->height;
+
+ /* position the arrows */
+ XMoveResizeWindow(obt_display, p->list_mode_up,
+ up_arrow_x, up_arrow_y,
+ ob_rr_theme->up_arrow_mask->width,
+ ob_rr_theme->up_arrow_mask->height);
+ XMoveResizeWindow(obt_display, p->list_mode_down,
+ down_arrow_x, down_arrow_y,
+ ob_rr_theme->down_arrow_mask->width,
+ ob_rr_theme->down_arrow_mask->height);
+ }
}
/* find the focused target */
if (top - selected_pos >= 0) {
p->scroll -= top - selected_pos + 1;
p->scroll = MAX(p->scroll, min_scroll);
- }
- else if (selected_pos - bottom >= 0) {
+ } else if (selected_pos - bottom >= 0) {
p->scroll += selected_pos - bottom + 1;
p->scroll = MIN(p->scroll, max_scroll);
}
if (!p->mapped)
RrPaint(p->a_bg, p->bg, w, h);
+ /* draw the scroll arrows */
+ if (!p->mapped && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
+ p->a_arrow->texture[0].data.mask.mask =
+ ob_rr_theme->up_arrow_mask;
+ p->a_arrow->surface.parent = p->a_bg;
+ p->a_arrow->surface.parentx = up_arrow_x;
+ p->a_arrow->surface.parenty = up_arrow_y;
+ RrPaint(p->a_arrow, p->list_mode_up,
+ ob_rr_theme->up_arrow_mask->width,
+ ob_rr_theme->up_arrow_mask->height);
+
+ p->a_arrow->texture[0].data.mask.mask =
+ ob_rr_theme->down_arrow_mask;
+ p->a_arrow->surface.parent = p->a_bg;
+ p->a_arrow->surface.parentx = down_arrow_x;
+ p->a_arrow->surface.parenty = down_arrow_y;
+ RrPaint(p->a_arrow, p->list_mode_down,
+ ob_rr_theme->down_arrow_mask->width,
+ ob_rr_theme->down_arrow_mask->height);
+ }
+
/* draw the icons and text */
for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) {
const ObFocusCyclePopupTarget *target = it->data;
/* find the coordinates for the icon */
iconx = icons_center_x + l + (col * HILITE_SIZE);
- icony = t + (row * MAX(texth, HILITE_SIZE))
+ icony = t + (showing_arrows ? ob_rr_theme->up_arrow_mask->height
+ + OUTSIDE_BORDER
+ : 0)
+ + (row * MAX(texth, HILITE_SIZE))
+ MAX(texth - HILITE_SIZE, 0) / 2;
/* find the dimensions of the text box */
XMapWindow(obt_display, target->textwin);
else
XUnmapWindow(obt_display, target->textwin);
- }
- else {
+ } else {
XUnmapWindow(obt_display, target->textwin);
if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
XUnmapWindow(obt_display, target->iconwin);
XMapWindow(obt_display, target->iconwin);
}
- /* only draw if we have to */
- if (!p->mapped ||
- newtarget == target || p->last_target == target ||
- /* wasn't visible before... */
- ((row + p->scroll < last_scroll ||
- row + p->scroll >= last_scroll + icon_rows) &&
- /* ...and is visible now */
- (row >= 0 && row < icon_rows)))
+ /* 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 =
+ target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
+ p->a_icon->texture[0].data.rgba.data = icon->data;
+
+ /* Draw the hilite? */
+ p->a_icon->texture[1].type = (target == newtarget) ?
+ RR_TEXTURE_RGBA : RR_TEXTURE_NONE;
+
+ /* draw the icon */
+ p->a_icon->surface.parentx = iconx;
+ p->a_icon->surface.parenty = icony;
+ RrPaint(p->a_icon, target->iconwin, HILITE_SIZE, HILITE_SIZE);
+
+ /* draw the text */
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST ||
+ target == newtarget)
{
- /* 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 =
- target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
- p->a_icon->texture[0].data.rgba.data = icon->data;
-
- /* Draw the hilite? */
- p->a_icon->texture[1].type = (target == newtarget) ?
- RR_TEXTURE_RGBA : RR_TEXTURE_NONE;
-
- /* draw the icon */
- p->a_icon->surface.parentx = iconx;
- p->a_icon->surface.parenty = icony;
- RrPaint(p->a_icon, target->iconwin, HILITE_SIZE, HILITE_SIZE);
-
- /* draw the text */
- if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST ||
- target == newtarget)
- {
- text = (target == newtarget) ? p->a_hilite_text : p->a_text;
- text->texture[0].data.text.string = target->text;
- text->surface.parentx =
- p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
- icon_mode_textx : list_mode_textx;
- text->surface.parenty =
- p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
- icon_mode_texty : list_mode_texty;
- RrPaint(text,
- (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
- p->icon_mode_text : target->textwin),
- textw, texth);
- }
+ text = (target == newtarget) ? p->a_hilite_text : p->a_text;
+ text->texture[0].data.text.string = target->text;
+ text->surface.parentx =
+ p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
+ icon_mode_textx : list_mode_textx;
+ text->surface.parenty =
+ p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
+ icon_mode_texty : list_mode_texty;
+ RrPaint(text,
+ (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
+ p->icon_mode_text : target->textwin),
+ textw, texth);
}
}
}
projects / chaz / openbox / blobdiff