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
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
menu_add_separator(menu, -1, screen_desktop_names[desktop]);
for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
ObClient *c = it->data;
menu_add_separator(menu, -1, screen_desktop_names[desktop]);
for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
ObClient *c = it->data;
- e = menu_add_normal(menu, i, title, acts);
+ e = menu_add_normal(menu, i, title, acts, FALSE);
- } else
- e = menu_add_normal(menu, i, c->title, acts);
+ } else {
+ onlyiconic = FALSE;
+ e = menu_add_normal(menu, i, c->title, acts, FALSE);
+ }
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 (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 */
+ if (empty || onlyiconic) {
+ /* no entries or only iconified windows, so add a
+ * way to go to this desktop without uniconifying a window */
+ if (!empty)
+ menu_add_separator(menu, -1, NULL);
act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
act->data.desktop.desk = desktop;
acts = g_slist_append(acts, act);
act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
act->data.desktop.desk = desktop;
acts = g_slist_append(acts, act);
- e = menu_add_normal(menu, 0, _("Go there..."), acts);
+ e = menu_add_normal(menu, 0, _("Go there..."), acts, TRUE);
}
/* executes it using the client in the actions, since we set that
when we make the actions! */
}
/* executes it using the client in the actions, since we set that
when we make the actions! */
-static void menu_execute(ObMenuEntry *self, guint state, gpointer data,
+static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
+ ObClient *c, guint state, gpointer data,
- combined_menu = menu_new(MENU_NAME, _("Windows"), NULL);
+ combined_menu = menu_new(MENU_NAME, _("Windows"), TRUE, NULL);
menu_set_update_func(combined_menu, self_update);
menu_set_execute_func(combined_menu, menu_execute);
}
menu_set_update_func(combined_menu, self_update);
menu_set_execute_func(combined_menu, menu_execute);
}