add window placement routines to the kernel

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

diff --git a/plugins/menu/client_menu.c b/plugins/menu/client_menu.c
index c9ec591654d8d757d12f25b1a828e57d83a76c6e..1cbf097d080f2f61294714de130823f78f282678 100644 (file)
--- a/plugins/menu/client_menu.c
+++ b/plugins/menu/client_menu.c
@@ -82,6 +82,18 @@ static void layer_update(ObMenuFrame *frame, gpointer data)
         if (e->type == OB_MENU_ENTRY_TYPE_NORMAL)
             e->data.normal.enabled = !!frame->client;
     }
+
+    if (!frame->client)
+        return;
+
+    e = menu_find_entry_id(menu, LAYER_TOP);
+    e->data.normal.enabled = !frame->client->above;
+
+    e = menu_find_entry_id(menu, LAYER_NORMAL);
+    e->data.normal.enabled = (frame->client->above || frame->client->below);
+
+    e = menu_find_entry_id(menu, LAYER_BOTTOM);
+    e->data.normal.enabled = !frame->client->below;
 }
 
 static void send_to_update(ObMenuFrame *frame, gpointer data)
@@ -153,7 +165,7 @@ void plugin_startup()
     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"));
+    acts = g_slist_prepend(NULL, action_from_string("ToggleMaximizeFull"));
     menu_add_normal(CLIENT_MENU_NAME, CLIENT_MAXIMIZE, _("Maximize"), acts);
 
     acts = g_slist_prepend(NULL, action_from_string("Raise"));
@@ -163,7 +175,7 @@ void plugin_startup()
     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);
+    menu_add_normal(CLIENT_MENU_NAME, CLIENT_SHADE, _("Roll up/down"), acts);
 
     acts = g_slist_prepend(NULL, action_from_string("ToggleDecorations"));
     menu_add_normal(CLIENT_MENU_NAME, CLIENT_DECORATE, _("Decorate"), acts);