X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Fclient_menu.c;h=31578d62a9a966db7619f1ff83198c5c04192878;hb=a95dc346fe7951dd48e41a41fcaafb6d872b0337;hp=2578129ec393a3933ab959154ebb555e0d0a402c;hpb=04a85677e535e6759ecde14b52e75789d8b8191e;p=chaz%2Fopenbox

diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index 2578129e..31578d62 100644
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -7,52 +7,75 @@
 
 #include "kernel/frame.h"
 
+#include "render/theme.h"
+
+#if 0
 static char *PLUGIN_NAME = "client_menu";
+#endif
 
-static Menu *send_to_menu;
-static Menu *layer_menu;
+static ObMenu *send_to_menu;
+static ObMenu *layer_menu;
 
 typedef struct {
-
+    gint foo;
 } Client_Menu_Data;
 
-#define CLIENT_MENU(m) ((Menu *)m)
-#define CLIENT_MENU_DATA(m) ((Client_Menu_Data *)((Menu *)m)->plugin_data)
+#define CLIENT_MENU(m) ((ObMenu *)m)
+#define CLIENT_MENU_DATA(m) ((Client_Menu_Data *)((ObMenu *)m)->plugin_data)
 
-
-void client_menu_clean_up(Menu *m) {
+void client_menu_clean_up(ObMenu *m) {
 }
 
-void client_send_to_update(Menu *self)
+void client_send_to_update(ObMenu *self)
 {
-    guint i;
+    guint i = 0;
+    GList *it = self->entries;
     
-    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);
+    /* check if we have to update. lame */
+    while (it != NULL) {
+        if (i >= screen_num_desktops)
+            break;
+        if (strcmp(screen_desktop_names[i],
+                   ((ObMenuEntry *)it->data)->label) != 0)
+            break;
+        ++i;
+        it = it->next;
     }
 
-    menu_render_full(self);
+    if (it != NULL || i != screen_num_desktops) {
+        menu_clear(self);
+        g_message("update");
+        for (i = 0; i < screen_num_desktops; ++i) {
+            ObMenuEntry *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);
+        }
+
+        menu_render_full(self);
+    }
 }
 
-void client_menu_show(Menu *self, int x, int y, Client *client)
+#if 0
+void client_menu_show(ObMenu *self, int x, int y, Client *client)
 {
     int newy;
     g_assert(!self->invalid);
     g_assert(client);
     
-    newy = client->frame->area.y + client->frame->a_focused_title->area.height;
+    newy = MAX(client->frame->area.y + client->frame->size.top, y);
+    newy -= ob_rr_theme->bwidth;
     
-    XMoveWindow(ob_display, self->frame, 
-		MIN(x, screen_physical_size.width - self->size.width), 
-		MIN(newy, screen_physical_size.height - self->size.height));
+    /* XXX do xinerama shit like in menu.c! im not coding it now because
+       this function isnt even being used right now... */
     POINT_SET(self->location, 
-	      MIN(x, screen_physical_size.width - self->size.width), 
-	      MIN(newy, screen_physical_size.height - self->size.height));
+	      MIN(x, screen_physical_size.width - self->size.width -
+                  ob_rr_theme->bwidth * 2), 
+	      MIN(newy, screen_physical_size.height - self->size.height -
+                  ob_rr_theme->bwidth * 2));
+    XMoveWindow(ob_display, self->frame, self->location.x, self->location.y);
 
     if (!self->shown) {
 	XMapWindow(ob_display, self->frame);
@@ -62,19 +85,20 @@ void client_menu_show(Menu *self, int x, int y, Client *client)
 	menu_hide(self->open_submenu);
     }
 }
+#endif
 
 void plugin_setup_config() { }
 
 void plugin_shutdown() { }
 
-void plugin_destroy (Menu *m)
+void plugin_destroy (ObMenu *m)
 {
 }
 
 void *plugin_create() /* TODO: need config */
 {
-    Menu *m = menu_new_full(NULL, "client-menu", NULL,
-                            client_menu_show, NULL);
+    ObMenu *m = menu_new_full(NULL, "client-menu", NULL,
+                            /*client_menu_show*/NULL, NULL);
     menu_add_entry(m, menu_entry_new_submenu("Send To Workspace",
                                              send_to_menu));
     send_to_menu->parent = m;
@@ -91,6 +115,8 @@ void *plugin_create() /* TODO: need config */
                                      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;
@@ -110,8 +136,8 @@ void *plugin_create() /* TODO: need config */
 
 void plugin_startup()
 {
-    Menu *t;
-    /* create a Send To Workspace Menu */
+    ObMenu *t;
+    /* create a Send To Workspace ObMenu */
     send_to_menu = menu_new_full(NULL, "send-to-workspace",
                           NULL, NULL, client_send_to_update);
     
@@ -123,6 +149,6 @@ void plugin_startup()
     menu_add_entry(layer_menu, menu_entry_new("Bottom Layer",
                                      action_from_string("sendtobottomlayer")));
                           
-    t = (Menu *)plugin_create("client_menu");
+    t = (ObMenu *)plugin_create("client_menu");
 }