update copyright step 2

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index b4d7cd1dcb92434a7ea02d27c09b01f66609f04d..5190e07d534f78a67748fa265393b6e39bcd7789 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -1,8 +1,29 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   theme.h for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   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 {
@@ -15,12 +36,13 @@ struct _RrTheme {
     gboolean show_handle;
 
     /* style settings - geometry */
-    gint bevel;
+    gint padding;
     gint handle_height;
     gint bwidth;
     gint cbwidth;
     gint label_height;
     gint title_height;
+    gint menu_title_height;
     gint button_size;
     gint grip_width;
     gint menu_overlap;
@@ -43,18 +65,20 @@ struct _RrTheme {
     RrColor *titlebut_unfocused_unpressed_color;
     RrColor *menu_title_color;
     RrColor *menu_color;
-    RrColor *menu_bullet_color;
     RrColor *menu_disabled_color;
     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;
@@ -143,24 +167,29 @@ 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_selected;
-    RrAppearance *a_menu_text_item;
+    RrAppearance *a_menu_text_normal;
     RrAppearance *a_menu_text_disabled;
     RrAppearance *a_menu_text_selected;
-    RrAppearance *a_menu_bullet;
+    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_selected_bg;
-    RrAppearance *app_unselected_bg;
-    RrAppearance *app_selected_label;
-    RrAppearance *app_unselected_label;
+    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 */
 
 };
 
-RrTheme *RrThemeNew(const RrInstance *inst, gchar *theme);
+RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme);
 void RrThemeFree(RrTheme *theme);
 
+G_END_DECLS
+
 #endif