X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=1d37ae9c0c3ee7c06b4562f0249feb8f9a2fe392;hb=92bbd733fa1a8fbc5eebf207932bf26be0251894;hp=42c3fed6ae48bc7c07101f2bbb06226c3e889f8d;hpb=9b447a2d2837a6dab0380bc767644f8fe5083aa9;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 42c3fed6..1d37ae9c 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -44,6 +44,9 @@ #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; @@ -72,12 +75,16 @@ struct _ObFocusCyclePopup 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; gboolean mapped; + ObFocusCyclePopupMode mode; }; /*! This popup shows all possible windows */ @@ -93,8 +100,7 @@ static void popup_setup (ObFocusCyclePopup *p, 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) @@ -137,7 +143,6 @@ 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); - XMapWindow(obt_display, popup.icon_mode_text); popup.targets = NULL; popup.n_targets = 0; @@ -255,9 +260,6 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, 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; } @@ -295,8 +297,7 @@ static gchar *popup_get_name(ObClient *c) 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; @@ -309,6 +310,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, gint icons_per_row; gint icon_rows; gint textw, texth; + gint selected_pos; + gint last_scroll; /* vars for icon mode */ gint icon_mode_textx; @@ -318,8 +321,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, /* vars for list mode */ gint list_mode_icon_column_w = HILITE_SIZE + OUTSIDE_BORDER; - 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(); @@ -334,13 +337,20 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, /* 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; @@ -353,20 +363,24 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, 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; @@ -376,7 +390,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, 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; @@ -398,10 +412,17 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, /* 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); + + /* reset the scrolling when the dialog is first shown */ + p->scroll = 0; } /* find the focused target */ @@ -414,6 +435,25 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, 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); @@ -429,9 +469,12 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, /* 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; @@ -451,11 +494,27 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, 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; @@ -470,7 +529,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, /* 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; @@ -478,18 +537,19 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, 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); } @@ -499,6 +559,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, p->last_target = newtarget; g_free(screen_area); + + XFlush(obt_display); } void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows, @@ -514,12 +576,15 @@ 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 */