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
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 || c->iconic)) {
+ if (client_normal(c) && (!c->skip_taskbar || c->iconic) &&
+ (c->desktop == d->desktop || c->desktop == DESKTOP_ALL))
+ {
GSList *acts = NULL;
ObAction* act;
ObMenuEntry *e;
if (!icons && c->iconic) {
icons = TRUE;
- menu_add_separator(menu, -1);
+ menu_add_separator(menu, -1, NULL);
}
act = action_from_string("Activate",
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);
+ (c->iconic ? c->icon_title : c->title),
+ acts, FALSE);
if (config_menu_client_list_icons
&& (icon = client_icon(c, 32, 32))) {
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);
+ e = menu_add_normal(menu, 0, _("Go there..."), acts, TRUE);
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)
+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);
}
}
DesktopData *data = g_new(DesktopData, 1);
data->desktop = i;
- submenu = menu_new(name, screen_desktop_names[i], data);
+ submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
menu_set_update_func(submenu, desk_menu_update);
menu_set_execute_func(submenu, desk_menu_execute);
menu_set_destroy_func(submenu, desk_menu_destroy);
if (!reconfig)
client_add_destructor(client_dest, NULL);
- menu = menu_new(MENU_NAME, _("Desktops"), NULL);
+ menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL);
menu_set_update_func(menu, self_update);
}