client_list_menu.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
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
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;
GList *it;
gint i;
- gboolean icons = FALSE;
guint desktop;
menu_clear_entries(menu);
for (desktop = 0; desktop < screen_num_desktops; desktop++) {
gboolean empty = TRUE;
+ gboolean onlyiconic = TRUE;
- menu_add_separator(menu, -1);
- e = menu_add_normal(menu, -1, NULL, NULL);
- e->data.normal.enabled = FALSE;
- e->data.normal.label = g_strdup(screen_desktop_names[desktop]);
- menu_add_separator(menu, -1);
- for (it = focus_order[desktop], i = 0; it; it = g_list_next(it), ++i) {
+ 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;
- if (client_normal(c) && (!c->skip_taskbar || c->iconic)) {
+ if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
+ (c->desktop == desktop || c->desktop == DESKTOP_ALL))
+ {
GSList *acts = NULL;
ObAction* act;
const ObClientIcon *icon;
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 = desktop;
acts = g_slist_append(acts, act);
- e = menu_add_normal(menu, i, (c->iconic ?
- c->icon_title : c->title), acts);
+
+ if (c->iconic) {
+ gchar *title = g_strdup_printf("(%s)", c->icon_title);
+ e = menu_add_normal(menu, i, title, acts, FALSE);
+ g_free(title);
+ } 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))) {
}
}
}
- icons = FALSE;
- 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;
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);
if (desktop == screen_desktop)
e->data.normal.enabled = FALSE;
}
}
+ return TRUE; /* always show the menu */
}
/* executes it using the client in the actions, since we set that
if (!reconfig)
client_add_destructor(client_dest, NULL);
- 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);
}