X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_combined_menu.c;h=8412abe187cdf1b580e157e7a4b6dd7db205f046;hb=9aa42c2ae7b457db6efc1703dd47d1e3ac5e75e8;hp=39a8e60b3f280a4370fc4feb00112d10fe4b9bdf;hpb=c80b496bf407d73bea169058abfcda44effad0dd;p=chaz%2Fopenbox

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 39a8e60b..8412abe1 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
@@ -39,7 +39,6 @@ static void self_update(ObMenuFrame *frame, gpointer data)
     ObMenuEntry *e;
     GList *it;
     gint i;
-    gboolean icons = FALSE;
     guint desktop;
 
     menu_clear_entries(menu);
@@ -48,13 +47,7 @@ static void self_update(ObMenuFrame *frame, gpointer data)
         gboolean empty = TRUE;
 
         /* Don't need a separator at the very top */
-        if (desktop > 0)
-            menu_add_separator(menu, -1);
-        e = menu_add_normal(menu, -1, NULL, NULL);
-        e->data.normal.enabled = FALSE;
-        e->data.normal.label = g_strdup(screen_desktop_names[desktop]);
-        /* The one at the bottom will always have entries below it though */
-        menu_add_separator(menu, -1);
+        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) &&
@@ -66,11 +59,6 @@ static void self_update(ObMenuFrame *frame, gpointer data)
 
                 empty = FALSE;
 
-                if (!icons && c->iconic) {
-                    icons = TRUE;
-                    menu_add_separator(menu, -1);
-                }
-
                 act = action_from_string("Activate",
                                          OB_USER_ACTION_MENU_SELECTION);
                 act->data.activate.any.c = c;
@@ -79,8 +67,13 @@ 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
+                    e = menu_add_normal(menu, i, c->title, acts, FALSE);
 
                 if (config_menu_client_list_icons
                         && (icon = client_icon(c, 32, 32))) {
@@ -90,7 +83,6 @@ static void self_update(ObMenuFrame *frame, gpointer data)
                 }
             }
         }
-        icons = FALSE;
 
         if (empty) {
             /* no entries */
@@ -102,7 +94,7 @@ static void self_update(ObMenuFrame *frame, gpointer data)
             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);
+            e = menu_add_normal(menu, 0, _("Go there..."), acts, TRUE);
             if (desktop == screen_desktop)
                 e->data.normal.enabled = FALSE;
         }
@@ -146,7 +138,7 @@ 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(combined_menu, menu_execute);
 }