X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=acf9f071837204a20d005ecbb646e3ae0d9e25a0;hb=fdd1c3c8a7eac8ba1246ae64cbfca6f922294c51;hp=cf3b8d5de772111896f73f784c89fb4edb72a116;hpb=a9567a816385f8f66ed0f827bb4af78cdb10cd6d;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index cf3b8d5d..acf9f071 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -1,10 +1,28 @@
-#include "kernel/openbox.h"
-#include "kernel/menu.h"
-#include "kernel/menuframe.h"
-#include "kernel/action.h"
-#include "kernel/screen.h"
-#include "kernel/client.h"
-#include "kernel/focus.h"
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   client_list_menu.c for the Openbox window manager
+   Copyright (c) 2003        Ben 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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
+#include "openbox.h"
+#include "menu.h"
+#include "menuframe.h"
+#include "action.h"
+#include "screen.h"
+#include "client.h"
+#include "focus.h"
 #include "gettext.h"
 
 #include <glib.h>
@@ -17,14 +35,14 @@ typedef struct {
     guint desktop;
 } DesktopData;
 
-void plugin_setup_config() { }
-
 static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 {
     ObMenu *menu = frame->menu;
     DesktopData *d = data;
     GList *it;
     gint i;
+    gboolean icons = FALSE;
+    gboolean empty = TRUE;
 
     menu_clear_entries(menu);
 
@@ -36,8 +54,16 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             ObMenuEntry *e;
             ObClientIcon *icon;
 
-            act = action_from_string("activate");
-            act->data.activate.c = c;
+            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;
             acts = g_slist_prepend(NULL, act);
             e = menu_add_normal(menu, i,
                                 (c->iconic ? c->icon_title : c->title), acts);
@@ -49,19 +75,29 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             }
         }
     }
-    
+
+    if (empty) {
+        /* no entries */
+
+        GSList *acts;
+        ObAction* act;
+        act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
+        act->data.desktop.desk = d->desktop;
+        acts = g_slist_prepend(NULL, act);
+        menu_add_normal(menu, 0, "Switch to...", acts);
+    }
 }
 
-/* executes it without changing the client in the actions, since we set that
+/* executes it using the client in the actions, since we set that
    when we make the actions! */
-static void desk_menu_execute(ObMenuEntry *self, gpointer data)
+static void desk_menu_execute(ObMenuEntry *self, guint state, gpointer data)
 {
     GSList *it;
 
     for (it = self->data.normal.actions; it; it = g_slist_next(it))
     {
         ObAction *act = it->data;
-        act->func(&act->data);
+        action_run(it->data, act->data.any.c, state);
     }
 }
 
@@ -70,6 +106,8 @@ static void desk_menu_destroy(ObMenu *menu, gpointer data)
     DesktopData *d = data;
 
     g_free(d);
+
+    desktop_menus = g_slist_remove(desktop_menus, menu);
 }
 
 static void self_update(ObMenuFrame *frame, gpointer data)