ObMenu *combined_menu;
-static void self_update(ObMenuFrame *frame, gpointer data)
+static gboolean self_update(ObMenuFrame *frame, gpointer data)
{
ObMenu *menu = frame->menu;
ObMenuEntry *e;
for (desktop = 0; desktop < screen_num_desktops; desktop++) {
gboolean empty = TRUE;
+ gboolean onlyiconic = TRUE;
- /* Don't need a separator at the very top */
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;
gchar *title = g_strdup_printf("(%s)", c->icon_title);
e = menu_add_normal(menu, i, title, acts, FALSE);
g_free(title);
- } else
+ } 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;
+ e->data.normal.icon_alpha =
+ c->iconic ? OB_ICONIC_ALPHA : 0xff;
}
}
}
- 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);
GSList *acts = NULL;
ObAction* act;
e->data.normal.enabled = FALSE;
}
}
+ return TRUE; /* always show the menu */
}
/* 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,
Time time)
{
ObAction *a;
void client_list_combined_menu_startup(gboolean reconfig)
{
if (!reconfig)
- client_add_destructor(client_dest, NULL);
+ client_add_destroy_notify(client_dest, NULL);
combined_menu = menu_new(MENU_NAME, _("Windows"), TRUE, NULL);
menu_set_update_func(combined_menu, self_update);
void client_list_combined_menu_shutdown(gboolean reconfig)
{
if (!reconfig)
- client_remove_destructor(client_dest);
+ client_remove_destroy_notify(client_dest);
}