#include "menuframe.h"
#include "screen.h"
#include "client.h"
+#include "client_list_combined_menu.h"
#include "focus.h"
#include "config.h"
#include "gettext.h"
#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 gboolean self_update(ObMenuFrame *frame, gpointer data)
{
gboolean empty = TRUE;
gboolean onlyiconic = TRUE;
- menu_add_separator(menu, -1, screen_desktop_names[desktop]);
+ 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) &&
if (c->iconic) {
gchar *title = g_strdup_printf("(%s)", c->icon_title);
- e = menu_add_normal(menu, -1, title, NULL, FALSE);
+ e = menu_add_normal(menu, desktop, title, NULL, FALSE);
g_free(title);
} else {
onlyiconic = FALSE;
- e = menu_add_normal(menu, -1, c->title, NULL, FALSE);
+ e = menu_add_normal(menu, desktop, c->title, NULL, FALSE);
}
if (config_menu_client_list_icons
}
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);
+ menu_add_separator(menu, SEPARATOR, NULL);
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 */
}
static void menu_execute(ObMenuEntry *self, ObMenuFrame *f,
ObClient *c, guint state, gpointer data)
{
- 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);
+ 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 */
+ client_activate(t, FALSE, TRUE, TRUE, TRUE);
+ /* if the window is omnipresent then we need to go to its
+ desktop */
+ if (t->desktop == DESKTOP_ALL)
+ screen_set_desktop(self->id, FALSE);
+ }
+ else
+ screen_set_desktop(self->id, TRUE);
}
- else
- screen_set_desktop(self->id, TRUE);
}
static void client_dest(ObClient *client, gpointer data)