X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=ca4534baec1c1c3db96c410af0e872954805475c;hb=07126124c9242a5a20883c3145464730e50afe94;hp=62558ef4a0a313b0923b87084d1bb1bd4200db28;hpb=d519deeb2e24ba27664a231c6579bee1e02b4ebb;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 62558ef4..ca4534ba 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -22,6 +22,7 @@
 #include "menuframe.h"
 #include "screen.h"
 #include "client.h"
+#include "client_list_menu.h"
 #include "focus.h"
 #include "config.h"
 #include "gettext.h"
@@ -37,7 +38,7 @@ typedef struct
     guint desktop;
 } DesktopData;
 
-#define CLIENT -1
+#define SEPARATOR -1
 #define ADD_DESKTOP -2
 #define REMOVE_DESKTOP -3
 
@@ -57,24 +58,21 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
             (c->desktop == d->desktop || c->desktop == DESKTOP_ALL))
         {
             ObMenuEntry *e;
-            const ObClientIcon *icon;
 
             empty = FALSE;
 
             if (c->iconic) {
                 gchar *title = g_strdup_printf("(%s)", c->icon_title);
-                e = menu_add_normal(menu, CLIENT, title, NULL, FALSE);
+                e = menu_add_normal(menu, d->desktop, title, NULL, FALSE);
                 g_free(title);
             } else {
                 onlyiconic = FALSE;
-                e = menu_add_normal(menu, CLIENT, c->title, NULL, FALSE);
+                e = menu_add_normal(menu, d->desktop, c->title, NULL, FALSE);
             }
 
-            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;
+            if (config_menu_client_list_icons) {
+                e->data.normal.icon = client_icon(c);
+                RrImageRef(e->data.normal.icon);
                 e->data.normal.icon_alpha = c->iconic ? OB_ICONIC_ALPHA : 0xff;
             }
 
@@ -88,7 +86,7 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
         /* 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, CLIENT, NULL);
+            menu_add_separator(menu, SEPARATOR, NULL);
 
         e = menu_add_normal(menu, d->desktop, _("Go there..."), NULL, TRUE);
         if (d->desktop == screen_desktop)
@@ -101,9 +99,13 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data)
 static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f,
                               ObClient *c, guint state, gpointer data)
 {
-    if (self->id == CLIENT) {
-        if (self->data.normal.data) /* it's set to NULL if its destroyed */
-            client_activate(self->data.normal.data, FALSE, TRUE, TRUE, TRUE);
+    ObClient *t = self->data.normal.data;
+    if (t) { /* it's set to NULL if its destroyed */
+        client_activate(t, TRUE, TRUE, TRUE, TRUE);
+        /* if the window is omnipresent then we need to go to its
+           desktop */
+        if (t->desktop == DESKTOP_ALL)
+            screen_set_desktop(self->id, FALSE);
     }
     else
         screen_set_desktop(self->id, TRUE);
@@ -129,14 +131,14 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
         menu_free(desktop_menus->data);
         desktop_menus = g_slist_delete_link(desktop_menus, desktop_menus);
     }
-    
+
     for (i = 0; i < screen_num_desktops; ++i) {
         ObMenu *submenu;
         gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
-        DesktopData *data = g_new(DesktopData, 1);
+        DesktopData *ddata = g_new(DesktopData, 1);
 
-        data->desktop = i;
-        submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
+        ddata->desktop = i;
+        submenu = menu_new(name, screen_desktop_names[i], FALSE, ddata);
         menu_set_update_func(submenu, desk_menu_update);
         menu_set_execute_func(submenu, desk_menu_execute);
         menu_set_destroy_func(submenu, desk_menu_destroy);
@@ -148,10 +150,12 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
         desktop_menus = g_slist_append(desktop_menus, submenu);
     }
 
-    menu_add_separator(menu, CLIENT, NULL);
-    menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE);
-    menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"),
-                    NULL, TRUE);
+    if (config_menu_manage_desktops) {
+        menu_add_separator(menu, SEPARATOR, NULL);
+        menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE);
+        menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"),
+                        NULL, TRUE);
+    }
 
     return TRUE; /* always show */
 }