X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=f61944b7bde4b2f008499c6117ec83eb848be9d7;hb=943dd68152d052188d7a5a0d33c8238f474eb462;hp=e52b16c4faa5beca8c9b4c32dd18f2ec6d367131;hpb=a72371b41f48a2d6a1e55099456d30d3b678b66c;p=chaz%2Fopenbox

diff --git a/render/theme.h b/render/theme.h
index e52b16c4..f61944b7 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -1,8 +1,28 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   theme.h for the Openbox window manager
+   Copyright (c) 2003        Ben 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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #ifndef __theme_h
 #define __theme_h
 
 #include "render.h"
 
+G_BEGIN_DECLS
+
 typedef struct _RrTheme RrTheme;
 
 struct _RrTheme {
@@ -21,6 +41,7 @@ struct _RrTheme {
     gint cbwidth;
     gint label_height;
     gint title_height;
+    gint menu_title_height;
     gint button_size;
     gint grip_width;
     gint menu_overlap;
@@ -47,13 +68,16 @@ struct _RrTheme {
     RrColor *menu_selected_color;
 
     /* style settings - fonts */
-    gint winfont_height;
-    RrFont *winfont_focused;
-    RrFont *winfont_unfocused;
-    gint mtitlefont_height;
-    RrFont *mtitlefont;
-    gint mfont_height;
-    RrFont *mfont;
+    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;
+
+    /* style settings - pics */
+    RrPixel32 *def_win_icon; /* 48x48 RGBA */
 
     /* style settings - masks */
     RrPixmapMask *max_mask;
@@ -155,12 +179,16 @@ struct _RrTheme {
 
     RrAppearance *app_hilite_bg;
     RrAppearance *app_unhilite_bg;
-    RrAppearance *app_hilite_label;
-    RrAppearance *app_unhilite_label;
+    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 */
 
 };
 
-RrTheme *RrThemeNew(const RrInstance *inst, gchar *theme);
+RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme);
 void RrThemeFree(RrTheme *theme);
 
+G_END_DECLS
+
 #endif