X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_combined_menu.c;h=af2819bb3023b6a1cf2f18dec43165bd85279733;hb=780d1b0961e2eed5fea4645b4398fafb4adad73a;hp=3ea4669b827021056cf6a6dfdbdf927e741ee4dd;hpb=66c350763fa85cfda0b6561ace9c032d3aa03b71;p=chaz%2Fopenbox

diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c
index 3ea4669b..af2819bb 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
@@ -20,7 +20,6 @@
 #include "openbox.h"
 #include "menu.h"
 #include "menuframe.h"
-#include "action.h"
 #include "screen.h"
 #include "client.h"
 #include "focus.h"
@@ -33,85 +32,77 @@
 
 ObMenu *combined_menu;
 
-static void self_update(ObMenuFrame *frame, gpointer data)
+static gboolean self_update(ObMenuFrame *frame, gpointer data)
 {
     ObMenu *menu = frame->menu;
     ObMenuEntry *e;
     GList *it;
-    gint i;
     guint desktop;
 
     menu_clear_entries(menu);
 
     for (desktop = 0; desktop < screen_num_desktops; desktop++) {
         gboolean empty = TRUE;
+        gboolean onlyiconic = TRUE;
 
-        /* Don't need a separator at the very top */
         menu_add_separator(menu, -1, screen_desktop_names[desktop]);
-        for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
+        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))
             {
-                GSList *acts = NULL;
-                ObAction* act;
                 const ObClientIcon *icon;
 
                 empty = FALSE;
 
-                act = action_from_string("Activate",
-                                         OB_USER_ACTION_MENU_SELECTION);
-                act->data.activate.any.c = c;
-                acts = g_slist_append(acts, act);
-                act = action_from_string("Desktop",
-                                         OB_USER_ACTION_MENU_SELECTION);
-                act->data.desktop.desk = desktop;
-                acts = g_slist_append(acts, act);
-
                 if (c->iconic) {
                     gchar *title = g_strdup_printf("(%s)", c->icon_title);
-                    e = menu_add_normal(menu, i, title, acts);
+                    e = menu_add_normal(menu, -1, title, NULL, FALSE);
                     g_free(title);
-                } else
-                    e = menu_add_normal(menu, i, c->title, acts);
+                } else {
+                    onlyiconic = FALSE;
+                    e = menu_add_normal(menu, -1, 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;
+                    e->data.normal.icon_alpha =
+                        c->iconic ? OB_ICONIC_ALPHA : 0xff;
                 }
+
+                e->data.normal.data = c;
             }
         }
 
-        if (empty) {
-            /* no entries */
-
-            GSList *acts = NULL;
-            ObAction* act;
+        if (empty || onlyiconic) {
             ObMenuEntry *e;
 
-            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);
+            /* 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, -1, NULL);
+
+            e = menu_add_normal(menu, desktop, _("Go there..."), NULL, TRUE);
             if (desktop == screen_desktop)
                 e->data.normal.enabled = FALSE;
         }
     }
+    return TRUE; /* always show the menu */
 }
 
-/* executes it using the client in the actions, since we set that
-   when we make the actions! */
-static void menu_execute(ObMenuEntry *self, guint state, gpointer data,
+static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
+                         ObClient *c, guint state, gpointer data,
                          Time time)
 {
-    ObAction *a;
-
-    if (self->data.normal.actions) {
-        a = self->data.normal.actions->data;
-        action_run(self->data.normal.actions, a->data.any.c, state, time);
+    if (self->id == -1) {
+        if (self->data.normal.data) /* it's set to NULL if its destroyed */
+            client_activate(self->data.normal.data, FALSE, TRUE);
     }
+    else
+        screen_set_desktop(self->id, TRUE);
 }
 
 static void client_dest(ObClient *client, gpointer data)
@@ -123,12 +114,9 @@ static void client_dest(ObClient *client, gpointer data)
     for (eit = combined_menu->entries; eit; eit = g_list_next(eit)) {
         ObMenuEntry *meit = eit->data;
         if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL &&
-            meit->data.normal.actions)
+            meit->data.normal.data == client)
         {
-            ObAction *a = meit->data.normal.actions->data;
-            ObClient *c = a->data.any.c;
-            if (c == client)
-                a->data.any.c = NULL;
+            meit->data.normal.data = NULL;
         }
     }
 }
@@ -136,9 +124,9 @@ static void client_dest(ObClient *client, gpointer data)
 void client_list_combined_menu_startup(gboolean reconfig)
 {
     if (!reconfig)
-        client_add_destructor(client_dest, NULL);
+        client_add_destroy_notify(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);
 }
@@ -146,5 +134,5 @@ void client_list_combined_menu_startup(gboolean reconfig)
 void client_list_combined_menu_shutdown(gboolean reconfig)
 {
     if (!reconfig)
-        client_remove_destructor(client_dest);
+        client_remove_destroy_notify(client_dest);
 }