X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=b98ebc17990a5b7cf1ffa42c3c9d246e23e19c37;hb=23cbab843592f35fba74034539f3213ae5d1b7c9;hp=595fb9df752488caa76a0556787bf5880aaf0ec9;hpb=19ecd4d6d403e71abecb0e77f7ff0f4efa400be3;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 595fb9df..b98ebc17 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -43,7 +43,8 @@ struct _ObFocusCyclePopupTarget { ObClient *client; gchar *text; - Window win; + Window iconwin; + Window textwin; }; struct _ObFocusCyclePopup @@ -51,8 +52,6 @@ struct _ObFocusCyclePopup ObWindow obwin; Window bg; - Window text; - GList *targets; gint n_targets; @@ -87,7 +86,7 @@ static void popup_render (ObFocusCyclePopup *p, static Window create_window(Window parent, guint bwidth, gulong mask, XSetWindowAttributes *attr) { - return XCreateWindow(ob_display, parent, 0, 0, 1, 1, bwidth, + return XCreateWindow(obt_display, parent, 0, 0, 1, 1, bwidth, RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), mask, attr); } @@ -96,9 +95,9 @@ void focus_cycle_popup_startup(gboolean reconfig) { XSetWindowAttributes attrib; - single_popup = icon_popup_new(TRUE); + single_popup = icon_popup_new(); - popup.obwin.type = Window_Internal; + 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_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); @@ -113,42 +112,40 @@ void focus_cycle_popup_startup(gboolean reconfig) attrib.override_redirect = True; attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color); - popup.bg = create_window(RootWindow(ob_display, ob_screen), - ob_rr_theme->obwidth, + popup.bg = create_window(obt_root(ob_screen), ob_rr_theme->obwidth, CWOverrideRedirect | CWBorderPixel, &attrib); - popup.text = create_window(popup.bg, 0, 0, NULL); - popup.targets = NULL; popup.n_targets = 0; popup.last_target = NULL; popup.hilite_rgba = NULL; - XMapWindow(ob_display, popup.text); - stacking_add(INTERNAL_AS_WINDOW(&popup)); + window_add(&popup.bg, INTERNAL_AS_WINDOW(&popup)); } void focus_cycle_popup_shutdown(gboolean reconfig) { icon_popup_free(single_popup); + window_remove(popup.bg); stacking_remove(INTERNAL_AS_WINDOW(&popup)); while(popup.targets) { ObFocusCyclePopupTarget *t = popup.targets->data; g_free(t->text); - XDestroyWindow(ob_display, t->win); + XDestroyWindow(obt_display, t->iconwin); + XDestroyWindow(obt_display, t->textwin); popup.targets = g_list_delete_link(popup.targets, popup.targets); } g_free(popup.hilite_rgba); + popup.hilite_rgba = NULL; - XDestroyWindow(ob_display, popup.text); - XDestroyWindow(ob_display, popup.bg); + XDestroyWindow(obt_display, popup.bg); RrAppearanceFree(popup.a_icon); RrAppearanceFree(popup.a_text); @@ -174,7 +171,7 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, for (it = g_list_last(focus_order); it; it = g_list_previous(it)) { ObClient *ft = it->data; - if (focus_valid_target(ft, + if (focus_valid_target(ft, TRUE, iconic_windows, all_desktops, dock_windows, @@ -193,9 +190,11 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, t->client = ft; t->text = text; - t->win = create_window(p->bg, 0, 0, NULL); + t->iconwin = create_window(p->bg, 0, 0, NULL); + t->textwin = create_window(p->bg, 0, 0, NULL); - XMapWindow(ob_display, t->win); + XMapWindow(obt_display, t->iconwin); + XMapWindow(obt_display, t->textwin); p->targets = g_list_prepend(p->targets, t); ++n; @@ -240,11 +239,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) gint l, t, r, b; gint x, y, w, h; Rect *screen_area = NULL; - gint icons_per_row; - gint icon_rows; - gint textx, texty, textw, texth; gint rgbax, rgbay, rgbaw, rgbah; - gint icons_center_x; gint innerw, innerh; gint i; GList *it; @@ -271,24 +266,8 @@ 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 */ - /* how many icons will fit in that row? make the width fit that */ - w -= l + r; - icons_per_row = (w + ICON_SIZE - 1) / ICON_SIZE; - w = icons_per_row * ICON_SIZE + l + r; - - /* how many rows do we need? */ - icon_rows = (p->n_targets-1) / icons_per_row + 1; - - /* get the text dimensions */ - textw = w - l - r; - texth = RrMinHeight(p->a_text) + TEXT_BORDER * 2; - /* find the height of the dialog */ - h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER + texth); - - /* get the position of the text */ - textx = l; - texty = h - texth - b; + h = t + b + (p->n_targets * ICON_SIZE) + OUTSIDE_BORDER; /* find the position for the popup (include the outer borders) */ x = screen_area->x + (screen_area->width - @@ -302,15 +281,9 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) rgbaw = w - ml - mr; rgbah = h - mt - mb; - /* center the icons if there is less than one row */ - if (icon_rows == 1) - icons_center_x = (w - p->n_targets * ICON_SIZE) / 2; - else - icons_center_x = 0; - if (!p->mapped) { /* position the background but don't draw it*/ - XMoveResizeWindow(ob_display, p->bg, x, y, w, h); + XMoveResizeWindow(obt_display, p->bg, x, y, w, h); /* set up the hilite texture for the background */ p->a_bg->texture[0].data.rgba.width = rgbaw; @@ -318,24 +291,17 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) p->a_bg->texture[0].data.rgba.alpha = 0xff; p->hilite_rgba = g_new(RrPixel32, rgbaw * rgbah); p->a_bg->texture[0].data.rgba.data = p->hilite_rgba; - - /* position the text, but don't draw it */ - XMoveResizeWindow(ob_display, p->text, textx, texty, textw, texth); - p->a_text->surface.parentx = textx; - p->a_text->surface.parenty = texty; } /* find the focused target */ for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) { const ObFocusCyclePopupTarget *target = it->data; - const gint row = i / icons_per_row; /* starting from 0 */ - const gint col = i % icons_per_row; /* starting from 0 */ if (target->client == c) { /* save the target */ newtarget = target; - newtargetx = icons_center_x + l + (col * ICON_SIZE); - newtargety = t + (row * ICON_SIZE); + newtargetx = l; + newtargety = t + i * ICON_SIZE; if (!p->mapped) break; /* if we're not dimensioning, then we're done */ @@ -389,7 +355,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* draw the background */ RrPaint(p->a_bg, p->bg, w, h); - /* draw the icons */ + /* draw the icons and text */ for (i = 0, it = p->targets; it; ++i, it = g_list_next(it)) { const ObFocusCyclePopupTarget *target = it->data; @@ -397,52 +363,44 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) they can pick up the hilite changes in the backgroud */ if (!p->mapped || newtarget == target || p->last_target == target) { const ObClientIcon *icon; - ObClientIcon *thumb; - const gint row = i / icons_per_row; /* starting from 0 */ - const gint col = i % icons_per_row; /* starting from 0 */ gint innerx, innery; /* find the dimensions of the icon inside it */ - innerx = icons_center_x + l + (col * ICON_SIZE); + innerx = l; innerx += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; - innery = t + (row * ICON_SIZE); + innery = t + i * ICON_SIZE; innery += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; /* move the icon */ - XMoveResizeWindow(ob_display, target->win, + XMoveResizeWindow(obt_display, target->iconwin, innerx, innery, innerw, innerh); + /* move the text */ + XMoveResizeWindow(obt_display, target->textwin, + innerx + ICON_SIZE, innery, + w - innerx - ICON_SIZE - OUTSIDE_BORDER, innerh); + /* get the icon from the client */ - if ((thumb = client_thumbnail(target->client))) { - p->a_icon->texture[0].data.rgba.width = thumb->width; - p->a_icon->texture[0].data.rgba.height = thumb->height; - p->a_icon->texture[0].data.rgba.alpha = - target->client->iconic ? OB_ICONIC_ALPHA : 0xff; - p->a_icon->texture[0].data.rgba.data = thumb->data; - } else { - icon = client_icon(target->client, innerw, innerh); - 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.alpha = - target->client->iconic ? OB_ICONIC_ALPHA : 0xff; - p->a_icon->texture[0].data.rgba.data = icon->data; - } + icon = client_icon(target->client, innerw, innerh); + 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.alpha = + target->client->iconic ? OB_ICONIC_ALPHA : 0xff; + p->a_icon->texture[0].data.rgba.data = icon->data; /* draw the icon */ p->a_icon->surface.parentx = innerx; p->a_icon->surface.parenty = innery; - RrPaint(p->a_icon, target->win, innerw, innerh); + RrPaint(p->a_icon, target->iconwin, innerw, innerh); - clienticon_free(thumb); + /* 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); } } - /* draw the text */ - p->a_text->texture[0].data.text.string = newtarget->text; - p->a_text->surface.parentx = textx; - p->a_text->surface.parenty = texty; - RrPaint(p->a_text, p->text, textw, texth); - p->last_target = newtarget; g_free(screen_area); @@ -464,20 +422,21 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows, if (!popup.mapped) { /* show the dialog */ - XMapWindow(ob_display, popup.bg); - XFlush(ob_display); + XMapWindow(obt_display, popup.bg); + XFlush(obt_display); popup.mapped = TRUE; + screen_hide_desktop_popup(); } } -void focus_cycle_popup_hide() +void focus_cycle_popup_hide(void) { gulong ignore_start; ignore_start = event_start_ignore_all_enters(); - XUnmapWindow(ob_display, popup.bg); - XFlush(ob_display); + XUnmapWindow(obt_display, popup.bg); + XFlush(obt_display); event_end_ignore_all_enters(ignore_start); @@ -487,7 +446,9 @@ void focus_cycle_popup_hide() ObFocusCyclePopupTarget *t = popup.targets->data; g_free(t->text); - XDestroyWindow(ob_display, t->win); + XDestroyWindow(obt_display, t->iconwin); + XDestroyWindow(obt_display, t->textwin); + g_free(t); popup.targets = g_list_delete_link(popup.targets, popup.targets); } @@ -530,9 +491,10 @@ 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)); g_free(text); + screen_hide_desktop_popup(); } -void focus_cycle_popup_single_hide() +void focus_cycle_popup_single_hide(void) { icon_popup_hide(single_popup); }