X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=dd8cad8bcf01e672a90dc823b2f6c7c7df44fcfe;hb=d77c8f62f2f908cfe1d09686a35dce1ccaf65aec;hp=fbe0e166c09893e122ff02db6c28713fb0c46d3a;hpb=33d4cd8bfd83334f1693babe342a76346dd51bd9;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index fbe0e166..dd8cad8b 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -23,6 +23,7 @@
 #include "screen.h"
 #include "client.h"
 #include "focus.h"
+#include "config.h"
 #include "gettext.h"
 
 #include <glib.h>
@@ -49,11 +50,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
     for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) {
         ObClient *c = it->data;
-        if (client_normal(c)) {
-            GSList *acts;
+        if (client_normal(c) && !c->skip_taskbar) {
+            GSList *acts = NULL;
             ObAction* act;
             ObMenuEntry *e;
-            ObClientIcon *icon;
+            const ObClientIcon *icon;
 
             empty = FALSE;
 
@@ -65,11 +66,15 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             act = action_from_string("Activate",
                                      OB_USER_ACTION_MENU_SELECTION);
             act->data.activate.any.c = c;
-            acts = g_slist_prepend(NULL, act);
+            acts = g_slist_append(acts, act);
+            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, i,
                                 (c->iconic ? c->icon_title : c->title), acts);
 
-            if ((icon = client_icon(c, 32, 32))) {
+            if (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) {
                 e->data.normal.icon_width = icon->width;
                 e->data.normal.icon_height = icon->height;
                 e->data.normal.icon_data = icon->data;
@@ -80,12 +85,16 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
     if (empty) {
         /* no entries */
 
-        GSList *acts;
+        GSList *acts = NULL;
         ObAction* act;
+        ObMenuEntry *e;
+
         act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
         act->data.desktop.desk = d->desktop;
-        acts = g_slist_prepend(NULL, act);
-        menu_add_normal(menu, 0, _("Activate..."), acts);
+        acts = g_slist_append(acts, act);
+        e = menu_add_normal(menu, 0, _("Go there..."), acts);
+        if (d->desktop == screen_desktop)
+            e->data.normal.enabled = FALSE;
     }
 }
 
@@ -145,10 +154,40 @@ static void self_update(ObMenuFrame *frame, gpointer data)
     }
 }
 
-void client_list_menu_startup()
+static void client_dest(ObClient *client, gpointer data)
+{
+    /* This concise function removes all references to a closed
+     * client in the client_list_menu, so we don't have to check
+     * in client.c */
+    GSList *it;
+    for (it = desktop_menus; it; it = g_slist_next(it)) {
+        ObMenu *mit = it->data;
+        GList *eit;
+        for (eit = mit->entries; eit; eit = g_list_next(eit)) {
+            ObMenuEntry *meit = eit->data;
+            if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL) {
+                ObAction *a = meit->data.normal.actions->data;
+                ObClient *c = a->data.any.c;
+                if (c == client)
+                    a->data.any.c = NULL;
+            }
+        }
+    }
+}
+
+void client_list_menu_startup(gboolean reconfig)
 {
     ObMenu *menu;
 
+    if (!reconfig)
+        client_add_destructor(client_dest, NULL);
+
     menu = menu_new(MENU_NAME, _("Desktops"), NULL);
     menu_set_update_func(menu, self_update);
 }
+
+void client_list_menu_shutdown(gboolean reconfig)
+{
+    if (!reconfig)
+        client_remove_destructor(client_dest);
+}