cleanups for keyboard menu shotcuts. dont let & set a shortcut from stuff like menu...

[chaz/openbox] / openbox / client_list_menu.c

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index d703babdf334621d3e0308a964fa7a8b14e6c19e..208b31c1addbc5e42006dfeec82ab5b577fccb84 100644 (file)
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_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
@@ -49,9 +49,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
     menu_clear_entries(menu);
 
-    for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) {
+    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 == d->desktop || c->desktop == DESKTOP_ALL))
+        {
             GSList *acts = NULL;
             ObAction* act;
             ObMenuEntry *e;
@@ -61,7 +63,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
             if (!icons && c->iconic) {
                 icons = TRUE;
-                menu_add_separator(menu, -1);
+                menu_add_separator(menu, -1, NULL);
             }
 
             act = action_from_string("Activate",
@@ -73,7 +75,8 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             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);
+                                (c->iconic ? c->icon_title : c->title),
+                                acts, FALSE);
 
             if (config_menu_client_list_icons
                 && (icon = client_icon(c, 32, 32))) {
@@ -94,7 +97,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
         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, 0, _("Go there..."), acts);
+        e = menu_add_normal(menu, 0, _("Go there..."), acts, TRUE);
         if (d->desktop == screen_desktop)
             e->data.normal.enabled = FALSE;
     }
@@ -136,7 +139,7 @@ static void self_update(ObMenuFrame *frame, gpointer data)
             DesktopData *data = g_new(DesktopData, 1);
 
             data->desktop = i;
-            submenu = menu_new(name, screen_desktop_names[i], data);
+            submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
             menu_set_update_func(submenu, desk_menu_update);
             menu_set_execute_func(submenu, desk_menu_execute);
             menu_set_destroy_func(submenu, desk_menu_destroy);
@@ -185,7 +188,7 @@ void client_list_menu_startup(gboolean reconfig)
     if (!reconfig)
         client_add_destructor(client_dest, NULL);
 
-    menu = menu_new(MENU_NAME, _("Desktops"), NULL);
+    menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL);
     menu_set_update_func(menu, self_update);
 }