X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_combined_menu.c;h=fcc95f69dfc1aa1cf4a3eb1ad04c256f0ed70048;hb=e0e1d4ba7e150b215b55029ddbff3c824b94caf7;hp=a397c3cdd07593dbe5ce0b77f16e492b13478de7;hpb=918065915439f0a12b7e109069f8acf1203aa470;p=chaz%2Fopenbox

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index a397c3cd..fcc95f69 100644
--- 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,29 +33,31 @@
 
 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;
     GList *it;
     gint i;
-    gboolean icons = FALSE;
     guint desktop;
 
     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;
+        gboolean onlyiconic = TRUE;
+
+        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;
-            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;
 
-                if (!icons && c->iconic) {
-                    icons = TRUE;
-                    menu_add_separator(menu, -1);
-                }
+                empty = FALSE;
 
                 act = action_from_string("Activate",
                                          OB_USER_ACTION_MENU_SELECTION);
@@ -65,8 +67,15 @@ static void self_update(ObMenuFrame *frame, gpointer data)
                                          OB_USER_ACTION_MENU_SELECTION);
                 act->data.desktop.desk = desktop;
                 acts = g_slist_append(acts, act);
-                e = menu_add_normal(menu, i, (c->iconic ?
-                                              c->icon_title : c->title), acts);
+
+                if (c->iconic) {
+                    gchar *title = g_strdup_printf("(%s)", c->icon_title);
+                    e = menu_add_normal(menu, i, title, acts, FALSE);
+                    g_free(title);
+                } 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))) {
@@ -76,21 +85,38 @@ static void self_update(ObMenuFrame *frame, gpointer data)
                 }
             }
         }
-        menu_add_separator(menu, -1);
-        menu_add_separator(menu, -1);
-        icons = FALSE;
+
+        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;
+            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, 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
    when we make the actions! */
-static void menu_execute(ObMenuEntry *self, guint state, gpointer data)
+static void menu_execute(ObMenuEntry *self, guint state, gpointer data,
+                         Time time)
 {
     ObAction *a;
 
     if (self->data.normal.actions) {
         a = self->data.normal.actions->data;
-        action_run(self->data.normal.actions, a->data.any.c, state);
+        action_run(self->data.normal.actions, a->data.any.c, state, time);
     }
 }
 
@@ -102,7 +128,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)
@@ -116,9 +144,9 @@ 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(submenu, desk_menu_execute);
+    menu_set_execute_func(combined_menu, menu_execute);
 }
 
 void client_list_combined_menu_shutdown(gboolean reconfig)