Merge branch 'master' into chaz

[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 a04d07d6fd5295ae2ac0615c65e7e518804bb8be..c26b6fa036f3da35c874d068c07b67e50ee13b07 100644 (file)
--- a/openbox/client_list_combined_menu.c
+++ b/openbox/client_list_combined_menu.c
@@ -37,6 +37,11 @@ static ObMenu *combined_menu;
 #define ADD_DESKTOP -2
 #define REMOVE_DESKTOP -3
 
+static void self_cleanup(ObMenu *menu, gpointer data)
+{
+    menu_clear_entries(menu);
+}
+
 static gboolean self_update(ObMenuFrame *frame, gpointer data)
 {
     ObMenu *menu = frame->menu;
@@ -53,8 +58,9 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
         menu_add_separator(menu, SEPARATOR, screen_desktop_names[desktop]);
         for (it = focus_order; it; it = g_list_next(it)) {
             ObClient *c = it->data;
-            if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
-                (c->desktop == desktop || c->desktop == DESKTOP_ALL))
+            if (focus_valid_target(c, desktop,
+                                   TRUE, TRUE,
+                                   FALSE, TRUE, FALSE, FALSE, FALSE))
             {
                 empty = FALSE;
 
@@ -67,7 +73,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
                     e = menu_add_normal(menu, desktop, c->title, NULL, FALSE);
                 }
 
-                if (config_menu_client_list_icons) {
+                if (config_menu_show_icons) {
                     e->data.normal.icon = client_icon(c);
                     RrImageRef(e->data.normal.icon);
                     e->data.normal.icon_alpha =
@@ -114,10 +120,12 @@ static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
     else {
         ObClient *t = self->data.normal.data;
         if (t) { /* it's set to NULL if its destroyed */
-            client_activate(t, FALSE, TRUE, TRUE, TRUE);
+            gboolean here = state & ShiftMask;
+
+            client_activate(t, TRUE, here, TRUE, TRUE, TRUE);
             /* if the window is omnipresent then we need to go to its
                desktop */
-            if (t->desktop == DESKTOP_ALL)
+            if (!here && t->desktop == DESKTOP_ALL)
                 screen_set_desktop(self->id, FALSE);
         }
         else
@@ -148,6 +156,7 @@ void client_list_combined_menu_startup(gboolean reconfig)
 
     combined_menu = menu_new(MENU_NAME, _("Windows"), TRUE, NULL);
     menu_set_update_func(combined_menu, self_update);
+    menu_set_cleanup_func(combined_menu, self_cleanup);
     menu_set_execute_func(combined_menu, menu_execute);
 }