-#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"
+#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>
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;
menu_clear_entries(menu);
ObMenuEntry *e;
ObClientIcon *icon;
- act = action_from_string("activate");
- act->data.activate.c = c;
+ 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);
}
-/* 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);
}
}
DesktopData *d = data;
g_free(d);
+
+ desktop_menus = g_slist_remove(desktop_menus, menu);
}
static void self_update(ObMenuFrame *frame, gpointer data)