X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=08016fe37195c8db9e96592592e2b29b910db036;hp=42484418870f379d273a6312a3361d1f20125cfb;hb=567fd15eebdd44e50cef140419dbf7a336708109;hpb=3e9dbc01430193035e3d1f5832c019c3f9623db8 diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 42484418..08016fe3 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -18,6 +18,7 @@ */ #include "focus_cycle_popup.h" +#include "focus_cycle.h" #include "popup.h" #include "client.h" #include "screen.h" @@ -98,15 +99,12 @@ 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 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); +static void popup_render (ObFocusCyclePopup *p, + const ObClient *c); static Window create_window(Window parent, guint bwidth, gulong mask, XSetWindowAttributes *attr) @@ -242,12 +240,35 @@ void focus_cycle_popup_shutdown(gboolean reconfig) 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_free(t); +} + +static gboolean popup_setup(ObFocusCyclePopup *p, gboolean create_targets, + gboolean refresh_targets) { 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); @@ -261,39 +282,82 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, for (it = g_list_last(focus_order); it; it = g_list_previous(it)) { ObClient *ft = it->data; - if (focus_valid_target(ft, screen_desktop, 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; + + 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)); - 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 (!create_targets) { + g_free(text); + } else { + ObFocusCyclePopupTarget *t = + g_new(ObFocusCyclePopupTarget, 1); + + 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) @@ -652,8 +716,7 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows, /* 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); /* this is fixed once the dialog is shown */ popup.mode = mode; } @@ -683,19 +746,7 @@ void focus_cycle_popup_hide(void) 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, @@ -712,8 +763,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c, if (!popup.mapped) { Rect *a; - popup_setup(&popup, FALSE, iconic_windows, all_desktops, - dock_windows, desktop_windows); + popup_setup(&popup, FALSE, FALSE); g_assert(popup.targets == NULL); /* position the popup */ @@ -738,16 +788,67 @@ void focus_cycle_popup_single_hide(void) 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) +{ + if (!popup.mapped) return NULL; + + if (!focus_cycle_valid(target)) + target = popup_revert(target); + + redraw = popup_setup(&popup, TRUE, TRUE) && 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; +}