X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=2ac2903869b01b98e72f0149763448fe321d183b;hb=de98f8153b087316bc15a5d4ddd645c6972aad69;hp=65f8ad5ed3de90b35781f459aef5d783712edc3b;hpb=ea2f33e9ee65856faef6617d013270e9898d9911;p=chaz%2Fopenbox

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 65f8ad5e..2ac29038 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -1,3 +1,21 @@
+/* -*- 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"
@@ -13,12 +31,11 @@
 
 static GSList *desktop_menus;
 
-typedef struct {
+typedef struct
+{
     guint desktop;
 } DesktopData;
 
-void plugin_setup_config() { }
-
 static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 {
     ObMenu *menu = frame->menu;
@@ -26,25 +43,33 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
     GList *it;
     gint i;
     gboolean icons = FALSE;
+    gboolean empty = TRUE;
 
     menu_clear_entries(menu);
 
     for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) {
         ObClient *c = it->data;
-        if (client_normal(c)) {
-            GSList *acts;
+        if (client_normal(c) && !c->skip_taskbar) {
+            GSList *acts = NULL;
             ObAction* act;
             ObMenuEntry *e;
-            ObClientIcon *icon;
+            const ObClientIcon *icon;
+
+            empty = FALSE;
 
             if (!icons && c->iconic) {
                 icons = TRUE;
                 menu_add_separator(menu, -1);
             }
 
-            act = action_from_string("activate");
+            act = action_from_string("Activate",
+                                     OB_USER_ACTION_MENU_SELECTION);
             act->data.activate.any.c = c;
-            acts = g_slist_prepend(NULL, act);
+            acts = g_slist_append(acts, act);
+            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, i,
                                 (c->iconic ? c->icon_title : c->title), acts);
 
@@ -55,19 +80,28 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             }
         }
     }
-    
+
+    if (empty) {
+        /* no entries */
+
+        GSList *acts = NULL;
+        ObAction* act;
+        act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
+        act->data.desktop.desk = d->desktop;
+        acts = g_slist_append(acts, act);
+        menu_add_normal(menu, 0, _("Go there..."), 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;
+    ObAction *a;
 
-    for (it = self->data.normal.actions; it; it = g_slist_next(it))
-    {
-        ObAction *act = it->data;
-        act->func(&act->data);
+    if (self->data.normal.actions) {
+        a = self->data.normal.actions->data;
+        action_run(self->data.normal.actions, a->data.any.c, state);
     }
 }
 
@@ -76,6 +110,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)