X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=a14dac29625881e29076f15fe7982ab4a0e525c5;hb=d9e6aa5643e74ab84fde0ddb1fcb8418ff212281;hp=acceaf5fd01d0580ceb2ed3956e4a921f0b7a5ec;hpb=56307d60773d0eaf65b10414cd0e3ec0b2adc156;p=chaz%2Fopenbox diff --git a/render/theme.h b/render/theme.h index acceaf5f..a14dac29 100644 --- a/render/theme.h +++ b/render/theme.h @@ -34,6 +34,7 @@ struct _RrTheme { RrFont *win_font_unfocused; RrFont *menu_title_font; RrFont *menu_font; + RrFont *osd_font; /* style settings - geometry */ gint paddingx; @@ -41,22 +42,32 @@ struct _RrTheme { gint handle_height; gint fbwidth; /*!< frame border width */ gint mbwidth; /*!< menu border width */ + gint obwidth; /*!< osd border width */ gint cbwidthx; gint cbwidthy; - gint menu_overlap; + gint menu_overlap_x; + gint menu_overlap_y; + gint menu_sep_width; + gint menu_sep_paddingx; + gint menu_sep_paddingy; /* these ones are calculated, not set directly by the theme file */ gint win_font_height; gint menu_title_font_height; gint menu_font_height; gint label_height; gint title_height; - gint menu_title_height; gint button_size; gint grip_width; + gint menu_title_label_height; + gint menu_title_height; /* style settings - colors */ - RrColor *menu_b_color; - RrColor *frame_b_color; + RrColor *menu_border_color; + RrColor *osd_border_color; + RrColor *frame_focused_border_color; + RrColor *frame_unfocused_border_color; + RrColor *title_separator_focused_color; + RrColor *title_separator_unfocused_color; RrColor *cb_focused_color; RrColor *cb_unfocused_color; RrColor *title_focused_color; @@ -65,16 +76,22 @@ struct _RrTheme { RrColor *titlebut_disabled_unfocused_color; RrColor *titlebut_hover_focused_color; RrColor *titlebut_hover_unfocused_color; - RrColor *titlebut_toggled_focused_color; - RrColor *titlebut_toggled_unfocused_color; + RrColor *titlebut_toggled_hover_focused_color; + RrColor *titlebut_toggled_hover_unfocused_color; + RrColor *titlebut_toggled_focused_pressed_color; + RrColor *titlebut_toggled_unfocused_pressed_color; + RrColor *titlebut_toggled_focused_unpressed_color; + RrColor *titlebut_toggled_unfocused_unpressed_color; RrColor *titlebut_focused_pressed_color; RrColor *titlebut_unfocused_pressed_color; RrColor *titlebut_focused_unpressed_color; RrColor *titlebut_unfocused_unpressed_color; RrColor *menu_title_color; + RrColor *menu_sep_color; RrColor *menu_color; - RrColor *menu_disabled_color; RrColor *menu_selected_color; + RrColor *menu_disabled_color; + RrColor *menu_disabled_selected_color; RrColor *title_focused_shadow_color; gchar title_focused_shadow_alpha; RrColor *title_unfocused_shadow_color; @@ -90,49 +107,65 @@ struct _RrTheme { gchar menu_text_selected_shadow_alpha; RrColor *menu_text_disabled_shadow_color; gchar menu_text_disabled_shadow_alpha; + RrColor *menu_text_disabled_selected_shadow_color; + gchar menu_text_disabled_selected_shadow_alpha; /* style settings - pics */ - RrPixel32 *def_win_icon; /* 48x48 RGBA */ + RrPixel32 *def_win_icon; /* RGBA */ + gint def_win_icon_w; + gint def_win_icon_h; /* style settings - masks */ RrPixmapMask *max_mask; - RrPixmapMask *max_toggled_mask; RrPixmapMask *max_hover_mask; - RrPixmapMask *max_disabled_mask; RrPixmapMask *max_pressed_mask; + RrPixmapMask *max_toggled_mask; + RrPixmapMask *max_toggled_hover_mask; + RrPixmapMask *max_toggled_pressed_mask; + RrPixmapMask *max_disabled_mask; RrPixmapMask *iconify_mask; RrPixmapMask *iconify_hover_mask; - RrPixmapMask *iconify_disabled_mask; RrPixmapMask *iconify_pressed_mask; + RrPixmapMask *iconify_disabled_mask; RrPixmapMask *desk_mask; - RrPixmapMask *desk_toggled_mask; RrPixmapMask *desk_hover_mask; - RrPixmapMask *desk_disabled_mask; RrPixmapMask *desk_pressed_mask; + RrPixmapMask *desk_toggled_mask; + RrPixmapMask *desk_toggled_hover_mask; + RrPixmapMask *desk_toggled_pressed_mask; + RrPixmapMask *desk_disabled_mask; RrPixmapMask *shade_mask; - RrPixmapMask *shade_toggled_mask; RrPixmapMask *shade_hover_mask; - RrPixmapMask *shade_disabled_mask; RrPixmapMask *shade_pressed_mask; + RrPixmapMask *shade_toggled_mask; + RrPixmapMask *shade_toggled_hover_mask; + RrPixmapMask *shade_toggled_pressed_mask; + RrPixmapMask *shade_disabled_mask; RrPixmapMask *close_mask; RrPixmapMask *close_hover_mask; RrPixmapMask *close_disabled_mask; RrPixmapMask *close_pressed_mask; RrPixmapMask *menu_bullet_mask; /* submenu pointer */ +#if 0 RrPixmapMask *menu_toggle_mask; /* menu boolean */ +#endif /* global appearances */ RrAppearance *a_disabled_focused_max; RrAppearance *a_disabled_unfocused_max; RrAppearance *a_hover_focused_max; RrAppearance *a_hover_unfocused_max; - RrAppearance *a_toggled_focused_max; - RrAppearance *a_toggled_unfocused_max; RrAppearance *a_focused_unpressed_max; RrAppearance *a_focused_pressed_max; RrAppearance *a_unfocused_unpressed_max; RrAppearance *a_unfocused_pressed_max; + RrAppearance *a_toggled_hover_focused_max; + RrAppearance *a_toggled_hover_unfocused_max; + RrAppearance *a_toggled_focused_unpressed_max; + RrAppearance *a_toggled_focused_pressed_max; + RrAppearance *a_toggled_unfocused_unpressed_max; + RrAppearance *a_toggled_unfocused_pressed_max; RrAppearance *a_disabled_focused_close; RrAppearance *a_disabled_unfocused_close; RrAppearance *a_hover_focused_close; @@ -145,22 +178,30 @@ struct _RrTheme { RrAppearance *a_disabled_unfocused_desk; RrAppearance *a_hover_focused_desk; RrAppearance *a_hover_unfocused_desk; - RrAppearance *a_toggled_focused_desk; - RrAppearance *a_toggled_unfocused_desk; RrAppearance *a_focused_unpressed_desk; RrAppearance *a_focused_pressed_desk; RrAppearance *a_unfocused_unpressed_desk; RrAppearance *a_unfocused_pressed_desk; + RrAppearance *a_toggled_hover_focused_desk; + RrAppearance *a_toggled_hover_unfocused_desk; + RrAppearance *a_toggled_focused_unpressed_desk; + RrAppearance *a_toggled_focused_pressed_desk; + RrAppearance *a_toggled_unfocused_unpressed_desk; + RrAppearance *a_toggled_unfocused_pressed_desk; RrAppearance *a_disabled_focused_shade; RrAppearance *a_disabled_unfocused_shade; RrAppearance *a_hover_focused_shade; RrAppearance *a_hover_unfocused_shade; - RrAppearance *a_toggled_focused_shade; - RrAppearance *a_toggled_unfocused_shade; RrAppearance *a_focused_unpressed_shade; RrAppearance *a_focused_pressed_shade; RrAppearance *a_unfocused_unpressed_shade; RrAppearance *a_unfocused_pressed_shade; + RrAppearance *a_toggled_hover_focused_shade; + RrAppearance *a_toggled_hover_unfocused_shade; + RrAppearance *a_toggled_focused_unpressed_shade; + RrAppearance *a_toggled_focused_pressed_shade; + RrAppearance *a_toggled_unfocused_unpressed_shade; + RrAppearance *a_toggled_unfocused_pressed_shade; RrAppearance *a_disabled_focused_iconify; RrAppearance *a_disabled_unfocused_iconify; RrAppearance *a_hover_focused_iconify; @@ -179,13 +220,16 @@ struct _RrTheme { RrAppearance *a_icon; RrAppearance *a_focused_handle; RrAppearance *a_unfocused_handle; + RrAppearance *a_menu_text_title; RrAppearance *a_menu_title; RrAppearance *a_menu; RrAppearance *a_menu_normal; - RrAppearance *a_menu_disabled; RrAppearance *a_menu_selected; + RrAppearance *a_menu_disabled; + RrAppearance *a_menu_disabled_selected; RrAppearance *a_menu_text_normal; RrAppearance *a_menu_text_disabled; + RrAppearance *a_menu_text_disabled_selected; RrAppearance *a_menu_text_selected; RrAppearance *a_menu_bullet_normal; RrAppearance *a_menu_bullet_selected; @@ -197,13 +241,16 @@ struct _RrTheme { RrAppearance *osd_hilite_label; /* can be parent relative */ RrAppearance *osd_unhilite_fg; /* can never be parent relative */ + gchar *name; }; /*! The font values are all optional. If a NULL is used for any of them, then the default font will be used. */ -RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme, +RrTheme* RrThemeNew(const RrInstance *inst, const gchar *theme, + gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, - RrFont *menu_title_font, RrFont *menu_item_font); + RrFont *menu_title_font, RrFont *menu_item_font, + RrFont *osd_font); void RrThemeFree(RrTheme *theme); G_END_DECLS