X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Ffocus_cycle_popup.c;h=19d3d0b8f9501d4e1e02d18930efac07bbc7547d;hb=88d0c56be0eab0860987c7026a07a4b9c6e8f386;hp=f39483a2028e88c3750908a7626a14c12fa4cd89;hpb=d35dd5ce74bb1e6aadf8047be5b80324b0db37ed;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index f39483a2..19d3d0b8 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -30,10 +30,19 @@ #include #include -#define ICON_SIZE 40 -#define ICON_HILITE_WIDTH 2 -#define ICON_HILITE_MARGIN 1 +/* Size of the hilite box around a window's icon */ +#define HILITE_SIZE 40 +/* 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 typedef struct _ObFocusCyclePopup ObFocusCyclePopup; @@ -44,6 +53,7 @@ struct _ObFocusCyclePopupTarget ObClient *client; gchar *text; Window iconwin; + /* This is used when the popup is in list mode */ Window textwin; }; @@ -52,6 +62,9 @@ struct _ObFocusCyclePopup ObWindow obwin; Window bg; + /* This is used when the popup is in icon mode */ + Window icon_mode_text; + GList *targets; gint n_targets; @@ -61,10 +74,9 @@ struct _ObFocusCyclePopup RrAppearance *a_bg; RrAppearance *a_text; + RrAppearance *a_hilite_text; RrAppearance *a_icon; - RrPixel32 *hilite_rgba; - gboolean mapped; }; @@ -81,7 +93,8 @@ static void popup_setup (ObFocusCyclePopup *p, gboolean dock_windows, gboolean desktop_windows); static void popup_render (ObFocusCyclePopup *p, - const ObClient *c); + const ObClient *c, + ObFocusCyclePopupMode mode); static Window create_window(Window parent, guint bwidth, gulong mask, XSetWindowAttributes *attr) @@ -94,31 +107,79 @@ static Window create_window(Window parent, guint bwidth, gulong mask, void focus_cycle_popup_startup(gboolean reconfig) { XSetWindowAttributes attrib; + RrPixel32 *p; single_popup = icon_popup_new(); popup.obwin.type = OB_WINDOW_CLASS_INTERNAL; popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); - popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); + 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_hilite_text->surface.parent = popup.a_bg; popup.a_text->surface.parent = popup.a_bg; popup.a_icon->surface.parent = popup.a_bg; + popup.a_text->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + popup.a_hilite_text->texture[0].data.text.justify = RR_JUSTIFY_LEFT; + + /* 2 textures. texture[0] is the icon. texture[1] is the hilight, and + may or may not be used */ RrAppearanceAddTextures(popup.a_icon, 2); - popup.a_icon->texture[1].type = RR_TEXTURE_RGBA; + popup.a_icon->texture[0].type = RR_TEXTURE_RGBA; 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, CWOverrideRedirect | CWBorderPixel, &attrib); + /* 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; popup.last_target = NULL; - popup.hilite_rgba = NULL; + /* set up the hilite texture for the icon */ + popup.a_icon->texture[1].data.rgba.width = HILITE_SIZE; + popup.a_icon->texture[1].data.rgba.height = HILITE_SIZE; + popup.a_icon->texture[1].data.rgba.alpha = 0xff; + p = g_new(RrPixel32, HILITE_SIZE * HILITE_SIZE); + popup.a_icon->texture[1].data.rgba.data = p; + + /* create the hilite under the target icon */ + { + RrPixel32 color; + gint x, y, o; + + color = ((ob_rr_theme->osd_color->r & 0xff) << RrDefaultRedOffset) + + ((ob_rr_theme->osd_color->g & 0xff) << RrDefaultGreenOffset) + + ((ob_rr_theme->osd_color->b & 0xff) << RrDefaultBlueOffset); + + o = 0; + for (x = 0; x < HILITE_SIZE; x++) + for (y = 0; y < HILITE_SIZE; y++) { + guchar a; + + if (x < HILITE_WIDTH || + x >= HILITE_SIZE - HILITE_WIDTH || + y < HILITE_WIDTH || + y >= HILITE_SIZE - HILITE_WIDTH) + { + /* the border of the target */ + a = 0x88; + } + else { + /* the background of the target */ + a = 0x22; + } + + p[o++] = color + (a << RrDefaultAlphaOffset); + } + } stacking_add(INTERNAL_AS_WINDOW(&popup)); window_add(&popup.bg, INTERNAL_AS_WINDOW(&popup)); @@ -141,12 +202,14 @@ void focus_cycle_popup_shutdown(gboolean reconfig) popup.targets = g_list_delete_link(popup.targets, popup.targets); } - g_free(popup.hilite_rgba); - popup.hilite_rgba = NULL; + g_free(popup.a_icon->texture[1].data.rgba.data); + popup.a_icon->texture[1].data.rgba.data = NULL; + XDestroyWindow(obt_display, popup.icon_mode_text); XDestroyWindow(obt_display, popup.bg); RrAppearanceFree(popup.a_icon); + RrAppearanceFree(popup.a_hilite_text); RrAppearanceFree(popup.a_text); RrAppearanceFree(popup.a_bg); } @@ -232,18 +295,31 @@ static gchar *popup_get_name(ObClient *c) return ret; } -static void popup_render(ObFocusCyclePopup *p, const ObClient *c) +static void popup_render(ObFocusCyclePopup *p, const ObClient *c, + ObFocusCyclePopupMode mode) { 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 innerw, innerh; gint i; GList *it; const ObFocusCyclePopupTarget *newtarget; - gint newtargetx, newtargety; + gint icons_per_row; + gint icon_rows; + gint textw, texth; + + /* vars for icon mode */ + gint icon_mode_textx; + gint icon_mode_texty; + gint icons_center_x; + + /* 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); screen_area = screen_physical_area_active(); @@ -256,18 +332,55 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) t = mt + OUTSIDE_BORDER; b = mb + OUTSIDE_BORDER; - /* get the icon pictures' sizes */ - innerw = ICON_SIZE - (ICON_HILITE_WIDTH + ICON_HILITE_MARGIN) * 2; - innerh = ICON_SIZE - (ICON_HILITE_WIDTH + ICON_HILITE_MARGIN) * 2; - /* get the width from the text and keep it within limits */ w = l + r + p->maxtextw; + if (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) { + /* 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; + w = icons_per_row * HILITE_SIZE + l + r; + + /* how many rows do we need? */ + icon_rows = (p->n_targets-1) / icons_per_row + 1; + + } + else { + /* in list mode, there is one column of icons.. */ + icons_per_row = 1; + icon_rows = p->n_targets; + } + + /* get the text dimensions */ + 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; + /* find the height of the dialog */ #warning limit the height and scroll entries somehow - h = t + b + (p->n_targets * ICON_SIZE) + OUTSIDE_BORDER; + 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; + + /* center the icons if there is less than one row */ + if (icon_rows == 1) + icons_center_x = (w - p->n_targets * HILITE_SIZE) / 2; + else + icons_center_x = 0; + + if (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS) { + /* get the position of the text */ + icon_mode_textx = l; + icon_mode_texty = h - texth - b; + } /* find the position for the popup (include the outer borders) */ x = screen_area->x + (screen_area->width - @@ -282,66 +395,28 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) rgbah = h - mt - mb; if (!p->mapped) { - /* position the background but don't draw it*/ + /* position the background but don't draw it */ XMoveResizeWindow(obt_display, p->bg, x, y, w, h); - /* set up the hilite texture for the icon */ - p->a_icon->texture[0].data.rgba.width = ICON_SIZE; - p->a_icon->texture[0].data.rgba.height = ICON_SIZE; - p->a_icon->texture[0].data.rgba.alpha = 0xff; - p->hilite_rgba = g_new(RrPixel32, ICON_SIZE * ICON_SIZE); - p->a_icon->texture[0].data.rgba.data = p->hilite_rgba; + if (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); } /* 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; - newtargetx = l; - newtargety = t + i * ICON_SIZE; - - if (!p->mapped) - break; /* if we're not dimensioning, then we're done */ + break; } } g_assert(newtarget != NULL); - /* create the hilite under the target icon */ - { - RrPixel32 color; - gint i, j, o; - - color = ((ob_rr_theme->osd_color->r & 0xff) << RrDefaultRedOffset) + - ((ob_rr_theme->osd_color->g & 0xff) << RrDefaultGreenOffset) + - ((ob_rr_theme->osd_color->b & 0xff) << RrDefaultBlueOffset); - - o = 0; - for (x = 0; x < ICON_SIZE; x++) - for (y = 0; y < ICON_SIZE; y++) { - guchar a; - - if (x < ICON_HILITE_WIDTH || - x >= ICON_SIZE - ICON_HILITE_WIDTH || - y < ICON_HILITE_WIDTH || - y >= ICON_SIZE - ICON_HILITE_WIDTH) - { - /* the border of the target */ - a = 0x88; - } - else { - /* the background of the target */ - a = 0x22; - } - - p->hilite_rgba[o++] = - color + (a << RrDefaultAlphaOffset); - } - } - /* * * draw everything * * */ /* draw the background */ @@ -352,50 +427,75 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) 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, - they can pick up the hilite changes in the backgroud */ + /* 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; - gint innerx, innery; - - /* find the dimensions of the icon inside it */ - innerx = l; - innerx += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; - innery = t + i * ICON_SIZE; - innery += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; - - /* move the icon */ + 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)) + + 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, - innerx, innery, innerw, innerh); + iconx, icony, HILITE_SIZE, HILITE_SIZE); - /* move the text */ - XMoveResizeWindow(obt_display, target->textwin, - innerx + ICON_SIZE, innery, - w - innerx - ICON_SIZE - OUTSIDE_BORDER, innerh); + /* position the text */ + if (mode == OB_FOCUS_CYCLE_POPUP_MODE_LIST) + XMoveResizeWindow(obt_display, target->textwin, + list_mode_textx, list_mode_texty, + textw, texth); /* get the icon from the client */ - icon = client_icon(target->client, innerw, innerh); - p->a_icon->texture[1].data.rgba.width = icon->width; - p->a_icon->texture[1].data.rgba.height = icon->height; - p->a_icon->texture[1].data.rgba.alpha = + 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[1].data.rgba.data = icon->data; + p->a_icon->texture[0].data.rgba.data = icon->data; /* Draw the hilite? */ -#warning do i have to add more obrender interface thingers to get it to draw the icon inside the hilight? sigh - p->a_icon->texture[0].type = (target == newtarget) ? + p->a_icon->texture[1].type = (target == newtarget) ? RR_TEXTURE_RGBA : RR_TEXTURE_NONE; /* draw the icon */ - p->a_icon->surface.parentx = innerx; - p->a_icon->surface.parenty = innery; - RrPaint(p->a_icon, target->iconwin, innerw, innerh); + 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 */ - p->a_text->texture[0].data.text.string = target->text; - p->a_text->surface.parentx = innerx + ICON_SIZE; - p->a_text->surface.parenty = innery; - RrPaint(p->a_text, target->textwin, w - innerx - ICON_SIZE - OUTSIDE_BORDER, innerh); + 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; + text->surface.parentx = + mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ? + icon_mode_textx : list_mode_textx; + text->surface.parenty = + mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ? + icon_mode_texty : list_mode_texty; + RrPaint(text, + (mode == OB_FOCUS_CYCLE_POPUP_MODE_ICONS ? + p->icon_mode_text : target->textwin), + textw, texth); + } } } @@ -406,17 +506,23 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows, gboolean all_desktops, gboolean dock_windows, - gboolean desktop_windows) + gboolean desktop_windows, + ObFocusCyclePopupMode mode) { g_assert(c != NULL); + if (mode == OB_FOCUS_CYCLE_POPUP_MODE_NONE) { + focus_cycle_popup_hide(); + return; + } + /* do this stuff only when the dialog is first showing */ if (!popup.mapped) popup_setup(&popup, TRUE, iconic_windows, all_desktops, dock_windows, desktop_windows); g_assert(popup.targets != NULL); - popup_render(&popup, c); + popup_render(&popup, c, mode); if (!popup.mapped) { /* show the dialog */ @@ -452,9 +558,6 @@ void focus_cycle_popup_hide(void) } popup.n_targets = 0; popup.last_target = NULL; - - g_free(popup.hilite_rgba); - popup.hilite_rgba = NULL; } void focus_cycle_popup_single_show(struct _ObClient *c, @@ -487,7 +590,8 @@ void focus_cycle_popup_single_show(struct _ObClient *c, } text = popup_get_name(c); - icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE)); + icon_popup_show(single_popup, text, client_icon(c, HILITE_SIZE, + HILITE_SIZE)); g_free(text); screen_hide_desktop_popup(); }