#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 <X11/Xlib.h>
#include <glib.h>
-#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;
struct _ObFocusCyclePopupTarget
{
ObClient *client;
+ RrImage *icon;
gchar *text;
Window win;
};
{
XSetWindowAttributes attrib;
- single_popup = icon_popup_new(TRUE);
+ single_popup = icon_popup_new();
popup.obwin.type = Window_Internal;
popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
popup.a_text->surface.parent = popup.a_bg;
popup.a_icon->surface.parent = popup.a_bg;
- popup.a_icon->texture[0].type = RR_TEXTURE_RGBA;
+ RrAppearanceClearTextures(popup.a_icon);
+ popup.a_icon->texture[0].type = RR_TEXTURE_IMAGE;
RrAppearanceAddTextures(popup.a_bg, 1);
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);
XMapWindow(ob_display, popup.text);
stacking_add(INTERNAL_AS_WINDOW(&popup));
+ g_hash_table_insert(window_map, &popup.bg, &popup);
}
void focus_cycle_popup_shutdown(gboolean reconfig)
{
icon_popup_free(single_popup);
+ g_hash_table_remove(window_map, &popup.bg);
stacking_remove(INTERNAL_AS_WINDOW(&popup));
while(popup.targets) {
ObFocusCyclePopupTarget *t = popup.targets->data;
+ RrImageUnref(t->icon);
g_free(t->text);
XDestroyWindow(ob_display, t->win);
+ g_free(t);
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);
for (it = g_list_last(focus_order); it; it = g_list_previous(it)) {
ObClient *ft = it->data;
- if (focus_cycle_target_valid(ft,
- iconic_windows,
- all_desktops,
- dock_windows,
- desktop_windows))
+ if (focus_valid_target(ft, TRUE,
+ iconic_windows,
+ all_desktops,
+ dock_windows,
+ desktop_windows,
+ FALSE))
{
gchar *text = popup_get_name(ft);
t->client = ft;
t->text = text;
+ t->icon = client_icon(t->client);
+ RrImageRef(t->icon); /* own the icon so it won't go away */
t->win = create_window(p->bg, 0, 0, NULL);
XMapWindow(ob_display, t->win);
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;
}
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;
const ObFocusCyclePopupTarget *newtarget;
gint newtargetx, newtargety;
- /* XXX find the middle monitor? */
- screen_area = screen_physical_area_monitor(0);
+ screen_area = screen_physical_area_primary();
/* get the outside margins */
RrMargins(p->a_bg, &ml, &mt, &mr, &mb);
/* 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) + (OUTSIDE_BORDER + texth);
/* 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;
/* set up the hilite texture for the background */
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;
/* have to redraw the targetted icon and last targetted icon,
they can pick up the hilite changes in the backgroud */
if (!p->mapped || newtarget == target || p->last_target == target) {
- const ObClientIcon *icon;
const gint row = i / icons_per_row; /* starting from 0 */
const gint col = i % icons_per_row; /* starting from 0 */
gint innerx, innery;
innerx, innery, innerw, innerh);
/* get the icon from the client */
- 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;
+ p->a_icon->texture[0].data.image.alpha =
+ target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
+ p->a_icon->texture[0].data.image.image = target->icon;
/* draw the icon */
p->a_icon->surface.parentx = innerx;
}
/* draw the text */
- p->a_text->texture[0].data.text.justify = RR_JUSTIFY_CENTER;
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);
}
void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
XMapWindow(ob_display, popup.bg);
XFlush(ob_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);
+ event_end_ignore_all_enters(ignore_start);
+
popup.mapped = FALSE;
while(popup.targets) {
ObFocusCyclePopupTarget *t = popup.targets->data;
+ RrImageUnref(t->icon);
g_free(t->text);
XDestroyWindow(ob_display, t->win);
+ g_free(t);
popup.targets = g_list_delete_link(popup.targets, popup.targets);
}
g_assert(popup.targets == NULL);
/* position the popup */
- a = screen_physical_area_monitor(0);
+ a = screen_physical_area_primary();
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));
+ icon_popup_show(single_popup, text, client_icon(c));
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);
}
projects / chaz / openbox / blobdiff