bigtime theme changes. bigtime.

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index 95a8259ca022cfd4ba48f67679b8d7cd7d23f8bb..e52b16c4faa5beca8c9b4c32dd18f2ec6d367131 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -11,8 +11,11 @@ struct _RrTheme {
 
     const RrInstance *inst;
 
+    /* style settings - optional decor */
+    gboolean show_handle;
+
     /* style settings - geometry */
-    gint bevel;
+    gint padding;
     gint handle_height;
     gint bwidth;
     gint cbwidth;
@@ -41,11 +44,12 @@ struct _RrTheme {
     RrColor *menu_title_color;
     RrColor *menu_color;
     RrColor *menu_disabled_color;
-    RrColor *menu_hilite_color;
+    RrColor *menu_selected_color;
 
     /* style settings - fonts */
     gint winfont_height;
-    RrFont *winfont;
+    RrFont *winfont_focused;
+    RrFont *winfont_unfocused;
     gint mtitlefont_height;
     RrFont *mtitlefont;
     gint mfont_height;
@@ -56,20 +60,28 @@ struct _RrTheme {
     RrPixmapMask *max_toggled_mask;
     RrPixmapMask *max_hover_mask;
     RrPixmapMask *max_disabled_mask;
+    RrPixmapMask *max_pressed_mask;
     RrPixmapMask *iconify_mask;
     RrPixmapMask *iconify_hover_mask;
     RrPixmapMask *iconify_disabled_mask;
+    RrPixmapMask *iconify_pressed_mask;
     RrPixmapMask *desk_mask;
     RrPixmapMask *desk_toggled_mask;
     RrPixmapMask *desk_hover_mask;
     RrPixmapMask *desk_disabled_mask;
+    RrPixmapMask *desk_pressed_mask;
     RrPixmapMask *shade_mask;
     RrPixmapMask *shade_toggled_mask;
     RrPixmapMask *shade_hover_mask;
     RrPixmapMask *shade_disabled_mask;
+    RrPixmapMask *shade_pressed_mask;
     RrPixmapMask *close_mask;
     RrPixmapMask *close_hover_mask;
     RrPixmapMask *close_disabled_mask;
+    RrPixmapMask *close_pressed_mask;
+
+    RrPixmapMask *menu_bullet_mask; /* submenu pointer */
+    RrPixmapMask *menu_toggle_mask; /* menu boolean */
 
     /* global appearances */
     RrAppearance *a_disabled_focused_max;
@@ -130,15 +142,22 @@ struct _RrTheme {
     RrAppearance *a_unfocused_handle;
     RrAppearance *a_menu_title;
     RrAppearance *a_menu;
-    RrAppearance *a_menu_item;
+    RrAppearance *a_menu_normal;
     RrAppearance *a_menu_disabled;
-    RrAppearance *a_menu_hilite;
+    RrAppearance *a_menu_selected;
+    RrAppearance *a_menu_text_normal;
+    RrAppearance *a_menu_text_disabled;
+    RrAppearance *a_menu_text_selected;
+    RrAppearance *a_menu_bullet_normal;
+    RrAppearance *a_menu_bullet_selected;
+    RrAppearance *a_clear;     /* clear with no texture */
+    RrAppearance *a_clear_tex; /* clear with a texture */
 
     RrAppearance *app_hilite_bg;
     RrAppearance *app_unhilite_bg;
     RrAppearance *app_hilite_label;
     RrAppearance *app_unhilite_label;
-    RrAppearance *app_icon;
+
 };
 
 RrTheme *RrThemeNew(const RrInstance *inst, gchar *theme);