X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.h;h=6ffcd24b3dfe08ddb702eab05196b3553cade0b0;hb=3f32dfa87e08556d7f6a58efab9b7479e515be26;hp=0f87b80867ef1077631f19b050ef83c6a3f95c78;hpb=cd12a2eae5b5b72df08d588ac71d1f6cf6725dfb;p=chaz%2Fopenbox

diff --git a/render/theme.h b/render/theme.h
index 0f87b808..6ffcd24b 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -6,10 +6,10 @@
 #include "font.h"
 #include "mask.h"
 
-extern int theme_bevel;
-extern int theme_handle_height;
-extern int theme_bwidth;
-extern int theme_cbwidth;
+extern gint theme_bevel;
+extern gint theme_handle_height;
+extern gint theme_bwidth;
+extern gint theme_cbwidth;
 
 #define theme_label_height (theme_winfont_height)
 #define theme_title_height (theme_label_height + theme_bevel * 2)
@@ -24,69 +24,69 @@ extern color_rgb *theme_title_unfocused_color;
 extern color_rgb *theme_titlebut_focused_color;
 extern color_rgb *theme_titlebut_unfocused_color;
 
-extern int theme_winfont_height;
-extern ObFont *theme_winfont;
-extern char *theme_title_layout;
+extern gint theme_winfont_height;
+extern RrFont *theme_winfont;
+extern gchar *theme_title_layout;
 
-extern pixmap_mask *theme_max_set_mask;
-extern pixmap_mask *theme_max_unset_mask;
-extern pixmap_mask *theme_iconify_mask;
-extern pixmap_mask *theme_desk_set_mask;
-extern pixmap_mask *theme_desk_unset_mask;
-extern pixmap_mask *theme_shade_set_mask;
-extern pixmap_mask *theme_shade_unset_mask;
-extern pixmap_mask *theme_close_mask;
+extern RrPixmapMask *theme_max_set_mask;
+extern RrPixmapMask *theme_max_unset_mask;
+extern RrPixmapMask *theme_iconify_mask;
+extern RrPixmapMask *theme_desk_set_mask;
+extern RrPixmapMask *theme_desk_unset_mask;
+extern RrPixmapMask *theme_shade_set_mask;
+extern RrPixmapMask *theme_shade_unset_mask;
+extern RrPixmapMask *theme_close_mask;
 
-extern Appearance *theme_a_focused_unpressed_max;
-extern Appearance *theme_a_focused_pressed_max;
-extern Appearance *theme_a_focused_pressed_set_max;
-extern Appearance *theme_a_unfocused_unpressed_max;
-extern Appearance *theme_a_unfocused_pressed_max;
-extern Appearance *theme_a_unfocused_pressed_set_max;
-extern Appearance *theme_a_focused_unpressed_close;
-extern Appearance *theme_a_focused_pressed_close;
-extern Appearance *theme_a_unfocused_unpressed_close;
-extern Appearance *theme_a_unfocused_pressed_close;
-extern Appearance *theme_a_focused_unpressed_desk;
-extern Appearance *theme_a_focused_pressed_desk;
-extern Appearance *theme_a_focused_pressed_set_desk;
-extern Appearance *theme_a_unfocused_unpressed_desk;
-extern Appearance *theme_a_unfocused_pressed_desk;
-extern Appearance *theme_a_unfocused_pressed_set_desk;
-extern Appearance *theme_a_focused_unpressed_shade;
-extern Appearance *theme_a_focused_pressed_shade;
-extern Appearance *theme_a_focused_pressed_set_shade;
-extern Appearance *theme_a_unfocused_unpressed_shade;
-extern Appearance *theme_a_unfocused_pressed_shade;
-extern Appearance *theme_a_unfocused_pressed_set_shade;
-extern Appearance *theme_a_focused_unpressed_iconify;
-extern Appearance *theme_a_focused_pressed_iconify;
-extern Appearance *theme_a_unfocused_unpressed_iconify;
-extern Appearance *theme_a_unfocused_pressed_iconify;
-extern Appearance *theme_a_focused_grip;
-extern Appearance *theme_a_unfocused_grip;
-extern Appearance *theme_a_focused_title;
-extern Appearance *theme_a_unfocused_title;
-extern Appearance *theme_a_focused_label;
-extern Appearance *theme_a_unfocused_label;
-extern Appearance *theme_a_icon;
-extern Appearance *theme_a_focused_handle;
-extern Appearance *theme_a_unfocused_handle;
-extern Appearance *theme_a_menu_title;
-extern Appearance *theme_a_menu;
-extern Appearance *theme_a_menu_item;
-extern Appearance *theme_a_menu_disabled;
-extern Appearance *theme_a_menu_hilite;
+extern RrAppearance *theme_a_focused_unpressed_max;
+extern RrAppearance *theme_a_focused_pressed_max;
+extern RrAppearance *theme_a_focused_pressed_set_max;
+extern RrAppearance *theme_a_unfocused_unpressed_max;
+extern RrAppearance *theme_a_unfocused_pressed_max;
+extern RrAppearance *theme_a_unfocused_pressed_set_max;
+extern RrAppearance *theme_a_focused_unpressed_close;
+extern RrAppearance *theme_a_focused_pressed_close;
+extern RrAppearance *theme_a_unfocused_unpressed_close;
+extern RrAppearance *theme_a_unfocused_pressed_close;
+extern RrAppearance *theme_a_focused_unpressed_desk;
+extern RrAppearance *theme_a_focused_pressed_desk;
+extern RrAppearance *theme_a_focused_pressed_set_desk;
+extern RrAppearance *theme_a_unfocused_unpressed_desk;
+extern RrAppearance *theme_a_unfocused_pressed_desk;
+extern RrAppearance *theme_a_unfocused_pressed_set_desk;
+extern RrAppearance *theme_a_focused_unpressed_shade;
+extern RrAppearance *theme_a_focused_pressed_shade;
+extern RrAppearance *theme_a_focused_pressed_set_shade;
+extern RrAppearance *theme_a_unfocused_unpressed_shade;
+extern RrAppearance *theme_a_unfocused_pressed_shade;
+extern RrAppearance *theme_a_unfocused_pressed_set_shade;
+extern RrAppearance *theme_a_focused_unpressed_iconify;
+extern RrAppearance *theme_a_focused_pressed_iconify;
+extern RrAppearance *theme_a_unfocused_unpressed_iconify;
+extern RrAppearance *theme_a_unfocused_pressed_iconify;
+extern RrAppearance *theme_a_focused_grip;
+extern RrAppearance *theme_a_unfocused_grip;
+extern RrAppearance *theme_a_focused_title;
+extern RrAppearance *theme_a_unfocused_title;
+extern RrAppearance *theme_a_focused_label;
+extern RrAppearance *theme_a_unfocused_label;
+extern RrAppearance *theme_a_icon;
+extern RrAppearance *theme_a_focused_handle;
+extern RrAppearance *theme_a_unfocused_handle;
+extern RrAppearance *theme_a_menu_title;
+extern RrAppearance *theme_a_menu;
+extern RrAppearance *theme_a_menu_item;
+extern RrAppearance *theme_a_menu_disabled;
+extern RrAppearance *theme_a_menu_hilite;
 
-extern Appearance *theme_app_hilite_bg;
-extern Appearance *theme_app_unhilite_bg;
-extern Appearance *theme_app_hilite_label;
-extern Appearance *theme_app_unhilite_label;
-extern Appearance *theme_app_icon;
+extern RrAppearance *theme_app_hilite_bg;
+extern RrAppearance *theme_app_unhilite_bg;
+extern RrAppearance *theme_app_hilite_label;
+extern RrAppearance *theme_app_unhilite_label;
+extern RrAppearance *theme_app_icon;
 
-void theme_startup();
+void theme_startup(const RrInstance *inst);
 void theme_shutdown();
 
-char *theme_load(char *theme);
+gchar *theme_load(gchar *theme);
 
 #endif