- acts = g_slist_prepend(NULL, action_from_string("Iconify"));
- menu_add_normal(menu, CLIENT_ICONIFY, _("Iconify"), acts);
-
- acts = g_slist_prepend(NULL, action_from_string("ToggleMaximizeFull"));
- menu_add_normal(menu, CLIENT_MAXIMIZE, _("Maximize"), acts);
-
- acts = g_slist_prepend(NULL, action_from_string("Raise"));
- menu_add_normal(menu, CLIENT_RAISE, _("Raise to top"), acts);
-
- acts = g_slist_prepend(NULL, action_from_string("Lower"));
- 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);
-
- acts = g_slist_prepend(NULL, action_from_string("ToggleDecorations"));
- menu_add_normal(menu, CLIENT_DECORATE, _("Decorate"), acts);
-
- menu_add_separator(menu, -1);
-
- acts = g_slist_prepend(NULL, action_from_string("KeyboardMove"));
- menu_add_normal(menu, CLIENT_MOVE, _("Move"), acts);
-
- acts = g_slist_prepend(NULL, action_from_string("KeyboardResize"));
- menu_add_normal(menu, CLIENT_RESIZE, _("Resize"), acts);
-
- menu_add_separator(menu, -1);
-
- acts = g_slist_prepend(NULL, action_from_string("Close"));
- menu_add_normal(menu, CLIENT_CLOSE, _("Close"), acts);
+ acts = g_slist_prepend(NULL, action_from_string
+ ("Iconify", OB_USER_ACTION_MENU_SELECTION));
+ e = menu_add_normal(menu, CLIENT_ICONIFY, _("Ico&nify"), acts, TRUE);
+ 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",
+ OB_USER_ACTION_MENU_SELECTION));
+ e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Maximiz&e"), acts, TRUE);
+ 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", OB_USER_ACTION_MENU_SELECTION));
+ menu_add_normal(menu, CLIENT_RAISE, _("Raise to &top"), acts, TRUE);
+
+ acts = g_slist_prepend(NULL, action_from_string
+ ("Lower", OB_USER_ACTION_MENU_SELECTION));
+ menu_add_normal(menu, CLIENT_LOWER, _("Lower to &bottom"),acts, TRUE);
+
+ acts = g_slist_prepend(NULL, action_from_string
+ ("ToggleShade", OB_USER_ACTION_MENU_SELECTION));
+ e = menu_add_normal(menu, CLIENT_SHADE, _("&Roll up"), acts, TRUE);
+ 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",
+ OB_USER_ACTION_MENU_SELECTION));
+ menu_add_normal(menu, CLIENT_DECORATE, _("&Decorate"), acts, TRUE);
+
+ menu_add_separator(menu, -1, NULL);
+
+ acts = g_slist_prepend(NULL, action_from_string
+ ("Move", OB_USER_ACTION_MENU_SELECTION));
+ menu_add_normal(menu, CLIENT_MOVE, _("&Move"), acts, TRUE);
+
+ acts = g_slist_prepend(NULL, action_from_string
+ ("Resize", OB_USER_ACTION_MENU_SELECTION));
+ menu_add_normal(menu, CLIENT_RESIZE, _("Resi&ze"), acts, TRUE);
+
+ menu_add_separator(menu, -1, NULL);
+
+ acts = g_slist_prepend(NULL, action_from_string
+ ("Close", OB_USER_ACTION_MENU_SELECTION));
+ e = menu_add_normal(menu, CLIENT_CLOSE, _("&Close"), acts, TRUE);
+ 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;