X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=4d90dac8a26a6cb8b2097095d4a1b0ed9c7b868b;hb=ec304c9e433e4b1cedf924ca64d783f05db7d42d;hp=41f83e2c895f15d323a58926926110291690d70f;hpb=5c95d2ffeabe45a6aacf37d0a1c1b0dfe83b2ba5;p=chaz%2Fopenbox

diff --git a/render/theme.h b/render/theme.h
index 41f83e2c..4d90dac8 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    theme.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,28 +27,37 @@ G_BEGIN_DECLS
 typedef struct _RrTheme RrTheme;
 
 struct _RrTheme {
-    gchar *path;
-    gchar *name;
-
     const RrInstance *inst;
 
-    /* style settings - optional decor */
-    gboolean show_handle;
+    /* style settings - fonts */
+    RrFont *win_font_focused;
+    RrFont *win_font_unfocused;
+    RrFont *menu_title_font;
+    RrFont *menu_font;
 
     /* style settings - geometry */
-    gint padding;
+    gint paddingx;
+    gint paddingy;
     gint handle_height;
-    gint bwidth;
-    gint cbwidth;
+    gint fbwidth; /*!< frame border width */
+    gint mbwidth; /*!< menu border width */
+    gint cbwidthx;
+    gint cbwidthy;
+    gint menu_overlap;
+    /* 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_overlap;
+    gint top_grip_height;
 
     /* style settings - colors */
-    RrColor *b_color;
+    RrColor *menu_b_color;
+    RrColor *frame_b_color;
     RrColor *cb_focused_color;
     RrColor *cb_unfocused_color;
     RrColor *title_focused_color;
@@ -66,15 +76,21 @@ struct _RrTheme {
     RrColor *menu_color;
     RrColor *menu_disabled_color;
     RrColor *menu_selected_color;
-
-    /* style settings - fonts */
-    gint win_font_height;
-    RrFont *win_font_focused;
-    RrFont *win_font_unfocused;
-    gint menu_title_font_height;
-    RrFont *menu_title_font;
-    gint menu_font_height;
-    RrFont *menu_font;
+    RrColor *title_focused_shadow_color;
+    gchar    title_focused_shadow_alpha;
+    RrColor *title_unfocused_shadow_color;
+    gchar    title_unfocused_shadow_alpha;
+    RrColor *osd_color;
+    RrColor *osd_shadow_color;
+    gchar    osd_shadow_alpha;
+    RrColor *menu_title_shadow_color;
+    gchar    menu_title_shadow_alpha;
+    RrColor *menu_text_normal_shadow_color;
+    gchar    menu_text_normal_shadow_alpha;
+    RrColor *menu_text_selected_shadow_color;
+    gchar    menu_text_selected_shadow_alpha;
+    RrColor *menu_text_disabled_shadow_color;
+    gchar    menu_text_disabled_shadow_alpha;
 
     /* style settings - pics */
     RrPixel32 *def_win_icon; /* 48x48 RGBA */
@@ -131,7 +147,6 @@ struct _RrTheme {
     RrAppearance *a_hover_focused_desk;
     RrAppearance *a_hover_unfocused_desk;
     RrAppearance *a_toggled_focused_desk;
-    RrAppearance *a_toggled_focused_pressed_desk;
     RrAppearance *a_toggled_unfocused_desk;
     RrAppearance *a_focused_unpressed_desk;
     RrAppearance *a_focused_pressed_desk;
@@ -142,7 +157,6 @@ struct _RrTheme {
     RrAppearance *a_hover_focused_shade;
     RrAppearance *a_hover_unfocused_shade;
     RrAppearance *a_toggled_focused_shade;
-    RrAppearance *a_toggled_focused_pressed_shade;
     RrAppearance *a_toggled_unfocused_shade;
     RrAppearance *a_focused_unpressed_shade;
     RrAppearance *a_focused_pressed_shade;
@@ -179,16 +193,18 @@ struct _RrTheme {
     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_fg; /* never parent relative */
-    RrAppearance *app_unhilite_fg; /* never parent relative */
-    RrAppearance *app_hilite_label; /* can be parent relative */
-    RrAppearance *app_unhilite_label; /* can be parent relative */
+    RrAppearance *osd_hilite_bg; /* can never be parent relative */
+    RrAppearance *osd_hilite_fg; /* can never be parent relative */
+    RrAppearance *osd_hilite_label; /* can be parent relative */
+    RrAppearance *osd_unhilite_fg; /* can never be parent relative */
 
 };
 
-RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme);
+/*! 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,
+                    RrFont *active_window_font, RrFont *inactive_window_font,
+                    RrFont *menu_title_font, RrFont *menu_item_font);
 void RrThemeFree(RrTheme *theme);
 
 G_END_DECLS