halfway through client changes but...

[chaz/openbox] / openbox / client_list_menu.c

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 2dab84fc32c38991b5226fddd07d31132fcaf500..4d4555f8c1182c0c5550bbc10391028b72f4a164 100644 (file)
--- 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,7 +31,8 @@
 
 static GSList *desktop_menus;
 
-typedef struct {
+typedef struct
+{
     guint desktop;
 } DesktopData;
 
@@ -24,6 +43,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
     GList *it;
     gint i;
     gboolean icons = FALSE;
+    gboolean empty = TRUE;
 
     menu_clear_entries(menu);
 
@@ -33,14 +53,17 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             GSList *acts;
             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);
             e = menu_add_normal(menu, i,
@@ -53,19 +76,28 @@ 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, _("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);
     }
 }