#include "focus_cycle.h"
#include "openbox.h"
#include "window.h"
+#include "event.h"
#include "render/render.h"
#include <X11/Xlib.h>
#include <glib.h>
-#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
typedef struct _ObFocusCyclePopup ObFocusCyclePopup;
typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget;
GList *targets;
gint n_targets;
- ObFocusCyclePopupTarget *last_target;
+ const ObFocusCyclePopupTarget *last_target;
gint maxtextw;
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)
{
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);
void focus_cycle_popup_shutdown(gboolean reconfig)
{
+ icon_popup_free(single_popup);
+
stacking_remove(INTERNAL_AS_WINDOW(&popup));
while(popup.targets) {
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;
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;
+ }
}
}
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;
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;
screen_area = screen_physical_area_monitor(0);
/* 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 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;
/* 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? */
texth = RrMinHeight(p->a_text);
/* 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*2 + texth);
/* get the position of the text */
textx = l;
y = screen_area->y + (screen_area->height -
(h + ob_rr_theme->fbwidth * 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->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 */
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)
/* 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)
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;
a = 0x22;
}
- p->hilite_rgba[i * w + j] =
+ p->hilite_rgba[o++] =
color + (a << RrDefaultAlphaOffset);
}
}
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;
+ RrPixel32 *icon_data;
/* 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.data = icon->data;
+ if (target->client->iconic) {
+ /* fade iconic windows */
+ gint i;
+ RrPixel32 *d, *s;
+
+ icon_data = g_new(RrPixel32, icon->width * icon->height);
+
+ s = icon->data;
+ d = icon_data;
+ for (i = 0; i < icon->width * icon->height; ++i, ++d, ++s) {
+ /* 3/8 opacity */
+ gint a = ((*s >> RrDefaultAlphaOffset) & 0xff);
+ *d = *s - (a << RrDefaultAlphaOffset) +
+ (((a>>2) + (a>>3)) << RrDefaultAlphaOffset);
+ }
+
+ } else
+ icon_data = icon->data;
+ 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);
+
+ if (target->client->iconic)
+ g_free(icon_data);
}
}
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)
{
/* 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);
popup.mapped = FALSE;
+ /* kill enter events cause by this unmapping */
+ event_ignore_all_queued_enters();
+
while(popup.targets) {
ObFocusCyclePopupTarget *t = popup.targets->data;
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);
+}