X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Fclient_menu.c;h=67c17acd2c73088f32fa740075f87a61644898fa;hb=1052ca3f744bdad473b6e4028999375fb11d220b;hp=56ec6ce3e548c4d7f1f8544462c0b3bff6b6faed;hpb=71d2605e1c24732e923333419d829f1c5f867fed;p=chaz%2Fopenbox

diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index 56ec6ce3..67c17acd 100644
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -2,9 +2,17 @@
 
 #include "kernel/menu.h"
 #include "kernel/screen.h"
+#include "kernel/client.h"
+#include "kernel/openbox.h"
+
+#include "kernel/frame.h"
+
+#include "render/theme.h"
 
 static char *PLUGIN_NAME = "client_menu";
+
 static Menu *send_to_menu;
+static Menu *layer_menu;
 
 typedef struct {
 
@@ -13,25 +21,66 @@ typedef struct {
 #define CLIENT_MENU(m) ((Menu *)m)
 #define CLIENT_MENU_DATA(m) ((Client_Menu_Data *)((Menu *)m)->plugin_data)
 
-
 void client_menu_clean_up(Menu *m) {
 }
 
 void client_send_to_update(Menu *self)
 {
-    guint i;
-    g_message("yo!");
+    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],
+                   ((MenuEntry *)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) {
+            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);
+        }
+
+        menu_render_full(self);
+    }
+}
+
+void client_menu_show(Menu *self, int x, int y, Client *client)
+{
+    int newy;
+    g_assert(!self->invalid);
+    g_assert(client);
+    
+    newy = MAX(client->frame->area.y + client->frame->size.top, y);
+    newy -= ob_rr_theme->bwidth;
+    
+    /* 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 -
+                  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);
+        stacking_raise(MENU_AS_WINDOW(self));
+	self->shown = TRUE;
+    } else if (self->shown && self->open_submenu) {
+	menu_hide(self->open_submenu);
+    }
 }
 
 void plugin_setup_config() { }
@@ -44,7 +93,8 @@ void plugin_destroy (Menu *m)
 
 void *plugin_create() /* TODO: need config */
 {
-    Menu *m = menu_new(NULL, "client-menu", NULL);
+    Menu *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;
@@ -61,6 +111,11 @@ 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;
 
     /* send to desktop
        iconify
@@ -79,9 +134,17 @@ void plugin_startup()
 {
     Menu *t;
     /* create a Send To Workspace Menu */
-    send_to_menu = menu_new_full("Send To Workspace", "send-to-workspace",
+    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");
 }