make focus_order into one long list instead of having one per desktop. this actually...

[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 c18c9c201d35216414d538181a3aec321932b5d7..39a8e60b3f280a4370fc4feb00112d10fe4b9bdf 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -36,6 +36,7 @@ ObMenu *combined_menu;
 static void self_update(ObMenuFrame *frame, gpointer data)
 {
     ObMenu *menu = frame->menu;
+    ObMenuEntry *e;
     GList *it;
     gint i;
     gboolean icons = FALSE;
@@ -44,14 +45,27 @@ static void self_update(ObMenuFrame *frame, gpointer data)
     menu_clear_entries(menu);
 
     for (desktop = 0; desktop < screen_num_desktops; desktop++) {
-        for (it = focus_order[desktop], i = 0; it; it = g_list_next(it), ++i) {
+        gboolean empty = TRUE;
+
+        /* Don't need a separator at the very top */
+        if (desktop > 0)
+            menu_add_separator(menu, -1);
+        e = menu_add_normal(menu, -1, NULL, NULL);
+        e->data.normal.enabled = FALSE;
+        e->data.normal.label = g_strdup(screen_desktop_names[desktop]);
+        /* The one at the bottom will always have entries below it though */
+        menu_add_separator(menu, -1);
+        for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
             ObClient *c = it->data;
-            if (client_normal(c) && (!c->skip_taskbar || c->iconic)) {
+            if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
+                (c->desktop == desktop || c->desktop == DESKTOP_ALL))
+            {
                 GSList *acts = NULL;
                 ObAction* act;
-                ObMenuEntry *e;
                 const ObClientIcon *icon;
 
+                empty = FALSE;
+
                 if (!icons && c->iconic) {
                     icons = TRUE;
                     menu_add_separator(menu, -1);
@@ -76,9 +90,22 @@ static void self_update(ObMenuFrame *frame, gpointer data)
                 }
             }
         }
-        menu_add_separator(menu, -1);
-        menu_add_separator(menu, -1);
         icons = FALSE;
+
+        if (empty) {
+            /* no entries */
+
+            GSList *acts = NULL;
+            ObAction* act;
+            ObMenuEntry *e;
+
+            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);
+            if (desktop == screen_desktop)
+                e->data.normal.enabled = FALSE;
+        }
     }
 }
 
@@ -103,7 +130,9 @@ static void client_dest(ObClient *client, gpointer data)
     GList *eit;
     for (eit = combined_menu->entries; eit; eit = g_list_next(eit)) {
         ObMenuEntry *meit = eit->data;
-        if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL) {
+        if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+            meit->data.normal.actions)
+        {
             ObAction *a = meit->data.normal.actions->data;
             ObClient *c = a->data.any.c;
             if (c == client)