move the client and client-list menus into the 'kernel'

4 files changed, 324 insertions, 0 deletions

diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
new file mode 100644
index 00000000..cf3b8d5d
--- /dev/null
+++ b/openbox/client_list_menu.c
@@ -0,0 +1,116 @@
+#include "kernel/openbox.h"
+#include "kernel/menu.h"
+#include "kernel/menuframe.h"
+#include "kernel/action.h"
+#include "kernel/screen.h"
+#include "kernel/client.h"
+#include "kernel/focus.h"
+#include "gettext.h"
+
+#include <glib.h>
+
+#define MENU_NAME "client-list-menu"
+
+static GSList *desktop_menus;
+
+typedef struct {
+    guint desktop;
+} DesktopData;
+
+void plugin_setup_config() { }
+
+static void desk_menu_update(ObMenuFrame *frame, gpointer data)
+{
+    ObMenu *menu = frame->menu;
+    DesktopData *d = data;
+    GList *it;
+    gint i;
+
+    menu_clear_entries(menu);
+
+    for (it = focus_order[d->desktop], i = 0; it; it = g_list_next(it), ++i) {
+        ObClient *c = it->data;
+        if (client_normal(c)) {
+            GSList *acts;
+            ObAction* act;
+            ObMenuEntry *e;
+            ObClientIcon *icon;
+
+            act = action_from_string("activate");
+            act->data.activate.c = c;
+            acts = g_slist_prepend(NULL, act);
+            e = menu_add_normal(menu, i,
+                                (c->iconic ? c->icon_title : c->title), acts);
+
+            if ((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;
+            }
+        }
+    }
+    
+}
+
+/* executes it without changing the client in the actions, since we set that
+   when we make the actions! */
+static void desk_menu_execute(ObMenuEntry *self, gpointer data)
+{
+    GSList *it;
+
+    for (it = self->data.normal.actions; it; it = g_slist_next(it))
+    {
+        ObAction *act = it->data;
+        act->func(&act->data);
+    }
+}
+
+static void desk_menu_destroy(ObMenu *menu, gpointer data)
+{
+    DesktopData *d = data;
+
+    g_free(d);
+}
+
+static void self_update(ObMenuFrame *frame, gpointer data)
+{
+    ObMenu *menu = frame->menu;
+    guint i;
+    GSList *it, *next;
+    
+    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);
+
+            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);
+
+            menu_add_submenu(menu, i, 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));
+    }
+}
+
+void client_list_menu_startup()
+{
+    ObMenu *menu;
+
+    menu = menu_new(MENU_NAME, _("Desktops"), NULL);
+    menu_set_update_func(menu, self_update);
+}
diff --git a/openbox/client_list_menu.h b/openbox/client_list_menu.h
new file mode 100644
index 00000000..f8d4ce1e
--- /dev/null
+++ b/openbox/client_list_menu.h
@@ -0,0 +1,6 @@
+#ifndef ob__client_list_menu_h
+#define ob__client_list_menu_h
+
+void client_list_menu_startup();
+
+#endif
diff --git a/openbox/client_menu.c b/openbox/client_menu.c
new file mode 100644
index 00000000..bd57f06d
--- /dev/null
+++ b/openbox/client_menu.c
@@ -0,0 +1,196 @@
+#include "kernel/debug.h"
+#include "kernel/menu.h"
+#include "kernel/menuframe.h"
+#include "kernel/screen.h"
+#include "kernel/client.h"
+#include "kernel/openbox.h"
+#include "kernel/frame.h"
+#include "gettext.h"
+
+#include <glib.h>
+
+#define CLIENT_MENU_NAME  "client-menu"
+#define SEND_TO_MENU_NAME "client-send-to-menu"
+#define LAYER_MENU_NAME   "client-layer-menu"
+
+enum {
+    LAYER_TOP,
+    LAYER_NORMAL,
+    LAYER_BOTTOM
+};
+
+enum {
+    CLIENT_SEND_TO,
+    CLIENT_LAYER,
+    CLIENT_ICONIFY,
+    CLIENT_MAXIMIZE,
+    CLIENT_RAISE,
+    CLIENT_LOWER,
+    CLIENT_SHADE,
+    CLIENT_DECORATE,
+    CLIENT_MOVE,
+    CLIENT_RESIZE,
+    CLIENT_CLOSE
+};
+
+static void client_update(ObMenuFrame *frame, gpointer data)
+{
+    ObMenu *menu = frame->menu;
+    ObMenuEntry *e;
+    GList *it;
+
+    frame->show_title = FALSE;
+
+    for (it = menu->entries; it; it = g_list_next(it)) {
+        e = it->data;
+        if (e->type == OB_MENU_ENTRY_TYPE_NORMAL)
+            e->data.normal.enabled = !!frame->client;
+    }
+
+    if (!frame->client)
+        return;
+
+    e = menu_find_entry_id(menu, CLIENT_ICONIFY);
+    e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_ICONIFY;
+
+    e = menu_find_entry_id(menu, CLIENT_MAXIMIZE);
+    e->data.normal.enabled =frame->client->functions & OB_CLIENT_FUNC_MAXIMIZE;
+
+    e = menu_find_entry_id(menu, CLIENT_SHADE);
+    e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_SHADE;
+
+    e = menu_find_entry_id(menu, CLIENT_MOVE);
+    e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_MOVE;
+
+    e = menu_find_entry_id(menu, CLIENT_RESIZE);
+    e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_RESIZE;
+
+    e = menu_find_entry_id(menu, CLIENT_CLOSE);
+    e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_CLOSE;
+}
+
+static void layer_update(ObMenuFrame *frame, gpointer data)
+{
+    ObMenu *menu = frame->menu;
+    ObMenuEntry *e;
+    GList *it;
+
+    for (it = menu->entries; it; it = g_list_next(it)) {
+        e = it->data;
+        if (e->type == OB_MENU_ENTRY_TYPE_NORMAL)
+            e->data.normal.enabled = !!frame->client;
+    }
+
+    if (!frame->client)
+        return;
+
+    e = menu_find_entry_id(menu, LAYER_TOP);
+    e->data.normal.enabled = !frame->client->above;
+
+    e = menu_find_entry_id(menu, LAYER_NORMAL);
+    e->data.normal.enabled = (frame->client->above || frame->client->below);
+
+    e = menu_find_entry_id(menu, LAYER_BOTTOM);
+    e->data.normal.enabled = !frame->client->below;
+}
+
+static void send_to_update(ObMenuFrame *frame, gpointer data)
+{
+    ObMenu *menu = frame->menu;
+    guint i;
+    GSList *acts;
+    ObAction *act;
+
+    menu_clear_entries(menu);
+
+    if (!frame->client)
+        return;
+
+    for (i = 0; i <= screen_num_desktops; ++i) {
+        gchar *name;
+        guint desk;
+
+        if (i >= screen_num_desktops) {
+            menu_add_separator(menu, -1);
+
+            desk = DESKTOP_ALL;
+            name = _("All desktops");
+        } else {
+            desk = i;
+            name = screen_desktop_names[i];
+        }
+
+        act = action_from_string("SendToDesktop");
+        act->data.sendto.desk = desk;
+        act->data.sendto.follow = FALSE;
+        acts = g_slist_prepend(NULL, act);
+        menu_add_normal(menu, desk, name, acts);
+
+        if (frame->client->desktop == desk) {
+            ObMenuEntry *e = menu_find_entry_id(menu, desk);
+            g_assert(e);
+            e->data.normal.enabled = FALSE;
+        }
+    }
+}
+
+void client_menu_startup()
+{
+    GSList *acts;
+    ObMenu *menu;
+
+    menu = menu_new(LAYER_MENU_NAME, _("Layer"), NULL);
+    menu_set_update_func(menu, layer_update);
+
+    acts = g_slist_prepend(NULL, action_from_string("SendToTopLayer"));
+    menu_add_normal(menu, LAYER_TOP, _("Always on top"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("SendToNormalLayer"));
+    menu_add_normal(menu, LAYER_NORMAL, _("Normal"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("SendToBottomLayer"));
+    menu_add_normal(menu, LAYER_BOTTOM, _("Always on bottom"),acts);
+
+
+    menu = menu_new(SEND_TO_MENU_NAME, _("Send to desktop"), NULL);
+    menu_set_update_func(menu, send_to_update);
+
+
+    menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), NULL);
+    menu_set_update_func(menu, client_update);
+
+    menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
+
+    menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME);
+
+    acts = g_slist_prepend(NULL, action_from_string("Iconify"));
+    menu_add_normal(menu, CLIENT_ICONIFY, _("Iconify"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("ToggleMaximizeFull"));
+    menu_add_normal(menu, CLIENT_MAXIMIZE, _("Maximize"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("Raise"));
+    menu_add_normal(menu, CLIENT_RAISE, _("Raise to top"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("Lower"));
+    menu_add_normal(menu, CLIENT_LOWER, _("Lower to bottom"),acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("ToggleShade"));
+    menu_add_normal(menu, CLIENT_SHADE, _("Roll up/down"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("ToggleDecorations"));
+    menu_add_normal(menu, CLIENT_DECORATE, _("Decorate"), acts);
+
+    menu_add_separator(menu, -1);
+
+    acts = g_slist_prepend(NULL, action_from_string("KeyboardMove"));
+    menu_add_normal(menu, CLIENT_MOVE, _("Move"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("KeyboardResize"));
+    menu_add_normal(menu, CLIENT_RESIZE, _("Resize"), acts);
+
+    menu_add_separator(menu, -1);
+
+    acts = g_slist_prepend(NULL, action_from_string("Close"));
+    menu_add_normal(menu, CLIENT_CLOSE, _("Close"), acts);
+}
diff --git a/openbox/client_menu.h b/openbox/client_menu.h
new file mode 100644
index 00000000..42be1396
--- /dev/null
+++ b/openbox/client_menu.h
@@ -0,0 +1,6 @@
+#ifndef ob__client_menu_h
+#define ob__client_menu_h
+
+void client_menu_startup();
+
+#endif