move the keyboard and mouse plugins into the kernel for mucho sexiness.

[chaz/openbox] / plugins / menu / client_menu.c

diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index 31578d62a9a966db7619f1ff83198c5c04192878..c45d2a432a27bc295626e6dba4524519797c22bf 100644 (file)
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -1,17 +1,15 @@
-#include <glib.h>
-
+#include "kernel/debug.h"
 #include "kernel/menu.h"
 #include "kernel/screen.h"
 #include "kernel/client.h"
 #include "kernel/openbox.h"
-
 #include "kernel/frame.h"
 
 #include "render/theme.h"
 
-#if 0
+#include <glib.h>
+
 static char *PLUGIN_NAME = "client_menu";
-#endif
 
 static ObMenu *send_to_menu;
 static ObMenu *layer_menu;
@@ -33,6 +31,13 @@ void client_send_to_update(ObMenu *self)
     
     /* check if we have to update. lame */
     while (it != NULL) {
+        if (i == screen_desktop) {
+            if (((ObMenuEntry *)it->data)->enabled)
+                break;
+        } else {
+            if (!((ObMenuEntry *)it->data)->enabled)
+                break;
+        }
         if (i >= screen_num_desktops)
             break;
         if (strcmp(screen_desktop_names[i],
@@ -44,37 +49,46 @@ void client_send_to_update(ObMenu *self)
 
     if (it != NULL || i != screen_num_desktops) {
         menu_clear(self);
-        g_message("update");
+        ob_debug("update\n");
         for (i = 0; i < screen_num_desktops; ++i) {
             ObMenuEntry *e;
-            Action *a = action_from_string("sendtodesktop");
+            ObAction *a = action_from_string("sendtodesktop");
             a->data.sendto.desk = i;
             a->data.sendto.follow = FALSE;
             e = menu_entry_new(screen_desktop_names[i], a);
+            if (i == screen_desktop)
+                e->enabled = FALSE;
             menu_add_entry(self, e);
         }
-
-        menu_render_full(self);
+        
+        menu_render(self);
     }
 }
 
-#if 0
-void client_menu_show(ObMenu *self, int x, int y, Client *client)
+void client_menu_show(ObMenu *self, int x, int y, ObClient *client)
 {
-    int newy;
+    guint i;
+    gint newy, newx;
+    Rect *a = NULL;
+
     g_assert(!self->invalid);
     g_assert(client);
     
-    newy = MAX(client->frame->area.y + client->frame->size.top, y);
-    newy -= ob_rr_theme->bwidth;
+    for (i = 0; i < screen_num_monitors; ++i) {
+        a = screen_physical_area_monitor(i);
+        if (RECT_CONTAINS(*a, x, y))
+            break;
+    }
+    g_assert(a != NULL);
+    self->xin_area = i;
+
+    newx = MAX(x, client->area.x);
+    newy = MAX(y, client->area.y);
+    POINT_SET(self->location,
+             MIN(newx, client->area.x + client->area.width - self->size.width),
+             MIN(newy, client->area.y + client->area.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 -
-                  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) {
@@ -85,7 +99,6 @@ void client_menu_show(ObMenu *self, int x, int y, Client *client)
        menu_hide(self->open_submenu);
     }
 }
-#endif
 
 void plugin_setup_config() { }
 
@@ -98,7 +111,8 @@ void plugin_destroy (ObMenu *m)
 void *plugin_create() /* TODO: need config */
 {
     ObMenu *m = menu_new_full(NULL, "client-menu", NULL,
-                            /*client_menu_show*/NULL, NULL);
+                            client_menu_show, NULL, NULL, NULL, NULL);
+    m->plugin = PLUGIN_NAME;
     menu_add_entry(m, menu_entry_new_submenu("Send To Workspace",
                                              send_to_menu));
     send_to_menu->parent = m;
@@ -139,7 +153,7 @@ void plugin_startup()
     ObMenu *t;
     /* create a Send To Workspace ObMenu */
     send_to_menu = menu_new_full(NULL, "send-to-workspace",
-                          NULL, NULL, client_send_to_update);
+                          NULL, NULL, client_send_to_update, NULL, NULL, NULL);
     
     layer_menu = menu_new(NULL, "layer", NULL);
     menu_add_entry(layer_menu, menu_entry_new("Top Layer",