X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=071ffc164bd19582c0abef156b89a53bfe2a2590;hb=5579b28481a54d9df451e40854d86b927a64a2f4;hp=dfa2ff4d7857d7feaafab69b0dbd56186680cf45;hpb=53066b1808701dc6c3497b2a4741ed6b82002c8f;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index dfa2ff4d..071ffc16 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -25,13 +25,17 @@ #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 ICON_HILITE_MARGIN 1 +#define OUTSIDE_BORDER 3 +#define TEXT_BORDER 2 typedef struct _ObFocusCyclePopup ObFocusCyclePopup; typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget; @@ -53,7 +57,7 @@ struct _ObFocusCyclePopup GList *targets; gint n_targets; - ObFocusCyclePopupTarget *last_target; + const ObFocusCyclePopupTarget *last_target; gint maxtextw; @@ -66,12 +70,20 @@ 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) @@ -85,6 +97,8 @@ void focus_cycle_popup_startup(gboolean reconfig) { XSetWindowAttributes attrib; + single_popup = icon_popup_new(TRUE); + popup.obwin.type = Window_Internal; popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); @@ -99,9 +113,9 @@ 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); + attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color); popup.bg = create_window(RootWindow(ob_display, ob_screen), - ob_rr_theme->fbwidth, + ob_rr_theme->obwidth, CWOverrideRedirect | CWBorderPixel, &attrib); popup.text = create_window(popup.bg, 0, 0, NULL); @@ -119,6 +133,8 @@ void focus_cycle_popup_startup(gboolean reconfig) void focus_cycle_popup_shutdown(gboolean reconfig) { + icon_popup_free(single_popup); + stacking_remove(INTERNAL_AS_WINDOW(&popup)); while(popup.targets) { @@ -140,7 +156,8 @@ void focus_cycle_popup_shutdown(gboolean reconfig) 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,24 +176,31 @@ static void popup_setup(ObFocusCyclePopup *p,gboolean all_desktops, ObClient *ft = it->data; if (focus_cycle_target_valid(ft, + 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(ob_display, t->win); + + p->targets = g_list_prepend(p->targets, t); + ++n; + } } } @@ -187,62 +211,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_monitor_active(); /* get the outside margins */ - RrMargins(p->a_bg, &l, &t, &r, &b); - l += ob_rr_theme->paddingx; - r += ob_rr_theme->paddingx; - t += ob_rr_theme->paddingy; - b += ob_rr_theme->paddingy; + RrMargins(p->a_bg, &ml, &mt, &mr, &mb); + + /* get our outside borders */ + l = ml + OUTSIDE_BORDER; + r = mr + OUTSIDE_BORDER; + t = mt + OUTSIDE_BORDER; + b = mb + OUTSIDE_BORDER; - /* 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 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; @@ -251,7 +274,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? */ @@ -259,29 +282,42 @@ 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 + texth); + h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER + texth); /* get the position of the text */ textx = l; - texty = h - texth; + texty = h - texth - b; /* 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); /* 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 */ @@ -299,7 +335,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) @@ -311,29 +347,40 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) /* create the hilite under the target icon */ { - RrPixel32 color = 0; - gint i, j; + RrPixel32 color; + gint i, j, o; - memset(p->hilite_rgba, color, w * h * sizeof(RrPixel32)); + 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 < ICON_SIZE; ++i) - for (j = 0; j < ICON_SIZE; ++j) { + o = 0; + for (i = 0; i < rgbah; ++i) + for (j = 0; j < rgbaw; ++j) { guchar a; + const gint x = j + rgbax - newtargetx; + const gint y = i + rgbay - newtargety; - if (i < ICON_HILITE_WIDTH || - i >= ICON_SIZE-ICON_HILITE_WIDTH || - j < ICON_HILITE_WIDTH || - j >= ICON_SIZE-ICON_HILITE_WIDTH) + if (x < 0 || x >= ICON_SIZE || + y < 0 || y >= ICON_SIZE) + { + /* outside the target */ + a = 0x00; + } + else 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 = 0x33; + a = 0x22; } - p->hilite_rgba[(i+newtargety) * w + (j+newtargetx)] = + p->hilite_rgba[o++] = color + (a << RrDefaultAlphaOffset); } } @@ -353,28 +400,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); + 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); } } @@ -387,7 +436,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c) p->last_target = newtarget; } -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) { @@ -395,7 +444,8 @@ 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); @@ -410,9 +460,15 @@ void focus_cycle_popup_show(ObClient *c, void focus_cycle_popup_hide() { + gulong ignore_start; + + ignore_start = event_start_ignore_all_enters(); + XUnmapWindow(ob_display, popup.bg); XFlush(ob_display); + event_end_ignore_all_enters(ignore_start); + popup.mapped = FALSE; while(popup.targets) { @@ -430,3 +486,40 @@ 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_monitor(0); + 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); + } + + text = popup_get_name(c); + icon_popup_show(single_popup, text, client_icon(c, ICON_SIZE, ICON_SIZE)); + g_free(text); +} + +void focus_cycle_popup_single_hide() +{ + icon_popup_hide(single_popup); +}