X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=096f5c6375077ce4591a034d7c964a07d0da9b8c;hb=5563e251c36a1fbda703cf4bc3c8c6ae543829bd;hp=0dbc95f01a4be68a1e6a58bf332d2495d44c4d6b;hpb=4305448a62716170f042033787ddb60891f0d654;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 0dbc95f0..096f5c63 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -22,17 +22,19 @@ #include "client.h" #include "screen.h" #include "focus.h" -#include "focus_cycle.h" #include "openbox.h" #include "window.h" +#include "event.h" #include "render/render.h" #include #include -#define ICON_SIZE 48 +#define ICON_SIZE 40 #define ICON_HILITE_WIDTH 2 -#define OUTSIDE_BORDER 2 +#define ICON_HILITE_MARGIN 1 +#define OUTSIDE_BORDER 3 +#define TEXT_BORDER 2 typedef struct _ObFocusCyclePopup ObFocusCyclePopup; typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget; @@ -54,7 +56,7 @@ struct _ObFocusCyclePopup GList *targets; gint n_targets; - ObFocusCyclePopupTarget *last_target; + const ObFocusCyclePopupTarget *last_target; gint maxtextw; @@ -67,17 +69,25 @@ struct _ObFocusCyclePopup gboolean mapped; }; +/*! This popup shows all possible windows */ static ObFocusCyclePopup popup; +/*! This popup shows a single window */ +static ObIconPopup *single_popup; static gchar *popup_get_name (ObClient *c); -static void popup_setup (ObFocusCyclePopup *p,gboolean all_desktops, - gboolean dock_windows, gboolean desktop_windows); -static void popup_render (ObFocusCyclePopup *p, const ObClient *c); +static void popup_setup (ObFocusCyclePopup *p, + gboolean create_targets, + gboolean iconic_windows, + gboolean all_desktops, + gboolean dock_windows, + gboolean desktop_windows); +static void popup_render (ObFocusCyclePopup *p, + const ObClient *c); 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); } @@ -86,7 +96,9 @@ void focus_cycle_popup_startup(gboolean reconfig) { XSetWindowAttributes attrib; - popup.obwin.type = Window_Internal; + 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_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); @@ -100,9 +112,8 @@ void focus_cycle_popup_startup(gboolean reconfig) popup.a_bg->texture[0].type = RR_TEXTURE_RGBA; attrib.override_redirect = True; - attrib.border_pixel=RrColorPixel(ob_rr_theme->frame_focused_border_color); - popup.bg = create_window(RootWindow(ob_display, ob_screen), - ob_rr_theme->fbwidth, + 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); popup.text = create_window(popup.bg, 0, 0, NULL); @@ -113,35 +124,41 @@ void focus_cycle_popup_startup(gboolean reconfig) popup.hilite_rgba = NULL; - XMapWindow(ob_display, popup.text); + XMapWindow(obt_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->win); 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.text); + XDestroyWindow(obt_display, popup.bg); RrAppearanceFree(popup.a_icon); RrAppearanceFree(popup.a_text); RrAppearanceFree(popup.a_bg); } -static void popup_setup(ObFocusCyclePopup *p,gboolean all_desktops, +static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, + gboolean iconic_windows, gboolean all_desktops, gboolean dock_windows, gboolean desktop_windows) { gint maxwidth, n; @@ -159,25 +176,32 @@ static void popup_setup(ObFocusCyclePopup *p,gboolean all_desktops, for (it = g_list_last(focus_order); it; it = g_list_previous(it)) { ObClient *ft = it->data; - if (focus_cycle_target_valid(ft, - all_desktops, - dock_windows, - desktop_windows)) + if (focus_valid_target(ft, TRUE, + iconic_windows, + all_desktops, + dock_windows, + desktop_windows)) { - ObFocusCyclePopupTarget *t = g_new(ObFocusCyclePopupTarget, 1); - - t->client = ft; - t->text = popup_get_name(ft); - t->win = create_window(p->bg, 0, 0, NULL); - - XMapWindow(ob_display, t->win); + gchar *text = popup_get_name(ft); /* measure */ - p->a_text->texture[0].data.text.string = t->text; + p->a_text->texture[0].data.text.string = text; maxwidth = MAX(maxwidth, RrMinWidth(p->a_text)); - p->targets = g_list_prepend(p->targets, t); - ++n; + if (!create_targets) + g_free(text); + else { + ObFocusCyclePopupTarget *t = g_new(ObFocusCyclePopupTarget, 1); + + t->client = ft; + t->text = text; + t->win = create_window(p->bg, 0, 0, NULL); + + XMapWindow(obt_display, t->win); + + p->targets = g_list_prepend(p->targets, t); + ++n; + } } } @@ -188,62 +212,61 @@ static void popup_setup(ObFocusCyclePopup *p,gboolean all_desktops, static gchar *popup_get_name(ObClient *c) { ObClient *p; - gchar *title = NULL; + gchar *title; const gchar *desk = NULL; gchar *ret; - /* find our highest direct parent, including non-normal windows */ - for (p = c; p->transient_for && p->transient_for != OB_TRAN_GROUP; - p = p->transient_for); + /* find our highest direct parent */ + p = client_search_top_direct_parent(c); if (c->desktop != DESKTOP_ALL && c->desktop != screen_desktop) desk = screen_desktop_names[c->desktop]; - /* use the transient's parent's title/icon if we don't have one */ - if (p != c && !strcmp("", (c->iconic ? c->icon_title : c->title))) - title = g_strdup(p->iconic ? p->icon_title : p->title); + title = c->iconic ? c->icon_title : c->title; - if (title == NULL) - title = g_strdup(c->iconic ? c->icon_title : c->title); + /* use the transient's parent's title/icon if we don't have one */ + if (p != c && title[0] == '\0') + title = p->iconic ? p->icon_title : p->title; if (desk) ret = g_strdup_printf("%s [%s]", title, desk); - else { - ret = title; - title = NULL; - } - g_free(title); + else + ret = g_strdup(title); return ret; } 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; + Rect *screen_area = NULL; gint icons_per_row; gint icon_rows; gint textx, texty, textw, texth; - gint iconw, iconh; + gint rgbax, rgbay, rgbaw, rgbah; + gint icons_center_x; + gint innerw, innerh; gint i; GList *it; const ObFocusCyclePopupTarget *newtarget; gint newtargetx, newtargety; - /* XXX find the middle monitor? */ - screen_area = screen_physical_area_monitor(0); + screen_area = screen_physical_area_active(); /* get the outside margins */ - RrMargins(p->a_bg, &l, &t, &r, &b); - l += ob_rr_theme->paddingx + OUTSIDE_BORDER; - r += ob_rr_theme->paddingx + OUTSIDE_BORDER; - t += ob_rr_theme->paddingy + OUTSIDE_BORDER; - b += ob_rr_theme->paddingy + OUTSIDE_BORDER; + RrMargins(p->a_bg, &ml, &mt, &mr, &mb); - /* get the icons sizes */ - iconw = ICON_SIZE - (ICON_HILITE_WIDTH + ob_rr_theme->paddingx) * 2; - iconh = ICON_SIZE - (ICON_HILITE_WIDTH + ob_rr_theme->paddingy) * 2; + /* get our outside borders */ + l = ml + OUTSIDE_BORDER; + r = mr + OUTSIDE_BORDER; + 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; @@ -252,7 +275,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* how many icons will fit in that row? make the width fit that */ w -= l + r; - icons_per_row = w / ICON_SIZE; + icons_per_row = (w + ICON_SIZE - 1) / ICON_SIZE; w = icons_per_row * ICON_SIZE + l + r; /* how many rows do we need? */ @@ -260,11 +283,10 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* get the text dimensions */ textw = w - l - r; - texth = RrMinHeight(p->a_text); + texth = RrMinHeight(p->a_text) + TEXT_BORDER * 2; /* find the height of the dialog */ - h = t + b + (icon_rows * ICON_SIZE) + - (ob_rr_theme->paddingy * 2 + OUTSIDE_BORDER + texth); + h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER + texth); /* get the position of the text */ textx = l; @@ -272,22 +294,35 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* find the position for the popup (include the outer borders) */ x = screen_area->x + (screen_area->width - - (w + ob_rr_theme->fbwidth * 2)) / 2; + (w + ob_rr_theme->obwidth * 2)) / 2; y = screen_area->y + (screen_area->height - - (h + ob_rr_theme->fbwidth * 2)) / 2; + (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; + + /* 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 = w; - p->a_bg->texture[0].data.rgba.height = h; - p->hilite_rgba = g_new(RrPixel32, w * h); + p->a_bg->texture[0].data.rgba.width = rgbaw; + p->a_bg->texture[0].data.rgba.height = rgbah; + 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); + XMoveResizeWindow(obt_display, p->text, textx, texty, textw, texth); p->a_text->surface.parentx = textx; p->a_text->surface.parenty = texty; } @@ -301,7 +336,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) if (target->client == c) { /* save the target */ newtarget = target; - newtargetx = l + (col * ICON_SIZE); + newtargetx = icons_center_x + l + (col * ICON_SIZE); newtargety = t + (row * ICON_SIZE); if (!p->mapped) @@ -314,17 +349,18 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* create the hilite under the target icon */ { RrPixel32 color; - gint i, j; + 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); - for (i = 0; i < h; ++i) - for (j = 0; j < w; ++j) { + o = 0; + for (i = 0; i < rgbah; ++i) + for (j = 0; j < rgbaw; ++j) { guchar a; - const gint x = j - newtargetx; - const gint y = i - newtargety; + const gint x = j + rgbax - newtargetx; + const gint y = i + rgbay - newtargety; if (x < 0 || x >= ICON_SIZE || y < 0 || y >= ICON_SIZE) @@ -333,9 +369,9 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) a = 0x00; } else if (x < ICON_HILITE_WIDTH || - x >= ICON_SIZE-ICON_HILITE_WIDTH || + x >= ICON_SIZE - ICON_HILITE_WIDTH || y < ICON_HILITE_WIDTH || - y >= ICON_SIZE-ICON_HILITE_WIDTH) + y >= ICON_SIZE - ICON_HILITE_WIDTH) { /* the border of the target */ a = 0x88; @@ -345,7 +381,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) a = 0x22; } - p->hilite_rgba[i * w + j] = + p->hilite_rgba[o++] = color + (a << RrDefaultAlphaOffset); } } @@ -365,28 +401,30 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) const ObClientIcon *icon; const gint row = i / icons_per_row; /* starting from 0 */ const gint col = i % icons_per_row; /* starting from 0 */ - gint iconx, icony; + gint innerx, innery; /* find the dimensions of the icon inside it */ - iconx = l + (col * ICON_SIZE) + ICON_HILITE_WIDTH + - ob_rr_theme->paddingx; - icony = t + (row * ICON_SIZE) + ICON_HILITE_WIDTH + - ob_rr_theme->paddingy; + innerx = icons_center_x + l + (col * ICON_SIZE); + innerx += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; + innery = t + (row * ICON_SIZE); + innery += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN; /* move the icon */ - XMoveResizeWindow(ob_display, target->win, - iconx, icony, iconw, iconh); + XMoveResizeWindow(obt_display, target->win, + innerx, innery, innerw, innerh); /* get the icon from the client */ - icon = client_icon(target->client, iconw, iconh); + 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 = iconx; - p->a_icon->surface.parenty = icony; - RrPaint(p->a_icon, target->win, iconw, iconh); + p->a_icon->surface.parentx = innerx; + p->a_icon->surface.parenty = innery; + RrPaint(p->a_icon, target->win, innerw, innerh); } } @@ -397,9 +435,11 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) RrPaint(p->a_text, p->text, textw, texth); p->last_target = newtarget; + + g_free(screen_area); } -void focus_cycle_popup_show(ObClient *c, +void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows, gboolean all_desktops, gboolean dock_windows, gboolean desktop_windows) { @@ -407,23 +447,31 @@ void focus_cycle_popup_show(ObClient *c, /* do this stuff only when the dialog is first showing */ if (!popup.mapped) - popup_setup(&popup, all_desktops, dock_windows, desktop_windows); + popup_setup(&popup, TRUE, iconic_windows, all_desktops, + dock_windows, desktop_windows); g_assert(popup.targets != NULL); popup_render(&popup, c); 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) { - XUnmapWindow(ob_display, popup.bg); - XFlush(ob_display); + gulong ignore_start; + + ignore_start = event_start_ignore_all_enters(); + + XUnmapWindow(obt_display, popup.bg); + XFlush(obt_display); + + event_end_ignore_all_enters(ignore_start); popup.mapped = FALSE; @@ -431,7 +479,8 @@ void focus_cycle_popup_hide() ObFocusCyclePopupTarget *t = popup.targets->data; g_free(t->text); - XDestroyWindow(ob_display, t->win); + XDestroyWindow(obt_display, t->win); + g_free(t); popup.targets = g_list_delete_link(popup.targets, popup.targets); } @@ -442,3 +491,42 @@ void focus_cycle_popup_hide() popup.hilite_rgba = NULL; } +void focus_cycle_popup_single_show(struct _ObClient *c, + gboolean iconic_windows, + gboolean all_desktops, + gboolean dock_windows, + gboolean desktop_windows) +{ + gchar *text; + + g_assert(c != NULL); + + /* do this stuff only when the dialog is first showing */ + if (!popup.mapped) { + Rect *a; + + popup_setup(&popup, FALSE, iconic_windows, all_desktops, + dock_windows, desktop_windows); + g_assert(popup.targets == NULL); + + /* position the popup */ + a = screen_physical_area_active(); + icon_popup_position(single_popup, CenterGravity, + a->x + a->width / 2, a->y + a->height / 2); + icon_popup_height(single_popup, POPUP_HEIGHT); + icon_popup_min_width(single_popup, POPUP_WIDTH); + icon_popup_max_width(single_popup, MAX(a->width/3, POPUP_WIDTH)); + icon_popup_text_width(single_popup, popup.maxtextw); + g_free(a); + } + + 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) +{ + icon_popup_hide(single_popup); +}