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 9edb392930d181b71eb380ea82bf1e4b4acb1339..c45d2a432a27bc295626e6dba4524519797c22bf 100644 (file)
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -31,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],
@@ -45,14 +52,16 @@ void client_send_to_update(ObMenu *self)
         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);
         }
         
-        self->update(self);
+        menu_render(self);
     }
 }