From e5d6a552a46bce27cbe25c92023094b44c9a8284 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 27 Apr 2007 12:55:59 +0000 Subject: [PATCH] also add the go there entry to client list menus if the only windows on a desktop are iconified. hopefully this separator will be okay? --- openbox/client_list_combined_menu.c | 13 +++++++++---- openbox/client_list_menu.c | 12 +++++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c index 8412abe1..9dd56e0a 100644 --- a/openbox/client_list_combined_menu.c +++ b/openbox/client_list_combined_menu.c @@ -45,8 +45,8 @@ static void self_update(ObMenuFrame *frame, gpointer data) for (desktop = 0; desktop < screen_num_desktops; desktop++) { gboolean empty = TRUE; + gboolean onlyiconic = TRUE; - /* Don't need a separator at the very top */ menu_add_separator(menu, -1, screen_desktop_names[desktop]); for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) { ObClient *c = it->data; @@ -72,8 +72,10 @@ static void self_update(ObMenuFrame *frame, gpointer data) gchar *title = g_strdup_printf("(%s)", c->icon_title); e = menu_add_normal(menu, i, title, acts, FALSE); g_free(title); - } else + } else { + onlyiconic = FALSE; e = menu_add_normal(menu, i, c->title, acts, FALSE); + } if (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) { @@ -84,8 +86,11 @@ static void self_update(ObMenuFrame *frame, gpointer data) } } - if (empty) { - /* no entries */ + if (empty || onlyiconic) { + /* no entries or only iconified windows, so add a + * way to go to this desktop without uniconifying a window */ + if (!empty) + menu_add_separator(menu, -1, NULL); GSList *acts = NULL; ObAction* act; diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 6dc7881e..86a70af4 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -45,6 +45,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) GList *it; gint i; gboolean empty = TRUE; + gboolean onlyiconic = TRUE; menu_clear_entries(menu); @@ -73,8 +74,10 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) gchar *title = g_strdup_printf("(%s)", c->icon_title); e = menu_add_normal(menu, i, title, acts, FALSE); g_free(title); - } else + } else { + onlyiconic = FALSE; e = menu_add_normal(menu, i, c->title, acts, FALSE); + } if (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) { @@ -85,8 +88,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) } } - if (empty) { - /* no entries */ + if (empty || onlyiconic) { + /* no entries or only iconified windows, so add a + * way to go to this desktop without uniconifying a window */ + if (!empty) + menu_add_separator(menu, -1, NULL); GSList *acts = NULL; ObAction* act; -- 2.39.2