X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_combined_menu.c;h=c26b6fa036f3da35c874d068c07b67e50ee13b07;hb=HEAD;hp=fcc95f69dfc1aa1cf4a3eb1ad04c256f0ed70048;hpb=e0e1d4ba7e150b215b55029ddbff3c824b94caf7;p=chaz%2Fopenbox diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c index fcc95f69..c26b6fa0 100644 --- a/openbox/client_list_combined_menu.c +++ b/openbox/client_list_combined_menu.c @@ -20,9 +20,9 @@ #include "openbox.h" #include "menu.h" #include "menuframe.h" -#include "action.h" #include "screen.h" #include "client.h" +#include "client_list_combined_menu.h" #include "focus.h" #include "config.h" #include "gettext.h" @@ -31,14 +31,22 @@ #define MENU_NAME "client-list-combined-menu" -ObMenu *combined_menu; +static ObMenu *combined_menu; + +#define SEPARATOR -1 +#define ADD_DESKTOP -2 +#define REMOVE_DESKTOP -3 + +static void self_cleanup(ObMenu *menu, gpointer data) +{ + menu_clear_entries(menu); +} static gboolean self_update(ObMenuFrame *frame, gpointer data) { ObMenu *menu = frame->menu; ObMenuEntry *e; GList *it; - gint i; guint desktop; menu_clear_entries(menu); @@ -47,42 +55,32 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) gboolean empty = TRUE; gboolean onlyiconic = TRUE; - menu_add_separator(menu, -1, screen_desktop_names[desktop]); - for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) { + menu_add_separator(menu, SEPARATOR, screen_desktop_names[desktop]); + 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 == desktop || c->desktop == DESKTOP_ALL)) + if (focus_valid_target(c, desktop, + TRUE, TRUE, + FALSE, TRUE, FALSE, FALSE, FALSE)) { - GSList *acts = NULL; - ObAction* act; - 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 = 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, FALSE); + e = menu_add_normal(menu, desktop, title, NULL, FALSE); g_free(title); } else { onlyiconic = FALSE; - e = menu_add_normal(menu, i, c->title, acts, FALSE); + e = menu_add_normal(menu, desktop, 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; + if (config_menu_show_icons) { + e->data.normal.icon = client_icon(c); + RrImageRef(e->data.normal.icon); + e->data.normal.icon_alpha = + c->iconic ? OB_ICONIC_ALPHA : 0xff; } + + e->data.normal.data = c; } } @@ -90,33 +88,48 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) /* 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); + menu_add_separator(menu, SEPARATOR, NULL); - GSList *acts = NULL; - ObAction* act; - ObMenuEntry *e; - - 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, TRUE); + e = menu_add_normal(menu, desktop, _("Go there..."), NULL, TRUE); if (desktop == screen_desktop) e->data.normal.enabled = FALSE; } } + + if (config_menu_manage_desktops) { + menu_add_separator(menu, SEPARATOR, _("Manage desktops")); + menu_add_normal(menu, ADD_DESKTOP, _("_Add new desktop"), NULL, TRUE); + menu_add_normal(menu, REMOVE_DESKTOP, _("_Remove last desktop"), + NULL, TRUE); + } + 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, - Time time) +static void 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 == ADD_DESKTOP) { + screen_add_desktop(FALSE); + menu_frame_hide_all(); + } + else if (self->id == REMOVE_DESKTOP) { + screen_remove_desktop(FALSE); + menu_frame_hide_all(); + } + else { + ObClient *t = self->data.normal.data; + if (t) { /* it's set to NULL if its destroyed */ + gboolean here = state & ShiftMask; + + client_activate(t, TRUE, here, TRUE, TRUE, TRUE); + /* if the window is omnipresent then we need to go to its + desktop */ + if (!here && t->desktop == DESKTOP_ALL) + screen_set_desktop(self->id, FALSE); + } + else + screen_set_desktop(self->id, TRUE); } } @@ -129,12 +142,9 @@ static void client_dest(ObClient *client, gpointer data) for (eit = combined_menu->entries; eit; eit = g_list_next(eit)) { ObMenuEntry *meit = eit->data; if (meit->type == OB_MENU_ENTRY_TYPE_NORMAL && - meit->data.normal.actions) + meit->data.normal.data == client) { - ObAction *a = meit->data.normal.actions->data; - ObClient *c = a->data.any.c; - if (c == client) - a->data.any.c = NULL; + meit->data.normal.data = NULL; } } } @@ -142,15 +152,16 @@ static void client_dest(ObClient *client, gpointer data) 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); + menu_set_cleanup_func(combined_menu, self_cleanup); menu_set_execute_func(combined_menu, menu_execute); } void client_list_combined_menu_shutdown(gboolean reconfig) { if (!reconfig) - client_remove_destructor(client_dest); + client_remove_destroy_notify(client_dest); }