X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_menu.c;h=dc724383e4319366f530f7d426d15be47cb0a546;hb=b23594d88d462f4ed1b0a26b5e303f491758f5ff;hp=bd57f06d8d4667c680cbe52bf849d05a1962d847;hpb=a9567a816385f8f66ed0f827bb4af78cdb10cd6d;p=chaz%2Fopenbox

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index bd57f06d..dc724383 100644
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -1,10 +1,10 @@
-#include "kernel/debug.h"
-#include "kernel/menu.h"
-#include "kernel/menuframe.h"
-#include "kernel/screen.h"
-#include "kernel/client.h"
-#include "kernel/openbox.h"
-#include "kernel/frame.h"
+#include "debug.h"
+#include "menu.h"
+#include "menuframe.h"
+#include "screen.h"
+#include "client.h"
+#include "openbox.h"
+#include "frame.h"
 #include "gettext.h"
 
 #include <glib.h>
@@ -138,6 +138,7 @@ void client_menu_startup()
 {
     GSList *acts;
     ObMenu *menu;
+    ObMenuEntry *e;
 
     menu = menu_new(LAYER_MENU_NAME, _("Layer"), NULL);
     menu_set_update_func(menu, layer_update);
@@ -159,15 +160,27 @@ void client_menu_startup()
     menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), NULL);
     menu_set_update_func(menu, client_update);
 
-    menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
+    e = menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME);
+    e->data.normal.mask = ob_rr_theme->desk_mask;
+    e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
+    e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
+    e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
 
     menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME);
 
     acts = g_slist_prepend(NULL, action_from_string("Iconify"));
-    menu_add_normal(menu, CLIENT_ICONIFY, _("Iconify"), acts);
+    e = menu_add_normal(menu, CLIENT_ICONIFY, _("Iconify"), acts);
+    e->data.normal.mask = ob_rr_theme->iconify_mask;
+    e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
+    e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
+    e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
 
     acts = g_slist_prepend(NULL, action_from_string("ToggleMaximizeFull"));
-    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;
+    e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
 
     acts = g_slist_prepend(NULL, action_from_string("Raise"));
     menu_add_normal(menu, CLIENT_RAISE, _("Raise to top"), acts);
@@ -176,7 +189,11 @@ void client_menu_startup()
     menu_add_normal(menu, CLIENT_LOWER, _("Lower to bottom"),acts);
 
     acts = g_slist_prepend(NULL, action_from_string("ToggleShade"));
-    menu_add_normal(menu, CLIENT_SHADE, _("Roll up/down"), acts);
+    e = menu_add_normal(menu, CLIENT_SHADE, _("Roll up/down"), 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;
+    e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
 
     acts = g_slist_prepend(NULL, action_from_string("ToggleDecorations"));
     menu_add_normal(menu, CLIENT_DECORATE, _("Decorate"), acts);
@@ -192,5 +209,9 @@ void client_menu_startup()
     menu_add_separator(menu, -1);
 
     acts = g_slist_prepend(NULL, action_from_string("Close"));
-    menu_add_normal(menu, CLIENT_CLOSE, _("Close"), acts);
+    e = menu_add_normal(menu, CLIENT_CLOSE, _("Close"), acts);
+    e->data.normal.mask = ob_rr_theme->close_mask;
+    e->data.normal.mask_normal_color = ob_rr_theme->menu_color;
+    e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color;
+    e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color;
 }