X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=ceab3ca1b3cb6d20116816b5fd12838bcc77ec18;hb=de85e4f1d96c911c7c9dc7c2a9b514b13b028aec;hp=1d37ae9c0c3ee7c06b4562f0249feb8f9a2fe392;hpb=92bbd733fa1a8fbc5eebf207932bf26be0251894;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 1d37ae9c..ceab3ca1 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -68,6 +68,9 @@ struct _ObFocusCyclePopup /* 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; @@ -82,6 +85,7 @@ struct _ObFocusCyclePopup RrAppearance *a_text; RrAppearance *a_hilite_text; RrAppearance *a_icon; + RrAppearance *a_arrow; gboolean mapped; ObFocusCyclePopupMode mode; @@ -122,6 +126,7 @@ void focus_cycle_popup_startup(gboolean reconfig) 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; @@ -136,6 +141,10 @@ void focus_cycle_popup_startup(gboolean reconfig) 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, @@ -144,6 +153,10 @@ void focus_cycle_popup_startup(gboolean reconfig) /* 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; @@ -176,8 +189,7 @@ void focus_cycle_popup_startup(gboolean reconfig) { /* the border of the target */ a = 0x88; - } - else { + } else { /* the background of the target */ a = 0x22; } @@ -210,9 +222,12 @@ void focus_cycle_popup_shutdown(gboolean reconfig) 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); @@ -250,9 +265,9 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, 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; @@ -320,6 +335,9 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* 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); @@ -358,9 +376,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* 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 */ @@ -378,14 +394,68 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* 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; + /* 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; + /* find the focused target */ + newtarget = NULL; + for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) { + const ObFocusCyclePopupTarget *target = it->data; + if (target->client == c) { + /* save the target */ + newtarget = target; + break; + } + } + selected_pos = i; + g_assert(newtarget != NULL); + + /* 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); + } + } + + /* 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); + + /* make space for the arrows */ + 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) + if (p->mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS && icon_rows == 1) icons_center_x = (w - p->n_targets * HILITE_SIZE) / 2; else icons_center_x = 0; @@ -417,45 +487,26 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) 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; - } - - /* find the focused target */ - newtarget = NULL; - for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) { - const ObFocusCyclePopupTarget *target = it->data; - if (target->client == c) { - /* save the target */ - newtarget = target; - break; + 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); } } - 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); /* * * draw everything * * */ @@ -463,6 +514,27 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) 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; @@ -482,7 +554,10 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* 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 */ @@ -506,8 +581,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) 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);