DesktopData *d = 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) {
+ for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
ObClient *c = it->data;
- if (client_normal(c) && !c->skip_taskbar) {
+ if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
+ (c->desktop == d->desktop || c->desktop == DESKTOP_ALL))
+ {
GSList *acts = NULL;
ObAction* act;
ObMenuEntry *e;
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;
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 (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) {
+ if (c->iconic) {
+ gchar *title = g_strdup_printf("(%s)", c->icon_title);
+ e = menu_add_normal(menu, i, title, acts);
+ g_free(title);
+ } else
+ e = menu_add_normal(menu, i, c->title, acts);
+
+ 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;
/* 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)
+static void desk_menu_execute(ObMenuEntry *self, guint state, gpointer data,
+ Time time)
{
ObAction *a;
if (self->data.normal.actions) {
a = self->data.normal.actions->data;
- action_run(self->data.normal.actions, a->data.any.c, state);
+ action_run(self->data.normal.actions, a->data.any.c, state, time);
}
}