X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=86a70af45c6f40dc9bb94b25e8f0567c70f2300e;hb=9c19d7f677e17b458f7fad1cdd220ffb2ac51ba1;hp=66b2b1d7996496d82c58e3d44c0f2f5c283849b9;hpb=957963e272be1fba1e06dd2bdcfa9a4348121baf;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 66b2b1d7..86a70af4 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_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
@@ -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);
 
@@ -71,10 +72,12 @@ static void desk_menu_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))) {
@@ -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;
@@ -95,7 +101,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
         act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
         act->data.desktop.desk = d->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 (d->desktop == screen_desktop)
             e->data.normal.enabled = FALSE;
     }
@@ -137,7 +143,7 @@ static void self_update(ObMenuFrame *frame, gpointer data)
             DesktopData *data = g_new(DesktopData, 1);
 
             data->desktop = i;
-            submenu = menu_new(name, screen_desktop_names[i], data);
+            submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
             menu_set_update_func(submenu, desk_menu_update);
             menu_set_execute_func(submenu, desk_menu_execute);
             menu_set_destroy_func(submenu, desk_menu_destroy);
@@ -186,7 +192,7 @@ void client_list_menu_startup(gboolean reconfig)
     if (!reconfig)
         client_add_destructor(client_dest, NULL);
 
-    menu = menu_new(MENU_NAME, _("Desktops"), NULL);
+    menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL);
     menu_set_update_func(menu, self_update);
 }