X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=d6d5584cf777526b369f0d7c7ad33c26fdd23bee;hb=50d662681160c309ea86268c0d05794b87b75593;hp=42fe29c9c241a351bd4732aa3b35970aa3768800;hpb=04e1084d588a7c2aedcaef53d927c33afec17437;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 42fe29c9..d6d5584c 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -23,6 +23,7 @@ #include "screen.h" #include "focus.h" #include "openbox.h" +#include "config.h" #include "window.h" #include "event.h" #include "render/render.h" @@ -30,20 +31,23 @@ #include #include +/* Size of the icons, which can appear inside or outside of a hilite box */ +#define ICON_SIZE (gint)config_theme_window_list_icon_size /* Size of the hilite box around a window's icon */ -#define HILITE_SIZE 40 +#define HILITE_SIZE (ICON_SIZE + 2*HILITE_OFFSET) /* Width of the outer ring around the hilite box */ #define HILITE_WIDTH 2 /* Space between the outer ring around the hilite box and the icon inside it */ #define HILITE_MARGIN 1 /* Total distance from the edge of the hilite box to the icon inside it */ #define HILITE_OFFSET (HILITE_WIDTH + HILITE_MARGIN) -/* Size of the icons, which can appear inside or outside of a hilite box */ -#define ICON_SIZE (HILITE_SIZE - 2*HILITE_OFFSET) /* Margin area around the outside of the dialog */ #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; @@ -51,6 +55,7 @@ typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget; struct _ObFocusCyclePopupTarget { ObClient *client; + RrImage *icon; gchar *text; Window iconwin; /* This is used when the popup is in list mode */ @@ -65,6 +70,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; @@ -72,12 +80,17 @@ 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; + RrAppearance *a_arrow; gboolean mapped; + ObFocusCyclePopupMode mode; }; /*! This popup shows all possible windows */ @@ -93,8 +106,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) @@ -116,6 +128,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; @@ -128,7 +141,13 @@ void focus_cycle_popup_startup(gboolean reconfig) may or may not be used */ RrAppearanceAddTextures(popup.a_icon, 2); - popup.a_icon->texture[0].type = RR_TEXTURE_RGBA; + RrAppearanceClearTextures(popup.a_icon); + popup.a_icon->texture[0].type = RR_TEXTURE_IMAGE; + + RrAppearanceClearTextures(popup.a_arrow); + 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); @@ -138,6 +157,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; @@ -170,8 +193,7 @@ void focus_cycle_popup_startup(gboolean reconfig) { /* the border of the target */ a = 0x88; - } - else { + } else { /* the background of the target */ a = 0x22; } @@ -194,9 +216,11 @@ void focus_cycle_popup_shutdown(gboolean reconfig) while(popup.targets) { ObFocusCyclePopupTarget *t = popup.targets->data; + RrImageUnref(t->icon); g_free(t->text); XDestroyWindow(obt_display, t->iconwin); XDestroyWindow(obt_display, t->textwin); + g_free(t); popup.targets = g_list_delete_link(popup.targets, popup.targets); } @@ -204,9 +228,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); @@ -236,7 +263,8 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, iconic_windows, all_desktops, dock_windows, - desktop_windows)) + desktop_windows, + FALSE)) { gchar *text = popup_get_name(ft); @@ -244,18 +272,18 @@ 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; t->text = text; + t->icon = client_icon(t->client); + RrImageRef(t->icon); /* own the icon so it won't go away */ t->iconwin = create_window(p->bg, 0, 0, NULL); t->textwin = create_window(p->bg, 0, 0, NULL); - XMapWindow(obt_display, t->iconwin); - p->targets = g_list_prepend(p->targets, t); ++n; } @@ -293,20 +321,21 @@ 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; gint x, y, w, h; Rect *screen_area = NULL; - gint rgbax, rgbay, rgbaw, rgbah; gint i; GList *it; const ObFocusCyclePopupTarget *newtarget; + ObFocusCyclePopupMode mode = p->mode; gint icons_per_row; gint icon_rows; gint textw, texth; + gint selected_pos; + gint last_scroll; /* vars for icon mode */ gint icon_mode_textx; @@ -315,11 +344,14 @@ 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(mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS || mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST); - screen_area = screen_physical_area_active(); + screen_area = screen_physical_area_primary(FALSE); /* get the outside margins */ RrMargins(p->a_bg, &ml, &mt, &mr, &mb); @@ -338,6 +370,13 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, w = MIN(w, MAX(screen_area->width/3, POPUP_WIDTH)); /* max width */ w = MAX(w, POPUP_WIDTH); /* min width */ + /* get the text height */ + texth = RrMinHeight(p->a_hilite_text); + if (mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) + texth = MAX(MAX(texth, RrMinHeight(p->a_text)), HILITE_SIZE); + else + texth += TEXT_BORDER * 2; + if (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) { /* how many icons will fit in that row? make the width fit that */ w -= l + r; @@ -346,30 +385,86 @@ 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; - 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) /* leave space on the side for the icons */ textw -= list_mode_icon_column_w; - texth = RrMinHeight(p->a_text) + TEXT_BORDER * 2; + + if (!p->mapped) + /* reset the scrolling when the dialog is first shown */ + p->scroll = 0; /* 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) /* 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 (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 && 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 && + 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 (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; @@ -386,12 +481,6 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c, y = screen_area->y + (screen_area->height - (h + ob_rr_theme->obwidth * 2)) / 2; - /* get the dimensions of the target hilite texture */ - rgbax = ml; - rgbay = mt; - rgbaw = w - ml - mr; - rgbah = h - mt - mb; - if (!p->mapped) { /* position the background but don't draw it */ XMoveResizeWindow(obt_display, p->bg, x, y, w, h); @@ -401,82 +490,119 @@ 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); - } - /* 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); } } - g_assert(newtarget != NULL); - /* * * draw everything * * */ /* draw the background */ if (!p->mapped) RrPaint(p->a_bg, p->bg, w, h); + /* draw the scroll arrows */ + if (!p->mapped && 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; /* 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 */ - const ObClientIcon *icon; + 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; gint iconx, icony; gint list_mode_textx, list_mode_texty; RrAppearance *text; /* 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 */ list_mode_textx = iconx + HILITE_SIZE + TEXT_BORDER; - list_mode_texty = icony + HILITE_OFFSET; + list_mode_texty = icony; /* 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 (mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) XMoveResizeWindow(obt_display, target->textwin, list_mode_textx, list_mode_texty, textw, texth); - XMapWindow(obt_display, target->textwin); - } - else + + /* show/hide the right windows */ + if (row >= 0 && row < icon_rows) { + XMapWindow(obt_display, target->iconwin); + if (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 (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; - 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 = + p->a_icon->texture[0].data.image.twidth = ICON_SIZE; + p->a_icon->texture[0].data.image.theight = ICON_SIZE; + p->a_icon->texture[0].data.image.tx = HILITE_OFFSET; + p->a_icon->texture[0].data.image.ty = HILITE_OFFSET; + p->a_icon->texture[0].data.image.alpha = target->client->iconic ? OB_ICONIC_ALPHA : 0xff; - p->a_icon->texture[0].data.rgba.data = icon->data; + p->a_icon->texture[0].data.image.image = target->icon; /* 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; @@ -484,7 +610,8 @@ 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 (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; @@ -505,6 +632,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, @@ -520,12 +649,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 */ @@ -552,6 +684,7 @@ void focus_cycle_popup_hide(void) while(popup.targets) { ObFocusCyclePopupTarget *t = popup.targets->data; + RrImageUnref(t->icon); g_free(t->text); XDestroyWindow(obt_display, t->iconwin); XDestroyWindow(obt_display, t->textwin); @@ -582,7 +715,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c, g_assert(popup.targets == NULL); /* position the popup */ - a = screen_physical_area_active(); + a = screen_physical_area_primary(FALSE); icon_popup_position(single_popup, CenterGravity, a->x + a->width / 2, a->y + a->height / 2); icon_popup_height(single_popup, POPUP_HEIGHT); @@ -593,8 +726,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c, } text = popup_get_name(c); - icon_popup_show(single_popup, text, client_icon(c, HILITE_SIZE, - HILITE_SIZE)); + icon_popup_show(single_popup, text, client_icon(c)); g_free(text); screen_hide_desktop_popup(); }