-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- 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
#include "screen.h"
#include "client.h"
#include "focus.h"
+#include "config.h"
#include "gettext.h"
#include <glib.h>
static GSList *desktop_menus;
-typedef struct {
+typedef struct
+{
guint desktop;
} DesktopData;
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;
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);
- if ((icon = client_icon(c, 32, 32))) {
+ 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;
}
}
}
-
+
+ if (empty) {
+ /* no entries */
+
+ GSList *acts = NULL;
+ ObAction* act;
+ ObMenuEntry *e;
+
+ 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, 0, _("Go there..."), acts);
+ if (d->desktop == screen_desktop)
+ e->data.normal.enabled = FALSE;
+ }
}
/* executes it using the client in the actions, since we set that
when we make the actions! */
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;
- action_run(it->data, act->data.any.c, state);
+ if (self->data.normal.actions) {
+ a = self->data.normal.actions->data;
+ action_run(self->data.normal.actions, a->data.any.c, state);
}
}