X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=8f8beed585b0e7ff855055e45d2850bdda7d48fa;hb=29c4cf4a15bc5fa97ba746b03a5e334f989c645e;hp=66b2b1d7996496d82c58e3d44c0f2f5c283849b9;hpb=957963e272be1fba1e06dd2bdcfa9a4348121baf;p=chaz%2Fopenbox diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 66b2b1d7..8f8beed5 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -2,7 +2,7 @@ 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 @@ -20,7 +20,6 @@ #include "openbox.h" #include "menu.h" #include "menuframe.h" -#include "action.h" #include "screen.h" #include "client.h" #include "focus.h" @@ -38,80 +37,71 @@ typedef struct guint desktop; } DesktopData; -static void desk_menu_update(ObMenuFrame *frame, gpointer data) +static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data) { ObMenu *menu = frame->menu; DesktopData *d = data; GList *it; - gint i; gboolean empty = TRUE; + gboolean onlyiconic = TRUE; menu_clear_entries(menu); - for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) { + for (it = focus_order; it; it = g_list_next(it)) { ObClient *c = it->data; if (client_normal(c) && (!c->skip_taskbar || c->iconic) && (c->desktop == d->desktop || c->desktop == DESKTOP_ALL)) { - GSList *acts = NULL; - ObAction* act; ObMenuEntry *e; const ObClientIcon *icon; empty = FALSE; - act = action_from_string("Activate", - OB_USER_ACTION_MENU_SELECTION); - act->data.activate.any.c = c; - acts = g_slist_append(acts, act); - act = action_from_string("Desktop", - OB_USER_ACTION_MENU_SELECTION); - act->data.desktop.desk = d->desktop; - acts = g_slist_append(acts, act); - if (c->iconic) { gchar *title = g_strdup_printf("(%s)", c->icon_title); - e = menu_add_normal(menu, i, title, acts); + e = menu_add_normal(menu, -1, title, NULL, FALSE); g_free(title); - } else - e = menu_add_normal(menu, i, c->title, acts); + } else { + onlyiconic = FALSE; + e = menu_add_normal(menu, -1, c->title, NULL, 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; } + + e->data.normal.data = c; } } - if (empty) { - /* no entries */ - - GSList *acts = NULL; - ObAction* act; + if (empty || onlyiconic) { ObMenuEntry *e; - 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); + /* 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); + + e = menu_add_normal(menu, d->desktop, _("Go there..."), NULL, TRUE); if (d->desktop == screen_desktop) e->data.normal.enabled = FALSE; } + return TRUE; /* always show */ } -/* 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, - Time time) +static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f, + ObClient *c, guint state, gpointer data) { - ObAction *a; - - if (self->data.normal.actions) { - a = self->data.normal.actions->data; - action_run(self->data.normal.actions, a->data.any.c, state, time); + if (self->id == -1) { + if (self->data.normal.data) /* it's set to NULL if its destroyed */ + client_activate(self->data.normal.data, FALSE, TRUE, TRUE, TRUE); } + else + screen_set_desktop(self->id, TRUE); } static void desk_menu_destroy(ObMenu *menu, gpointer data) @@ -123,39 +113,37 @@ static void desk_menu_destroy(ObMenu *menu, gpointer data) desktop_menus = g_slist_remove(desktop_menus, menu); } -static void self_update(ObMenuFrame *frame, gpointer data) +static gboolean self_update(ObMenuFrame *frame, gpointer data) { ObMenu *menu = frame->menu; guint i; - GSList *it, *next; + + menu_clear_entries(menu); + + while (desktop_menus) { + menu_free(desktop_menus->data); + desktop_menus = g_slist_delete_link(desktop_menus, desktop_menus); + } - it = desktop_menus; for (i = 0; i < screen_num_desktops; ++i) { - if (!it) { - ObMenu *submenu; - gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i); - DesktopData *data = g_new(DesktopData, 1); + ObMenu *submenu; + gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i); + DesktopData *data = g_new(DesktopData, 1); - data->desktop = i; - submenu = menu_new(name, screen_desktop_names[i], 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); + data->desktop = i; + 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); - menu_add_submenu(menu, i, name); + menu_add_submenu(menu, i, name); - g_free(name); + g_free(name); - desktop_menus = g_slist_append(desktop_menus, submenu); - } else - it = g_slist_next(it); - } - for (; it; it = next, ++i) { - next = g_slist_next(it); - menu_free(it->data); - desktop_menus = g_slist_delete_link(desktop_menus, it); - menu_entry_remove(menu_find_entry_id(menu, i)); + desktop_menus = g_slist_append(desktop_menus, submenu); } + + return TRUE; /* always show */ } static void client_dest(ObClient *client, gpointer data) @@ -169,11 +157,10 @@ static void client_dest(ObClient *client, gpointer data) GList *eit; for (eit = mit->entries; eit; eit = g_list_next(eit)) { ObMenuEntry *meit = eit->data; - if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL) { - ObAction *a = meit->data.normal.actions->data; - ObClient *c = a->data.any.c; - if (c == client) - a->data.any.c = NULL; + if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL && + meit->data.normal.data == client) + { + meit->data.normal.data = NULL; } } } @@ -184,14 +171,14 @@ void client_list_menu_startup(gboolean reconfig) ObMenu *menu; if (!reconfig) - client_add_destructor(client_dest, NULL); + client_add_destroy_notify(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); } void client_list_menu_shutdown(gboolean reconfig) { if (!reconfig) - client_remove_destructor(client_dest); + client_remove_destroy_notify(client_dest); }