provide function to tell if a client has any group siblings

[chaz/openbox] / openbox / client_menu.c

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index 3477702aabc9930cabbe3908cdd399c1d7edef55..d7f26e3e1d73d2c0e0193af977d4eeea0fa89471 100644 (file)
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -72,9 +72,13 @@ static void client_update(ObMenuFrame *frame, gpointer data)
     e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_ICONIFY;
 
     e = menu_find_entry_id(menu, CLIENT_MAXIMIZE);
+    e->data.normal.label = frame->client->max_vert || frame->client->max_horz ?
+        _("Restore") : _("Maximize");
     e->data.normal.enabled =frame->client->functions & OB_CLIENT_FUNC_MAXIMIZE;
 
     e = menu_find_entry_id(menu, CLIENT_SHADE);
+    e->data.normal.label = frame->client->shaded ?
+        _("Roll down") : _("Roll up");
     e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_SHADE;
 
     e = menu_find_entry_id(menu, CLIENT_MOVE);
@@ -85,6 +89,9 @@ static void client_update(ObMenuFrame *frame, gpointer data)
 
     e = menu_find_entry_id(menu, CLIENT_CLOSE);
     e->data.normal.enabled = frame->client->functions & OB_CLIENT_FUNC_CLOSE;
+
+    e = menu_find_entry_id(menu, CLIENT_DECORATE);
+    e->data.normal.enabled = client_normal(frame->client);
 }
 
 static void layer_update(ObMenuFrame *frame, gpointer data)
@@ -203,7 +210,7 @@ void client_menu_startup()
     acts = g_slist_prepend(NULL, action_from_string
                            ("ToggleMaximizeFull",
                             OB_USER_ACTION_MENU_SELECTION));
-    e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Maximize"), acts);
+    e = menu_add_normal(menu, CLIENT_MAXIMIZE, "MAXIMIZE", acts);
     e->data.normal.mask = ob_rr_theme->max_mask; 
     e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
     e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
@@ -219,7 +226,7 @@ void client_menu_startup()
 
     acts = g_slist_prepend(NULL, action_from_string
                            ("ToggleShade", OB_USER_ACTION_MENU_SELECTION));
-    e = menu_add_normal(menu, CLIENT_SHADE, _("Roll up/down"), acts);
+    e = menu_add_normal(menu, CLIENT_SHADE, "SHADE", acts);
     e->data.normal.mask = ob_rr_theme->shade_mask;
     e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
     e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;