#define OUTSIDE_BORDER 3
/* Margin area around the text */
#define TEXT_BORDER 2
+/* Scroll the list-mode list when the cursor gets within this many rows of the
+ top or bottom */
+#define SCROLL_MARGIN 4
typedef struct _ObFocusCyclePopup ObFocusCyclePopup;
typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget;
/* 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;
gint maxtextw;
+ /* How are the list is scrolled, in scroll mode */
+ gint scroll;
+
RrAppearance *a_bg;
RrAppearance *a_text;
RrAppearance *a_hilite_text;
RrAppearance *a_icon;
+ RrAppearance *a_arrow;
gboolean mapped;
+ ObFocusCyclePopupMode mode;
};
/*! This popup shows all possible windows */
gboolean dock_windows,
gboolean desktop_windows);
static void popup_render (ObFocusCyclePopup *p,
- const ObClient *c,
- ObFocusCyclePopupMode mode);
+ const ObClient *c);
static Window create_window(Window parent, guint bwidth, gulong mask,
XSetWindowAttributes *attr)
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);
- XMapWindow(obt_display, popup.icon_mode_text);
+
+ /* 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;
{
/* 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;
t->iconwin = create_window(p->bg, 0, 0, NULL);
t->textwin = create_window(p->bg, 0, 0, NULL);
- XMapWindow(obt_display, t->iconwin);
- XMapWindow(obt_display, t->textwin);
-
p->targets = g_list_prepend(p->targets, t);
++n;
}
return ret;
}
-static void popup_render(ObFocusCyclePopup *p, const ObClient *c,
- ObFocusCyclePopupMode mode)
+static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
{
gint ml, mt, mr, mb;
gint l, t, r, b;
gint icons_per_row;
gint icon_rows;
gint textw, texth;
+ gint selected_pos;
+ gint last_scroll;
/* vars for icon mode */
gint icon_mode_textx;
/* 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;
- g_assert(mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ||
- mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST);
+ g_assert(p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ||
+ p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST);
screen_area = screen_physical_area_active();
/* get the width from the text and keep it within limits */
w = l + r + p->maxtextw;
- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
/* when in list mode, there are icons down the side */
w += list_mode_icon_column_w;
w = MIN(w, MAX(screen_area->width/3, POPUP_WIDTH)); /* max width */
w = MAX(w, POPUP_WIDTH); /* min width */
- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) {
+ /* 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);
+ else
+ texth += TEXT_BORDER * 2;
+
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) {
/* how many icons will fit in that row? make the width fit that */
w -= l + r;
icons_per_row = (w + HILITE_SIZE - 1) / HILITE_SIZE;
/* 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;
- icon_rows = p->n_targets;
+ /* maximum is 80% of the screen height */
+ icon_rows = MIN(p->n_targets,
+ (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 dimensions */
+ /* get the text width */
textw = w - l - r;
- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
/* leave space on the side for the icons */
textw -= list_mode_icon_column_w;
- texth = RrMinHeight(p->a_text) + TEXT_BORDER * 2;
/* find the height of the dialog */
-#warning limit the height and scroll entries somehow
h = t + b + (icon_rows * MAX(HILITE_SIZE, texth));
- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS)
+ 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
+ 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)
else
icons_center_x = 0;
- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) {
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) {
/* get the position of the text */
icon_mode_textx = l;
icon_mode_texty = h - texth - b;
/* position the background but don't draw it */
XMoveResizeWindow(obt_display, p->bg, x, y, w, h);
- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS)
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) {
/* position the text */
XMoveResizeWindow(obt_display, p->icon_mode_text,
icon_mode_textx, icon_mode_texty, textw, texth);
+ XMapWindow(obt_display, popup.icon_mode_text);
+ } else {
+ XUnmapWindow(obt_display, popup.icon_mode_text);
+
+ 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);
+ }
+
+
+ /* reset the scrolling when the dialog is first shown */
+ p->scroll = 0;
}
/* find the focused target */
break;
}
}
+ selected_pos = i;
+
+ /* scroll the list if needed */
+ last_scroll = p->scroll;
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) {
+ const gint top = p->scroll + SCROLL_MARGIN;
+ const gint bottom = p->scroll + icon_rows - SCROLL_MARGIN;
+ const gint min_scroll = 0;
+ const gint max_scroll = p->n_targets - icon_rows;
+
+ if (top - selected_pos >= 0) {
+ p->scroll -= top - selected_pos + 1;
+ p->scroll = MAX(p->scroll, min_scroll);
+ } else if (selected_pos - bottom >= 0) {
+ p->scroll += selected_pos - bottom + 1;
+ p->scroll = MIN(p->scroll, max_scroll);
+ }
+ }
g_assert(newtarget != NULL);
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);
+ }
+
+ /* show the scroll arrows when appropriate */
+ if (p->scroll && p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+ XMapWindow(obt_display, p->list_mode_up);
+ 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);
+ else
+ XUnmapWindow(obt_display, p->list_mode_down);
+
/* draw the icons and text */
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
* to update the hilite */
- if (!p->mapped || newtarget == target || p->last_target == target) {
- const gint row = i / icons_per_row; /* starting from 0 */
- const gint col = i % icons_per_row; /* starting from 0 */
+ if (!p->mapped || newtarget == target || p->last_target == target ||
+ last_scroll != p->scroll)
+ {
+ /* 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;
/* find the coordinates for the icon */
iconx = icons_center_x + l + (col * HILITE_SIZE);
- icony = t + (row * MAX(texth, HILITE_SIZE))
+ icony = t + ob_rr_theme->up_arrow_mask->height + OUTSIDE_BORDER
+ + (row * MAX(texth, HILITE_SIZE))
+ MAX(texth - HILITE_SIZE, 0) / 2;
/* find the dimensions of the text box */
list_mode_textx = iconx + HILITE_SIZE + TEXT_BORDER;
list_mode_texty = icony + HILITE_OFFSET;
-// textw = w
-// /* left edge */ - innerx - HILITE_SIZE - TEXT_BORDER
-// /* right edge */ - OUTSIDE_BORDER - TEXT_BORDER;
/* position the icon */
XMoveResizeWindow(obt_display, target->iconwin,
iconx, icony, HILITE_SIZE, HILITE_SIZE);
/* position the text */
- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
XMoveResizeWindow(obt_display, target->textwin,
list_mode_textx, list_mode_texty,
textw, texth);
+ /* show/hide the right windows */
+ if (row >= 0 && row < icon_rows) {
+ XMapWindow(obt_display, target->iconwin);
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+ XMapWindow(obt_display, target->textwin);
+ else
+ XUnmapWindow(obt_display, target->textwin);
+ } else {
+ XUnmapWindow(obt_display, target->textwin);
+ if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST)
+ XUnmapWindow(obt_display, target->iconwin);
+ else
+ XMapWindow(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;
/* Draw the hilite? */
p->a_icon->texture[1].type = (target == newtarget) ?
- RR_TEXTURE_RGBA : RR_TEXTURE_NONE;
+ RR_TEXTURE_RGBA : RR_TEXTURE_NONE;
/* draw the icon */
p->a_icon->surface.parentx = iconx;
RrPaint(p->a_icon, target->iconwin, HILITE_SIZE, HILITE_SIZE);
/* draw the text */
- if (mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST || target == newtarget)
+ 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 =
- mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
+ p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
icon_mode_textx : list_mode_textx;
text->surface.parenty =
- mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
+ p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
icon_mode_texty : list_mode_texty;
RrPaint(text,
- (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
+ (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ?
p->icon_mode_text : target->textwin),
textw, texth);
}
p->last_target = newtarget;
g_free(screen_area);
+
+ XFlush(obt_display);
}
void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
}
/* do this stuff only when the dialog is first showing */
- if (!popup.mapped)
- popup_setup(&popup, TRUE, iconic_windows, all_desktops,
+ if (!popup.mapped) {
+ popup_setup(&popup, TRUE, iconic_windows, all_desktops,
dock_windows, desktop_windows);
+ /* this is fixed once the dialog is shown */
+ popup.mode = mode;
+ }
g_assert(popup.targets != NULL);
- popup_render(&popup, c, mode);
+ popup_render(&popup, c);
if (!popup.mapped) {
/* show the dialog */
projects / chaz / openbox / blobdiff