X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Fclient_menu.c;h=32277047c2da05c4e43e6660eb46072eca84cf62;hb=f7eb47dba4b091b67a28404ce461b15dffcb4298;hp=b092e6a607fba659947214f34c7187e09a96371e;hpb=4160963ca4f0aebb2f8bf69d0bd6ff349ac48e28;p=chaz%2Fopenbox

diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index b092e6a6..32277047 100644
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -1,133 +1,199 @@
-#include <glib.h>
-
+#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 "render/theme.h"
+#include <glib.h>
 
-static char *PLUGIN_NAME = "client_menu";
+#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 Menu *send_to_menu;
-static Menu *layer_menu;
+void plugin_setup_config() { }
 
-typedef struct {
+static void client_update(ObMenuFrame *frame, gpointer data)
+{
+    ObMenu *menu = frame->menu;
+    ObMenuEntry *e;
+    GList *it;
 
-} Client_Menu_Data;
+    frame->show_title = FALSE;
 
-#define CLIENT_MENU(m) ((Menu *)m)
-#define CLIENT_MENU_DATA(m) ((Client_Menu_Data *)((Menu *)m)->plugin_data)
+    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;
 
-void client_menu_clean_up(Menu *m) {
-}
+    e = menu_find_entry_id(menu, CLIENT_ICONIFY);
+    e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_ICONIFY;
 
-void client_send_to_update(Menu *self)
-{
-    guint i;
-    
-    for (i = 0; i < screen_num_desktops; ++i) {
-        MenuEntry *e;
-        Action *a = action_from_string("sendtodesktop");
-        a->data.sendto.desk = i;
-        a->data.sendto.follow = FALSE;
-        e = menu_entry_new(screen_desktop_names[i], a);
-        menu_add_entry(self, e);
-    }
+    e = menu_find_entry_id(menu, CLIENT_MAXIMIZE);
+    e->data.normal.enabled =frame->client->functions & OB_CLIENT_FUNC_MAXIMIZE;
 
-    menu_render_full(self);
+    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;
 }
 
-void client_menu_show(Menu *self, int x, int y, Client *client)
+static void layer_update(ObMenuFrame *frame, gpointer data)
 {
-    int newy;
-    g_assert(!self->invalid);
-    g_assert(client);
-    
-    newy = client->frame->area.y + client->frame->a_focused_title->area.height
-        + theme_bwidth;
-    
-    POINT_SET(self->location, 
-	      MIN(x, screen_physical_size.width - self->size.width -
-                  theme_bwidth * 2), 
-	      MIN(newy, screen_physical_size.height - self->size.height -
-                  theme_bwidth * 2));
-    XMoveWindow(ob_display, self->frame, self->location.x, self->location.y);
-
-    if (!self->shown) {
-	XMapWindow(ob_display, self->frame);
-        stacking_raise(MENU_AS_WINDOW(self));
-	self->shown = TRUE;
-    } else if (self->shown && self->open_submenu) {
-	menu_hide(self->open_submenu);
+    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;
     }
-}
 
-void plugin_setup_config() { }
+    e = menu_find_entry_id(menu, LAYER_TOP);
+    e->data.normal.enabled = !frame->client->above;
 
-void plugin_shutdown() { }
+    e = menu_find_entry_id(menu, LAYER_NORMAL);
+    e->data.normal.enabled = !(frame->client->above || frame->client->below);
 
-void plugin_destroy (Menu *m)
-{
+    e = menu_find_entry_id(menu, LAYER_BOTTOM);
+    e->data.normal.enabled = !frame->client->below;
 }
 
-void *plugin_create() /* TODO: need config */
+static void send_to_update(ObMenuFrame *frame, gpointer data)
 {
-    Menu *m = menu_new_full(NULL, "client-menu", NULL,
-                            client_menu_show, NULL);
-    menu_add_entry(m, menu_entry_new_submenu("Send To Workspace",
-                                             send_to_menu));
-    send_to_menu->parent = m;
-
-    menu_add_entry(m, menu_entry_new("Iconify",
-                                     action_from_string("iconify")));
-    menu_add_entry(m, menu_entry_new("Raise",
-                                     action_from_string("raise")));
-    menu_add_entry(m, menu_entry_new("Lower",
-                                     action_from_string("lower")));
-    menu_add_entry(m, menu_entry_new("Close",
-                                     action_from_string("close")));
-    menu_add_entry(m, menu_entry_new("Shade",
-                                     action_from_string("toggleshade")));
-    menu_add_entry(m, menu_entry_new("Omnipresent",
-                                     action_from_string("toggleomnipresent")));
-    menu_add_entry(m, menu_entry_new("Decorations",
-                                     action_from_string("toggledecorations")));
-    menu_add_entry(m, menu_entry_new_submenu("Layers",
-                                             layer_menu));
-    layer_menu->parent = m;
-
-    /* send to desktop
-       iconify
-       raise
-       lower
-       close
-       kill
-       shade
-       omnipresent
-       decorations
-    */
-    return (void *)m;
+    ObMenu *menu = frame->menu;
+    guint i;
+    GSList *acts;
+    ObAction *act;
+
+    menu_clear_entries(SEND_TO_MENU_NAME);
+
+    if (!frame->client)
+        return;
+
+    for (i = 0; i <= screen_num_desktops; ++i) {
+        gchar *name;
+        guint desk;
+
+        if (i >= screen_num_desktops) {
+            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(SEND_TO_MENU_NAME, 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 plugin_startup()
 {
-    Menu *t;
-    /* create a Send To Workspace Menu */
-    send_to_menu = menu_new_full(NULL, "send-to-workspace",
-                          NULL, NULL, client_send_to_update);
-    
-    layer_menu = menu_new(NULL, "layer", NULL);
-    menu_add_entry(layer_menu, menu_entry_new("Top Layer",
-                                     action_from_string("sendtotoplayer")));
-    menu_add_entry(layer_menu, menu_entry_new("Normal Layer",
-                                     action_from_string("sendtonormallayer")));
-    menu_add_entry(layer_menu, menu_entry_new("Bottom Layer",
-                                     action_from_string("sendtobottomlayer")));
-                          
-    t = (Menu *)plugin_create("client_menu");
+    GSList *acts;
+
+    menu_new(LAYER_MENU_NAME, _("Layer"), NULL);
+    menu_set_update_func(LAYER_MENU_NAME, layer_update);
+
+    acts = g_slist_prepend(NULL, action_from_string("SendToTopLayer"));
+    menu_add_normal(LAYER_MENU_NAME, LAYER_TOP, _("Always on top"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("SendToNormalLayer"));
+    menu_add_normal(LAYER_MENU_NAME, LAYER_NORMAL, _("Normal"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("SendToBottomLayer"));
+    menu_add_normal(LAYER_MENU_NAME, LAYER_BOTTOM, _("Always on bottom"),acts);
+
+
+    menu_new(SEND_TO_MENU_NAME, _("Send to desktop"), NULL);
+    menu_set_update_func(SEND_TO_MENU_NAME, send_to_update);
+
+
+    menu_new(CLIENT_MENU_NAME, _("Client menu"), NULL);
+    menu_set_update_func(CLIENT_MENU_NAME, client_update);
+
+    menu_add_submenu(CLIENT_MENU_NAME, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
+
+    menu_add_submenu(CLIENT_MENU_NAME, CLIENT_LAYER, LAYER_MENU_NAME);
+
+    acts = g_slist_prepend(NULL, action_from_string("Iconify"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_ICONIFY, _("Iconify"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("Maximize"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_MAXIMIZE, _("Maximize"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("Raise"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_RAISE, _("Raise to top"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("Lower"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_LOWER, _("Lower to bottom"),acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("ToggleShade"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_SHADE, _("(Un)Shade"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("ToggleDecorations"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_DECORATE, _("Decorate"), acts);
+
+    menu_add_separator(CLIENT_MENU_NAME, -1);
+
+    acts = g_slist_prepend(NULL, action_from_string("KeyboardMove"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_MOVE, _("Move"), acts);
+
+    acts = g_slist_prepend(NULL, action_from_string("KeyboardResize"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_RESIZE, _("Resize"), acts);
+
+    menu_add_separator(CLIENT_MENU_NAME, -1);
+
+    acts = g_slist_prepend(NULL, action_from_string("Close"));
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_CLOSE, _("Close"), acts);
 }
 
+void plugin_shutdown()
+{
+    menu_free(LAYER_MENU_NAME);
+    menu_free(SEND_TO_MENU_NAME);
+    menu_free(CLIENT_MENU_NAME);
+}