*/
#include "focus_cycle_popup.h"
+#include "focus_cycle.h"
#include "popup.h"
#include "client.h"
#include "screen.h"
#include "config.h"
#include "window.h"
#include "event.h"
-#include "render/render.h"
+#include "obrender/render.h"
#include <X11/Xlib.h>
#include <glib.h>
/*! This popup shows a single window */
static ObIconPopup *single_popup;
-static gchar *popup_get_name (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 gchar *popup_get_name (ObClient *c);
+static gboolean popup_setup (ObFocusCyclePopup *p,
+ gboolean create_targets,
+ gboolean refresh_targets,
+ gboolean linear);
+static void popup_render (ObFocusCyclePopup *p,
+ const ObClient *c);
static Window create_window(Window parent, guint bwidth, gulong mask,
XSetWindowAttributes *attr)
single_popup = icon_popup_new();
popup.obwin.type = OB_WINDOW_CLASS_INTERNAL;
- popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
+ popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_bg);
popup.a_hilite_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
- popup.a_text = RrAppearanceCopy(ob_rr_theme->a_unfocused_label);
+ popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_unhilite_label);
popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear);
popup.a_arrow = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
RrAppearanceClearTextures(popup.a_arrow);
popup.a_arrow->texture[0].type = RR_TEXTURE_MASK;
popup.a_arrow->texture[0].data.mask.color =
- ob_rr_theme->osd_color;
+ ob_rr_theme->osd_text_active_color;
attrib.override_redirect = True;
attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color);
/* create the hilite under the target icon */
{
RrPixel32 color;
+ RrColor *tc;
gint x, y, 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);
+ tc = ob_rr_theme->osd_text_active_color;
+ color = ((tc->r & 0xff) << RrDefaultRedOffset) +
+ ((tc->g & 0xff) << RrDefaultGreenOffset) +
+ ((tc->b & 0xff) << RrDefaultBlueOffset);
o = 0;
for (x = 0; x < HILITE_SIZE; x++)
g_free(t->text);
XDestroyWindow(obt_display, t->iconwin);
XDestroyWindow(obt_display, t->textwin);
- g_free(t);
+ g_slice_free(ObFocusCyclePopupTarget, t);
popup.targets = g_list_delete_link(popup.targets, popup.targets);
}
RrAppearanceFree(popup.a_bg);
}
-static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
- gboolean iconic_windows, gboolean all_desktops,
- gboolean dock_windows, gboolean desktop_windows)
+static void popup_target_free(ObFocusCyclePopupTarget *t)
+{
+ RrImageUnref(t->icon);
+ g_free(t->text);
+ XDestroyWindow(obt_display, t->iconwin);
+ XDestroyWindow(obt_display, t->textwin);
+ g_slice_free(ObFocusCyclePopupTarget, t);
+}
+
+static gboolean popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
+ gboolean refresh_targets, gboolean linear)
{
gint maxwidth, n;
GList *it;
+ GList *rtargets; /* old targets for refresh */
+ GList *rtlast;
+ gboolean change;
+
+ if (refresh_targets) {
+ rtargets = p->targets;
+ rtlast = g_list_last(rtargets);
+ p->targets = NULL;
+ p->n_targets = 0;
+ change = FALSE;
+ }
+ else {
+ rtargets = rtlast = NULL;
+ change = TRUE;
+ }
g_assert(p->targets == NULL);
g_assert(p->n_targets == 0);
and count them */
maxwidth = 0;
n = 0;
- for (it = g_list_last(focus_order); it; it = g_list_previous(it)) {
+ for (it = g_list_last(linear ? client_list : focus_order);
+ it;
+ it = g_list_previous(it))
+ {
ObClient *ft = it->data;
- if (focus_valid_target(ft, TRUE,
- iconic_windows,
- all_desktops,
- dock_windows,
- desktop_windows,
- FALSE))
- {
- gchar *text = popup_get_name(ft);
+ if (focus_cycle_valid(ft)) {
+ GList *rit;
- /* measure */
- p->a_text->texture[0].data.text.string = text;
- maxwidth = MAX(maxwidth, RrMinWidth(p->a_text));
+ /* reuse the target if possible during refresh */
+ for (rit = rtlast; rit; rit = g_list_previous(rit)) {
+ ObFocusCyclePopupTarget *t = rit->data;
+ if (t->client == ft) {
+ if (rit == rtlast)
+ rtlast = g_list_previous(rit);
+ rtargets = g_list_remove_link(rtargets, rit);
- if (!create_targets) {
- g_free(text);
- } else {
- ObFocusCyclePopupTarget *t = g_new(ObFocusCyclePopupTarget, 1);
+ p->targets = g_list_concat(rit, p->targets);
+ ++n;
- 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->iconwin = create_window(p->bg, 0, 0, NULL);
- t->textwin = create_window(p->bg, 0, 0, NULL);
+ if (rit != rtlast)
+ change = TRUE; /* order changed */
+ break;
+ }
+ }
+
+ if (!rit) {
+ gchar *text = popup_get_name(ft);
+
+ /* measure */
+ p->a_text->texture[0].data.text.string = text;
+ maxwidth = MAX(maxwidth, RrMinWidth(p->a_text));
+
+ if (!create_targets) {
+ g_free(text);
+ } else {
+ ObFocusCyclePopupTarget *t =
+ g_slice_new(ObFocusCyclePopupTarget);
+
+ 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->iconwin = create_window(p->bg, 0, 0, NULL);
+ t->textwin = create_window(p->bg, 0, 0, NULL);
- p->targets = g_list_prepend(p->targets, t);
- ++n;
+ p->targets = g_list_prepend(p->targets, t);
+ ++n;
+
+ change = TRUE; /* added a window */
+ }
}
}
}
+ if (rtargets) {
+ change = TRUE; /* removed a window */
+
+ while (rtargets) {
+ popup_target_free(rtargets->data);
+ rtargets = g_list_delete_link(rtargets, rtargets);
+ }
+ }
+
p->n_targets = n;
- p->maxtextw = maxwidth;
+ if (refresh_targets)
+ /* don't shrink when refreshing */
+ p->maxtextw = MAX(p->maxtextw, maxwidth);
+ else
+ p->maxtextw = maxwidth;
+
+ return change;
+}
+
+static void popup_cleanup(void)
+{
+ while(popup.targets) {
+ popup_target_free(popup.targets->data);
+ popup.targets = g_list_delete_link(popup.targets, popup.targets);
+ }
+ popup.n_targets = 0;
+ popup.last_target = NULL;
}
static gchar *popup_get_name(ObClient *c)
gint ml, mt, mr, mb;
gint l, t, r, b;
gint x, y, w, h;
- Rect *screen_area = NULL;
+ const Rect *screen_area = NULL;
gint i;
GList *it;
const ObFocusCyclePopupTarget *newtarget;
p->last_target = newtarget;
- g_free(screen_area);
-
XFlush(obt_display);
}
-void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
- gboolean all_desktops, gboolean dock_windows,
- gboolean desktop_windows,
- ObFocusCyclePopupMode mode)
+void focus_cycle_popup_show(ObClient *c, ObFocusCyclePopupMode mode,
+ gboolean linear)
{
g_assert(c != NULL);
/* do this stuff only when the dialog is first showing */
if (!popup.mapped) {
- popup_setup(&popup, TRUE, iconic_windows, all_desktops,
- dock_windows, desktop_windows);
+ popup_setup(&popup, TRUE, FALSE, linear);
/* this is fixed once the dialog is shown */
popup.mode = mode;
}
popup.mapped = FALSE;
- while(popup.targets) {
- ObFocusCyclePopupTarget *t = popup.targets->data;
-
- RrImageUnref(t->icon);
- g_free(t->text);
- XDestroyWindow(obt_display, t->iconwin);
- XDestroyWindow(obt_display, t->textwin);
- g_free(t);
-
- popup.targets = g_list_delete_link(popup.targets, popup.targets);
- }
- popup.n_targets = 0;
- popup.last_target = NULL;
+ popup_cleanup();
}
-void focus_cycle_popup_single_show(struct _ObClient *c,
- gboolean iconic_windows,
- gboolean all_desktops,
- gboolean dock_windows,
- gboolean desktop_windows)
+void focus_cycle_popup_single_show(struct _ObClient *c)
{
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);
+ if (!single_popup->popup->mapped) {
+ const Rect *a;
/* position the popup */
a = screen_physical_area_primary(FALSE);
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_hide(single_popup);
}
-gboolean focus_cycle_popup_is_showing(ObClient *client)
+gboolean focus_cycle_popup_is_showing(ObClient *c)
{
if (popup.mapped) {
GList *it;
for (it = popup.targets; it; it = g_list_next(it)) {
ObFocusCyclePopupTarget *t = it->data;
- if (t->client == client)
+ if (t->client == c)
return TRUE;
}
}
return FALSE;
}
+
+static ObClient* popup_revert(ObClient *target)
+{
+ GList *it, *itt;
+
+ for (it = popup.targets; it; it = g_list_next(it)) {
+ ObFocusCyclePopupTarget *t = it->data;
+ if (t->client == target) {
+ /* move to a previous window if possible */
+ for (itt = it->prev; itt; itt = g_list_previous(itt)) {
+ ObFocusCyclePopupTarget *t2 = itt->data;
+ if (focus_cycle_valid(t2->client))
+ return t2->client;
+ }
+
+ /* otherwise move to a following window if possible */
+ for (itt = it->next; itt; itt = g_list_next(itt)) {
+ ObFocusCyclePopupTarget *t2 = itt->data;
+ if (focus_cycle_valid(t2->client))
+ return t2->client;
+ }
+
+ /* otherwise, we can't go anywhere there is nowhere valid to go */
+ return NULL;
+ }
+ }
+ return NULL;
+}
+
+ObClient* focus_cycle_popup_refresh(ObClient *target,
+ gboolean redraw,
+ gboolean linear)
+{
+ if (!popup.mapped) return NULL;
+
+ if (!focus_cycle_valid(target))
+ target = popup_revert(target);
+
+ redraw = popup_setup(&popup, TRUE, TRUE, linear) && redraw;
+
+ if (!target && popup.targets)
+ target = ((ObFocusCyclePopupTarget*)popup.targets->data)->client;
+
+ if (target && redraw) {
+ popup.mapped = FALSE;
+ popup_render(&popup, target);
+ XFlush(obt_display);
+ popup.mapped = TRUE;
+ }
+
+ return target;
+}
projects / chaz / openbox / blobdiff