X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_list_menu.c;h=f3df2a5aec1ba5a4e209bfad744e006cfd6e5ad3;hb=HEAD;hp=258646843a9a68d46c56175ec3780eca8f597986;hpb=a71a98b667c298fef7895f4d9a07eccb06cc6090;p=chaz%2Fopenbox diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 25864684..f3df2a5a 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_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_menu.h" #include "focus.h" #include "config.h" #include "gettext.h" @@ -38,100 +38,99 @@ typedef struct guint desktop; } DesktopData; +#define SEPARATOR -1 +#define ADD_DESKTOP -2 +#define REMOVE_DESKTOP -3 + 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; + if (focus_valid_target(c, d->desktop, + TRUE, TRUE, FALSE, TRUE, FALSE, FALSE, FALSE)) { 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, FALSE); + e = menu_add_normal(menu, d->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, d->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; } } if (empty || onlyiconic) { + ObMenuEntry *e; + /* 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; - ObMenuEntry *e; + menu_add_separator(menu, SEPARATOR, NULL); - 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, TRUE); + 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, ObMenuFrame *f, - ObClient *c, guint state, gpointer data, - Time time) + 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); + 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); } static void desk_menu_destroy(ObMenu *menu, gpointer data) { DesktopData *d = data; - g_free(d); + g_slice_free(DesktopData, d); desktop_menus = g_slist_remove(desktop_menus, menu); } +static void self_cleanup(ObMenu *menu, gpointer data) +{ + menu_clear_entries(menu); + + while (desktop_menus) { + menu_free(desktop_menus->data); + desktop_menus = g_slist_delete_link(desktop_menus, desktop_menus); + } +} + static gboolean self_update(ObMenuFrame *frame, gpointer data) { ObMenu *menu = frame->menu; @@ -143,14 +142,14 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) menu_free(desktop_menus->data); desktop_menus = g_slist_delete_link(desktop_menus, desktop_menus); } - + for (i = 0; i < screen_num_desktops; ++i) { ObMenu *submenu; gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i); - DesktopData *data = g_new(DesktopData, 1); + DesktopData *ddata = g_slice_new(DesktopData); - data->desktop = i; - submenu = menu_new(name, screen_desktop_names[i], FALSE, data); + ddata->desktop = i; + submenu = menu_new(name, screen_desktop_names[i], FALSE, ddata); menu_set_update_func(submenu, desk_menu_update); menu_set_execute_func(submenu, desk_menu_execute); menu_set_destroy_func(submenu, desk_menu_destroy); @@ -162,9 +161,29 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) desktop_menus = g_slist_append(desktop_menus, submenu); } + if (config_menu_manage_desktops) { + menu_add_separator(menu, SEPARATOR, NULL); + 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 */ } +static void self_execute(ObMenuEntry *self, ObMenuFrame *f, + ObClient *c, guint state, gpointer data) +{ + 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(); + } +} + static void client_dest(ObClient *client, gpointer data) { /* This concise function removes all references to a closed @@ -176,11 +195,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; } } } @@ -195,6 +213,8 @@ void client_list_menu_startup(gboolean reconfig) menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL); menu_set_update_func(menu, self_update); + menu_set_cleanup_func(menu, self_cleanup); + menu_set_execute_func(menu, self_execute); } void client_list_menu_shutdown(gboolean reconfig)