From 12653a4153bccd5d9a46998753e7a1bc17479505 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 11 Jan 2010 12:47:59 -0500 Subject: Redraw the focus cycle popup when the list of focusable windows changes, rather than closing it --- openbox/focus_cycle_popup.c | 73 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 15 deletions(-) (limited to 'openbox/focus_cycle_popup.c') diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index d01be03c..aff84579 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -217,6 +217,22 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, p->maxtextw = maxwidth; } +static void popup_cleanup(void) +{ + 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); + } + popup.n_targets = 0; + popup.last_target = NULL; +} + static gchar *popup_get_name(ObClient *c) { ObClient *p; @@ -479,18 +495,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(ob_display, t->win); - g_free(t); - - popup.targets = g_list_delete_link(popup.targets, popup.targets); - } - popup.n_targets = 0; - popup.last_target = NULL; + popup_cleanup(); g_free(popup.hilite_rgba); popup.hilite_rgba = NULL; @@ -536,7 +541,7 @@ void focus_cycle_popup_single_hide(void) icon_popup_hide(single_popup); } -gboolean focus_cycle_popup_is_showing(ObClient *client) +GList* focus_cycle_popup_is_showing(ObClient *client) { if (popup.mapped) { GList *it; @@ -544,8 +549,46 @@ gboolean focus_cycle_popup_is_showing(ObClient *client) for (it = popup.targets; it; it = g_list_next(it)) { ObFocusCyclePopupTarget *t = it->data; if (t->client == client) - return TRUE; + return it; + } + } + return NULL; +} + +ObClient* focus_cycle_popup_revert(ObClient *target) +{ + GList *it; + + if (!popup.mapped) return NULL; + + for (it = popup.targets; it; it = g_list_next(it)) { + ObFocusCyclePopupTarget *t = it->data; + if (t->client == target) { + if (it->prev) + return ((ObFocusCyclePopupTarget*)it->prev->data)->client; + else if (it->next) + return ((ObFocusCyclePopupTarget*)it->next->data)->client; + else + return NULL; } } - return FALSE; + g_assert_not_reached(); +} + +void focus_cycle_popup_refresh(ObClient *target, + gboolean iconic_windows, + gboolean all_desktops, + gboolean dock_windows, + gboolean desktop_windows) +{ + if (!popup.mapped) return; + + popup_cleanup(); + popup_setup(&popup, TRUE, iconic_windows, all_desktops, + dock_windows, desktop_windows); + + popup.mapped = FALSE; + popup_render(&popup, target); + XFlush(ob_display); + popup.mapped = TRUE; } -- cgit v1.2.3 From b8e994e837d260860a4dc0a1ee3a680e2cdfc75a Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 11 Jan 2010 13:12:09 -0500 Subject: Reuse ObFocusCyclePopupTargets when refreshing the focus cycle dialog --- openbox/focus_cycle_popup.c | 146 ++++++++++++++++++++++++++++++-------------- 1 file changed, 101 insertions(+), 45 deletions(-) (limited to 'openbox/focus_cycle_popup.c') diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index aff84579..b97bc97b 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -75,15 +75,16 @@ 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, + 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) @@ -162,12 +163,36 @@ 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(ob_display, t->win); + g_free(t); +} + +static gboolean popup_setup(ObFocusCyclePopup *p, gboolean create_targets, + gboolean refresh_targets, + gboolean iconic_windows, gboolean all_desktops, + gboolean dock_windows, gboolean desktop_windows) { 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); @@ -188,45 +213,76 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets, desktop_windows, FALSE)) { - gchar *text = popup_get_name(ft); + GList *rit; + + /* 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); + + 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)); + /* 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_new(ObFocusCyclePopupTarget, 1); + 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->win = create_window(p->bg, 0, 0, NULL); - 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); - XMapWindow(ob_display, t->win); + 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); + + popup.targets = g_list_delete_link(popup.targets, popup.targets); + } + } + p->n_targets = n; p->maxtextw = maxwidth; + + return change; } static void popup_cleanup(void) { while(popup.targets) { - ObFocusCyclePopupTarget *t = popup.targets->data; - - RrImageUnref(t->icon); - g_free(t->text); - XDestroyWindow(ob_display, t->win); - g_free(t); - + popup_target_free(popup.targets->data); popup.targets = g_list_delete_link(popup.targets, popup.targets); } popup.n_targets = 0; @@ -467,7 +523,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, + popup_setup(&popup, TRUE, FALSE, iconic_windows, all_desktops, dock_windows, desktop_windows); g_assert(popup.targets != NULL); @@ -515,7 +571,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c, if (!popup.mapped) { Rect *a; - popup_setup(&popup, FALSE, iconic_windows, all_desktops, + popup_setup(&popup, FALSE, FALSE, iconic_windows, all_desktops, dock_windows, desktop_windows); g_assert(popup.targets == NULL); @@ -583,12 +639,12 @@ void focus_cycle_popup_refresh(ObClient *target, { if (!popup.mapped) return; - popup_cleanup(); - popup_setup(&popup, TRUE, iconic_windows, all_desktops, - dock_windows, desktop_windows); - - popup.mapped = FALSE; - popup_render(&popup, target); - XFlush(ob_display); - popup.mapped = TRUE; + if (popup_setup(&popup, TRUE, TRUE, iconic_windows, all_desktops, + dock_windows, desktop_windows)) + { + popup.mapped = FALSE; + popup_render(&popup, target); + XFlush(ob_display); + popup.mapped = TRUE; + } } -- cgit v1.2.3 From 14180a6b0dee05e73fd193db28fd94b4ef3046d1 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 11 Jan 2010 15:13:55 -0500 Subject: More work on refreshing the focus cycle dialog when windows are added/removed from the valid focus order --- openbox/focus_cycle_popup.c | 88 ++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 45 deletions(-) (limited to 'openbox/focus_cycle_popup.c') diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index b97bc97b..16522802 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" @@ -78,11 +79,7 @@ static ObIconPopup *single_popup; static gchar *popup_get_name (ObClient *c); static gboolean popup_setup (ObFocusCyclePopup *p, gboolean create_targets, - gboolean refresh_targets, - gboolean iconic_windows, - gboolean all_desktops, - gboolean dock_windows, - gboolean desktop_windows); + gboolean refresh_targets); static void popup_render (ObFocusCyclePopup *p, const ObClient *c); @@ -172,9 +169,7 @@ static void popup_target_free(ObFocusCyclePopupTarget *t) } static gboolean popup_setup(ObFocusCyclePopup *p, gboolean create_targets, - gboolean refresh_targets, - gboolean iconic_windows, gboolean all_desktops, - gboolean dock_windows, gboolean desktop_windows) + gboolean refresh_targets) { gint maxwidth, n; GList *it; @@ -206,13 +201,7 @@ static gboolean 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, TRUE, - iconic_windows, - all_desktops, - dock_windows, - desktop_windows, - FALSE)) - { + if (focus_cycle_valid(ft)) { GList *rit; /* reuse the target if possible during refresh */ @@ -268,8 +257,6 @@ static gboolean popup_setup(ObFocusCyclePopup *p, gboolean create_targets, while (rtargets) { popup_target_free(rtargets->data); rtargets = g_list_delete_link(rtargets, rtargets); - - popup.targets = g_list_delete_link(popup.targets, popup.targets); } } @@ -523,8 +510,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, FALSE, iconic_windows, all_desktops, - dock_windows, desktop_windows); + popup_setup(&popup, TRUE, FALSE); g_assert(popup.targets != NULL); popup_render(&popup, c); @@ -571,8 +557,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c, if (!popup.mapped) { Rect *a; - popup_setup(&popup, FALSE, FALSE, iconic_windows, all_desktops, - dock_windows, desktop_windows); + popup_setup(&popup, FALSE, FALSE); g_assert(popup.targets == NULL); /* position the popup */ @@ -597,54 +582,67 @@ void focus_cycle_popup_single_hide(void) icon_popup_hide(single_popup); } -GList* 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) - return it; + if (t->client == c) + return TRUE; } } - return NULL; + return FALSE; } -ObClient* focus_cycle_popup_revert(ObClient *target) +static ObClient* popup_revert(ObClient *target) { - GList *it; - - if (!popup.mapped) return NULL; + GList *it, *itt; for (it = popup.targets; it; it = g_list_next(it)) { ObFocusCyclePopupTarget *t = it->data; if (t->client == target) { - if (it->prev) - return ((ObFocusCyclePopupTarget*)it->prev->data)->client; - else if (it->next) - return ((ObFocusCyclePopupTarget*)it->next->data)->client; - else - return NULL; + /* move to a previous window if possible */ + for (itt = it->prev; itt; itt = g_list_previous(itt)) { + ObFocusCyclePopupTarget *t2 = it->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 = it->data; + if (focus_cycle_valid(t2->client)) + return t2->client; + } + + /* otherwise, we can't go anywhere there is nowhere valid to go */ + return NULL; } } - g_assert_not_reached(); + return NULL; } -void focus_cycle_popup_refresh(ObClient *target, - gboolean iconic_windows, - gboolean all_desktops, - gboolean dock_windows, - gboolean desktop_windows) +ObClient* focus_cycle_popup_refresh(ObClient *target, + gboolean redraw) { - if (!popup.mapped) return; + if (!popup.mapped) return NULL; - if (popup_setup(&popup, TRUE, TRUE, iconic_windows, all_desktops, - dock_windows, desktop_windows)) - { + 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(ob_display); popup.mapped = TRUE; } + + return target; } -- cgit v1.2.3 From e8200ae603f33b70824c125ba6b37bfaec7d89ea Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 11 Jan 2010 15:37:36 -0500 Subject: make focus cycle target fallback work right by going to the next prev window --- openbox/focus_cycle_popup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openbox/focus_cycle_popup.c') diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index 16522802..d7ac9f53 100644 --- a/openbox/focus_cycle_popup.c +++ b/openbox/focus_cycle_popup.c @@ -605,14 +605,14 @@ static ObClient* popup_revert(ObClient *target) if (t->client == target) { /* move to a previous window if possible */ for (itt = it->prev; itt; itt = g_list_previous(itt)) { - ObFocusCyclePopupTarget *t2 = it->data; + 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 = it->data; + ObFocusCyclePopupTarget *t2 = itt->data; if (focus_cycle_valid(t2->client)) return t2->client; } -- cgit v1.2.3