don't show the client menu when its for an invalid window

[chaz/openbox] / openbox / client_list_combined_menu.c

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 3ea4669b827021056cf6a6dfdbdf927e741ee4dd..fcc95f69dfc1aa1cf4a3eb1ad04c256f0ed70048 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -2,7 +2,7 @@
 
    client_list_menu.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 
 ObMenu *combined_menu;
 
-static void self_update(ObMenuFrame *frame, gpointer data)
+static gboolean self_update(ObMenuFrame *frame, gpointer data)
 {
     ObMenu *menu = frame->menu;
     ObMenuEntry *e;
@@ -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;
@@ -70,10 +70,12 @@ static void self_update(ObMenuFrame *frame, gpointer data)
 
                 if (c->iconic) {
                     gchar *title = g_strdup_printf("(%s)", c->icon_title);
-                    e = menu_add_normal(menu, i, title, acts);
+                    e = menu_add_normal(menu, i, title, acts, FALSE);
                     g_free(title);
-                } else
-                    e = menu_add_normal(menu, i, c->title, acts);
+                } 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;
@@ -94,11 +99,12 @@ static void self_update(ObMenuFrame *frame, gpointer data)
             act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
             act->data.desktop.desk = desktop;
             acts = g_slist_append(acts, act);
-            e = menu_add_normal(menu, 0, _("Go there..."), acts);
+            e = menu_add_normal(menu, 0, _("Go there..."), acts, TRUE);
             if (desktop == screen_desktop)
                 e->data.normal.enabled = FALSE;
         }
     }
+    return TRUE; /* always show the menu */
 }
 
 /* executes it using the client in the actions, since we set that
@@ -138,7 +144,7 @@ void client_list_combined_menu_startup(gboolean reconfig)
     if (!reconfig)
         client_add_destructor(client_dest, NULL);
 
-    combined_menu = menu_new(MENU_NAME, _("Windows"), NULL);
+    combined_menu = menu_new(MENU_NAME, _("Windows"), TRUE, NULL);
     menu_set_update_func(combined_menu, self_update);
     menu_set_execute_func(combined_menu, menu_execute);
 }