X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=75f7cff1deb85bb22c3b2ff66ac95b347deae08f;hb=6611c30854e96f73feaafcef7ee3d4e38a799bfc;hp=934750dd27f98fcc2251fa35cff6ec049dda44ff;hpb=aeef6569934d792a144c5d003a884ccb3da69dac;p=chaz%2Fopenbox

diff --git a/render/theme.c b/render/theme.c
index 934750dd..75f7cff1 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -1,8 +1,28 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   theme.c 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.
+*/
+
 #include "render.h"
 #include "color.h"
 #include "font.h"
 #include "mask.h"
 #include "theme.h"
+#include "icon.h"
+#include "parser/parse.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
@@ -21,6 +41,7 @@ static gboolean read_mask(const RrInstance *inst,
 static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
                                 gchar *rname, RrAppearance *value,
                                 gboolean allow_trans);
+static RrPixel32* read_c_image(gint width, gint height, const guint8 *data);
 static void set_default_appearance(RrAppearance *a);
 
 RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
@@ -71,6 +92,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 
     theme->app_hilite_bg = RrAppearanceNew(inst, 0);
     theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
+    theme->app_hilite_fg = RrAppearanceNew(inst, 0);
+    theme->app_unhilite_fg = RrAppearanceNew(inst, 0);
     theme->app_hilite_label = RrAppearanceNew(inst, 1);
     theme->app_unhilite_label = RrAppearanceNew(inst, 1);
 
@@ -93,44 +116,44 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     }
 
     /* load the font stuff */
-    if (!read_string(db, "window.label.focus.font", &font_str))
+    if (!read_string(db, "window.active.label.text.font", &font_str))
         font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50";
 
-    if (!(theme->winfont_focused = RrFontOpen(inst, font_str))) {
+    if (!(theme->win_font_focused = RrFontOpen(inst, font_str))) {
         RrThemeFree(theme);
         return NULL;
     }
-    theme->winfont_height = RrFontHeight(theme->winfont_focused);
+    theme->win_font_height = RrFontHeight(theme->win_font_focused);
 
-    if (!read_string(db, "window.label.unfocus.font", &font_str))
+    if (!read_string(db, "window.inactive.label.text.font", &font_str))
         /* font_str will already be set to the last one */;
 
-    if (!(theme->winfont_unfocused = RrFontOpen(inst, font_str))) {
+    if (!(theme->win_font_unfocused = RrFontOpen(inst, font_str))) {
         RrThemeFree(theme);
         return NULL;
     }
-    theme->winfont_height = MAX(theme->winfont_height,
-                                RrFontHeight(theme->winfont_unfocused));
+    theme->win_font_height = MAX(theme->win_font_height,
+                                RrFontHeight(theme->win_font_unfocused));
 
     winjust = RR_JUSTIFY_LEFT;
-    if (read_string(db, "window.label.justify", &str)) {
+    if (read_string(db, "window.label.text.justify", &str)) {
         if (!g_ascii_strcasecmp(str, "right"))
             winjust = RR_JUSTIFY_RIGHT;
         else if (!g_ascii_strcasecmp(str, "center"))
             winjust = RR_JUSTIFY_CENTER;
     }
 
-    if (!read_string(db, "menu.title.font", &font_str))
+    if (!read_string(db, "menu.title.text.font", &font_str))
         font_str = "arial,sans:bold:pixelsize=12:shadow=y";
 
-    if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) {
+    if (!(theme->menu_title_font = RrFontOpen(inst, font_str))) {
         RrThemeFree(theme);
         return NULL;
     }
-    theme->mtitlefont_height = RrFontHeight(theme->mtitlefont);
+    theme->menu_title_font_height = RrFontHeight(theme->menu_title_font);
 
     mtitlejust = RR_JUSTIFY_LEFT;
-    if (read_string(db, "menu.title.justify", &str)) {
+    if (read_string(db, "menu.title.text.justify", &str)) {
         if (!g_ascii_strcasecmp(str, "right"))
             mtitlejust = RR_JUSTIFY_RIGHT;
         else if (!g_ascii_strcasecmp(str, "center"))
@@ -140,61 +163,63 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     if (!read_string(db, "menu.items.font", &font_str))
         font_str = "arial,sans:bold:pixelsize=11:shadow=y";
 
-    if (!(theme->mfont = RrFontOpen(inst, font_str))) {
+    if (!(theme->menu_font = RrFontOpen(inst, font_str))) {
         RrThemeFree(theme);
         return NULL;
     }
-    theme->mfont_height = RrFontHeight(theme->mfont);
+    theme->menu_font_height = RrFontHeight(theme->menu_font);
 
     /* load direct dimensions */
-    if (!read_int(db, "menuOverlap", &theme->menu_overlap) ||
+    if (!read_int(db, "menu.overlap", &theme->menu_overlap) ||
 	theme->menu_overlap < 0 || theme->menu_overlap > 20)
         theme->menu_overlap = 0;
-    if (!read_int(db, "handleWidth", &theme->handle_height))
+    if (!read_int(db, "window.handle.width", &theme->handle_height))
         theme->handle_height = 6;
     if (!theme->handle_height)
         theme->show_handle = FALSE;
     if (theme->handle_height <= 0 || theme->handle_height > 100)
         theme->handle_height = 6;
-    if (!read_int(db, "bevelWidth", &theme->bevel) ||
-	theme->bevel <= 0 || theme->bevel > 100)
-        theme->bevel = 3;
-    if (!read_int(db, "borderWidth", &theme->bwidth) ||
+    if (!read_int(db, "padding.width", &theme->padding) ||
+	theme->padding < 0 || theme->padding > 100)
+        theme->padding = 3;
+    if (!read_int(db, "border.width", &theme->bwidth) ||
 	theme->bwidth < 0 || theme->bwidth > 100)
         theme->bwidth = 1;
-    if (!read_int(db, "frameWidth", &theme->cbwidth) ||
+    if (!read_int(db, "window.client.padding.width", &theme->cbwidth) ||
 	theme->cbwidth < 0 || theme->cbwidth > 100)
-        theme->cbwidth = theme->bevel;
+        theme->cbwidth = theme->padding;
 
     /* load colors */
     if (!read_color(db, inst,
-                    "borderColor", &theme->b_color))
+                    "border.color", &theme->b_color))
 	theme->b_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
-                    "window.frame.focusColor", &theme->cb_focused_color))
+                    "window.active.client.color",
+                    &theme->cb_focused_color))
 	theme->cb_focused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
     if (!read_color(db, inst,
-                    "window.frame.unfocusColor",&theme->cb_unfocused_color))
+                    "window.inactive.client.color",
+                    &theme->cb_unfocused_color))
 	theme->cb_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
     if (!read_color(db, inst,
-                    "window.label.focus.textColor",
+                    "window.active.label.text.color",
                     &theme->title_focused_color))
 	theme->title_focused_color = RrColorNew(inst, 0x0, 0x0, 0x0);
     if (!read_color(db, inst,
-                    "window.label.unfocus.textColor",
+                    "window.inactive.label.text.color",
                     &theme->title_unfocused_color))
 	theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
     if (!read_color(db, inst,
-                    "window.button.focus.imageColor",
+                    "window.active.button.unpressed.image.color",
                     &theme->titlebut_focused_unpressed_color))
 	theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
-                    "window.button.unfocus.imageColor",
+                    "window.inactive.button.unpressed.image.color",
                     &theme->titlebut_unfocused_unpressed_color))
 	theme->titlebut_unfocused_unpressed_color =
             RrColorNew(inst, 0xff, 0xff, 0xff);
     if (!read_color(db, inst,
-                    "window.button.pressed.focus.imageColor",
+                    "window.active.button.pressed.image.color",
                     &theme->titlebut_focused_pressed_color))
 	theme->titlebut_focused_pressed_color =
             RrColorNew(inst,
@@ -202,7 +227,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                        theme->titlebut_focused_unpressed_color->g,
                        theme->titlebut_focused_unpressed_color->b);
     if (!read_color(db, inst,
-                    "window.button.pressed.unfocus.imageColor",
+                    "window.inactive.button.pressed.image.color",
                     &theme->titlebut_unfocused_pressed_color))
 	theme->titlebut_unfocused_pressed_color =
             RrColorNew(inst,
@@ -210,16 +235,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                        theme->titlebut_unfocused_unpressed_color->g,
                        theme->titlebut_unfocused_unpressed_color->b);
     if (!read_color(db, inst,
-                    "window.button.disabled.focus.imageColor",
+                    "window.active.button.disabled.image.color",
                     &theme->titlebut_disabled_focused_color))
 	theme->titlebut_disabled_focused_color =
             RrColorNew(inst, 0xff, 0xff, 0xff);
     if (!read_color(db, inst,
-                    "window.button.disabled.unfocus.imageColor",
+                    "window.inactive.button.disabled.image.color",
                     &theme->titlebut_disabled_unfocused_color))
 	theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
-                    "window.button.hover.focus.imageColor",
+                    "window.active.button.hover.image.color",
                     &theme->titlebut_hover_focused_color))
 	theme->titlebut_hover_focused_color =
             RrColorNew(inst,
@@ -227,7 +252,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                        theme->titlebut_focused_unpressed_color->g,
                        theme->titlebut_focused_unpressed_color->b);
     if (!read_color(db, inst,
-                    "window.button.hover.unfocus.imageColor",
+                    "window.inactive.button.hover.image.color",
                     &theme->titlebut_hover_unfocused_color))
 	theme->titlebut_hover_unfocused_color =
             RrColorNew(inst,
@@ -235,7 +260,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                        theme->titlebut_unfocused_unpressed_color->g,
                        theme->titlebut_unfocused_unpressed_color->b);
     if (!read_color(db, inst,
-                    "window.button.toggled.focus.imageColor",
+                    "window.active.button.toggled.image.color",
                     &theme->titlebut_toggled_focused_color))
 	theme->titlebut_toggled_focused_color =
             RrColorNew(inst,
@@ -243,7 +268,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                        theme->titlebut_focused_pressed_color->g,
                        theme->titlebut_focused_pressed_color->b);
     if (!read_color(db, inst,
-                    "window.button.toggled.unfocus.imageColor",
+                    "window.inactive.button.toggled.image.color",
                     &theme->titlebut_toggled_unfocused_color))
 	theme->titlebut_toggled_unfocused_color =
             RrColorNew(inst,
@@ -251,33 +276,19 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                        theme->titlebut_unfocused_pressed_color->g,
                        theme->titlebut_unfocused_pressed_color->b);
     if (!read_color(db, inst,
-                    "menu.title.textColor", &theme->menu_title_color))
+                    "menu.title.text.color", &theme->menu_title_color))
         theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
-                    "menu.items.textColor", &theme->menu_color))
+                    "menu.items.text.color", &theme->menu_color))
         theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
     if (!read_color(db, inst,
-                    "menu.disabled.textColor", &theme->menu_disabled_color))
+                    "menu.items.disabled.text.color",
+                    &theme->menu_disabled_color))
         theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
-                    "menu.selected.textColor", &theme->menu_selected_color))
+                    "menu.items.active.text.color",
+                    &theme->menu_selected_color))
         theme->menu_selected_color = RrColorNew(inst, 0, 0, 0);
-    if (!read_color(db, inst,
-                    "menu.bullet.imageColor",
-                    &theme->menu_bullet_normal_color))
-        theme->menu_bullet_normal_color = RrColorNew(inst,
-                                                     theme->menu_color->r,
-                                                     theme->menu_color->g,
-                                                     theme->menu_color->b);
-    if (!read_color(db, inst,
-                    "menu.bullet.selected.imageColor",
-                    &theme->menu_bullet_selected_color))
-        theme->menu_bullet_selected_color =
-            RrColorNew(inst,
-                       theme->menu_selected_color->r,
-                       theme->menu_selected_color->g,
-                       theme->menu_selected_color->b);
-
     
     if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) {
         if (!read_mask(inst, "max_pressed.xbm", theme,
@@ -335,6 +346,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
     }
 
+    theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH,
+                                       OB_DEFAULT_ICON_HEIGHT,
+                                       OB_DEFAULT_ICON_pixel_data);
+
     if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) {
         if (!read_mask(inst, "desk_pressed.xbm", theme,
                        &theme->desk_pressed_mask)) {
@@ -431,91 +446,114 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 
     /* read the decoration textures */
     if (!read_appearance(db, inst,
-                         "window.title.focus", theme->a_focused_title,
+                         "window.active.title.bg", theme->a_focused_title,
                          FALSE))
 	set_default_appearance(theme->a_focused_title);
     if (!read_appearance(db, inst,
-                         "window.title.unfocus", theme->a_unfocused_title,
+                         "window.inactive.title.bg", theme->a_unfocused_title,
                          FALSE))
 	set_default_appearance(theme->a_unfocused_title);
     if (!read_appearance(db, inst,
-                         "window.label.focus", theme->a_focused_label,
+                         "window.active.label.bg", theme->a_focused_label,
                          TRUE))
 	set_default_appearance(theme->a_focused_label);
     if (!read_appearance(db, inst,
-                         "window.label.unfocus", theme->a_unfocused_label,
+                         "window.inactive.label.bg", theme->a_unfocused_label,
                          TRUE))
 	set_default_appearance(theme->a_unfocused_label);
     if (!read_appearance(db, inst,
-                         "window.handle.focus", theme->a_focused_handle,
+                         "window.active.handle.bg", theme->a_focused_handle,
                          FALSE))
 	set_default_appearance(theme->a_focused_handle);
     if (!read_appearance(db, inst,
-                         "window.handle.unfocus",theme->a_unfocused_handle,
+                         "window.inactive.handle.bg",theme->a_unfocused_handle,
                          FALSE))
 	set_default_appearance(theme->a_unfocused_handle);
     if (!read_appearance(db, inst,
-                         "window.grip.focus", theme->a_focused_grip,
+                         "window.active.grip.bg", theme->a_focused_grip,
                          TRUE))
 	set_default_appearance(theme->a_focused_grip);
     if (!read_appearance(db, inst,
-                         "window.grip.unfocus", theme->a_unfocused_grip,
+                         "window.inactive.grip.bg", theme->a_unfocused_grip,
                          TRUE))
 	set_default_appearance(theme->a_unfocused_grip);
     if (!read_appearance(db, inst,
-                         "menu.items", theme->a_menu,
+                         "menu.items.bg", theme->a_menu,
                          FALSE))
 	set_default_appearance(theme->a_menu);
     if (!read_appearance(db, inst,
-                         "menu.title", theme->a_menu_title,
+                         "menu.title.bg", theme->a_menu_title,
                          FALSE))
 	set_default_appearance(theme->a_menu_title);
     if (!read_appearance(db, inst,
-                         "menu.selected", theme->a_menu_selected,
+                         "menu.items.active.bg", theme->a_menu_selected,
                          TRUE))
 	set_default_appearance(theme->a_menu_selected);
 
     /* read the appearances for rendering non-decorations */
     if (!read_appearance(db, inst,
-                         "window.title.focus", theme->app_hilite_bg,
+                         "window.active.title.bg", theme->app_hilite_bg,
                          FALSE))
         set_default_appearance(theme->app_hilite_bg);
     if (!read_appearance(db, inst,
-                         "window.label.focus", theme->app_hilite_label,
+                         "window.active.label.bg", theme->app_hilite_label,
                          TRUE))
         set_default_appearance(theme->app_hilite_label);
     if (!read_appearance(db, inst,
-                         "window.title.unfocus", theme->app_unhilite_bg,
+                         "window.active.label.bg", theme->app_hilite_fg,
+                         TRUE))
+        set_default_appearance(theme->app_hilite_fg);
+    else if (theme->app_hilite_label->surface.grad == RR_SURFACE_PARENTREL) {
+        if (!read_appearance(db, inst,
+                             "window.active.title.bg",
+                             theme->app_hilite_fg,
+                             FALSE))
+            set_default_appearance(theme->app_hilite_fg);
+    }
+    if (!read_appearance(db, inst,
+                         "window.inactive.title.bg", theme->app_unhilite_bg,
                          FALSE))
         set_default_appearance(theme->app_unhilite_bg);
     if (!read_appearance(db, inst,
-                         "window.label.unfocus", theme->app_unhilite_label,
+                         "window.inactive.label.bg", theme->app_unhilite_label,
                          TRUE))
         set_default_appearance(theme->app_unhilite_label);
+    if (!read_appearance(db, inst,
+                         "window.inactive.label.bg", theme->app_unhilite_fg,
+                         TRUE))
+        set_default_appearance(theme->app_unhilite_fg);
+    else if (theme->app_unhilite_label->surface.grad == RR_SURFACE_PARENTREL) {
+        if (!read_appearance(db, inst,
+                             "window.inactive.title.bg",
+                             theme->app_unhilite_fg,
+                             FALSE))
+            set_default_appearance(theme->app_unhilite_fg);
+    }
+        
 
     /* read buttons textures */
     if (!read_appearance(db, inst,
-                         "window.button.disabled.focus",
+                         "window.active.button.disabled.bg",
 			 theme->a_disabled_focused_max,
                          TRUE))
         set_default_appearance(theme->a_disabled_focused_max);
     if (!read_appearance(db, inst,
-                         "window.button.disabled.unfocus",
+                         "window.inactive.button.disabled.bg",
 			 theme->a_disabled_unfocused_max,
                          TRUE))
         set_default_appearance(theme->a_disabled_unfocused_max);
     if (!read_appearance(db, inst,
-                         "window.button.pressed.focus",
+                         "window.active.button.pressed.bg",
 			 theme->a_focused_pressed_max,
                          TRUE))
         set_default_appearance(theme->a_focused_pressed_max);
     if (!read_appearance(db, inst,
-                         "window.button.pressed.unfocus",
+                         "window.inactive.button.pressed.bg",
 			 theme->a_unfocused_pressed_max,
                          TRUE))
         set_default_appearance(theme->a_unfocused_pressed_max);
     if (!read_appearance(db, inst,
-                         "window.button.toggled.focus",
+                         "window.active.button.toggled.bg",
 			 theme->a_toggled_focused_max,
                          TRUE))
     {
@@ -524,7 +562,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             RrAppearanceCopy(theme->a_focused_pressed_max);
     }
     if (!read_appearance(db, inst,
-                         "window.button.toggled.unfocus",
+                         "window.inactive.button.toggled.bg",
 			 theme->a_toggled_unfocused_max,
                          TRUE))
     {
@@ -533,17 +571,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             RrAppearanceCopy(theme->a_unfocused_pressed_max);
     }
     if (!read_appearance(db, inst,
-                         "window.button.focus",
+                         "window.active.button.unpressed.bg",
 			 theme->a_focused_unpressed_max,
                          TRUE))
 	set_default_appearance(theme->a_focused_unpressed_max);
     if (!read_appearance(db, inst,
-                         "window.button.unfocus",
+                         "window.inactive.button.unpressed.bg",
 			 theme->a_unfocused_unpressed_max,
                          TRUE))
 	set_default_appearance(theme->a_unfocused_unpressed_max);
     if (!read_appearance(db, inst,
-                         "window.button.hover.focus",
+                         "window.active.button.hover.bg",
 			 theme->a_hover_focused_max,
                          TRUE))
     {
@@ -552,7 +590,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             RrAppearanceCopy(theme->a_focused_unpressed_max);
     }
     if (!read_appearance(db, inst,
-                         "window.button.hover.unfocus",
+                         "window.inactive.button.hover.bg",
 			 theme->a_hover_unfocused_max,
                          TRUE))
     {
@@ -652,7 +690,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
     theme->a_focused_label->texture[0].data.text.font =
         theme->app_hilite_label->texture[0].data.text.font =
-        theme->winfont_focused;
+        theme->win_font_focused;
     theme->a_focused_label->texture[0].data.text.color =
         theme->app_hilite_label->texture[0].data.text.color =
         theme->title_focused_color;
@@ -664,14 +702,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RR_JUSTIFY_LEFT;
     theme->a_unfocused_label->texture[0].data.text.font =
         theme->app_unhilite_label->texture[0].data.text.font =
-        theme->winfont_unfocused;
+        theme->win_font_unfocused;
     theme->a_unfocused_label->texture[0].data.text.color =
         theme->app_unhilite_label->texture[0].data.text.color =
         theme->title_unfocused_color;
 
     theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT;
     theme->a_menu_title->texture[0].data.text.justify = mtitlejust;
-    theme->a_menu_title->texture[0].data.text.font = theme->mtitlefont;
+    theme->a_menu_title->texture[0].data.text.font = theme->menu_title_font;
     theme->a_menu_title->texture[0].data.text.color = theme->menu_title_color;
 
     theme->a_menu_text_normal->texture[0].type =
@@ -683,16 +721,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RR_JUSTIFY_LEFT;
     theme->a_menu_text_normal->texture[0].data.text.font =
         theme->a_menu_text_disabled->texture[0].data.text.font =
-        theme->a_menu_text_selected->texture[0].data.text.font = theme->mfont;
+        theme->a_menu_text_selected->texture[0].data.text.font =
+        theme->menu_font;
     theme->a_menu_text_normal->texture[0].data.text.color = theme->menu_color;
     theme->a_menu_text_disabled->texture[0].data.text.color =
         theme->menu_disabled_color;
     theme->a_menu_text_selected->texture[0].data.text.color =
         theme->menu_selected_color;
-    theme->a_menu_bullet_normal->texture[0].data.mask.color =
-        theme->menu_bullet_normal_color;
-    theme->a_menu_bullet_selected->texture[0].data.mask.color =
-        theme->menu_bullet_selected_color;
 
     theme->a_disabled_focused_max->texture[0].type = 
         theme->a_disabled_unfocused_max->texture[0].type = 
@@ -872,14 +907,36 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
         theme->titlebut_unfocused_pressed_color;
     theme->a_menu_bullet_normal->texture[0].data.mask.color = 
-        theme->menu_bullet_normal_color;
+        theme->menu_color;
     theme->a_menu_bullet_selected->texture[0].data.mask.color = 
-        theme->menu_bullet_selected_color;
+        theme->menu_selected_color;
 
     XrmDestroyDatabase(db);
 
-    theme->label_height = theme->winfont_height;
-    theme->title_height = theme->label_height + theme->bevel * 2;
+    {
+        gint ft, fb, fl, fr, ut, ub, ul, ur;
+
+        RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb);
+        RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub);
+        theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub);
+
+        /* this would be nice I think, since padding.width can now be 0,
+           but it breaks frame.c horribly and I don't feel like fixing that
+           right now, so if anyone complains, here is how to keep text from
+           going over the title's bevel/border with a padding.width of 0 and a
+           bevelless/borderless label
+        RrMargins(theme->a_focused_title, &fl, &ft, &fr, &fb);
+        RrMargins(theme->a_unfocused_title, &ul, &ut, &ur, &ub);
+        theme->title_height = theme->label_height +
+            MAX(MAX(theme->padding * 2, ft + fb),
+                MAX(theme->padding * 2, ut + ub));
+        */
+        theme->title_height = theme->label_height + theme->padding * 2;
+        /* this should match the above title_height given the same font size
+           for both. */
+        theme->menu_title_height = theme->menu_title_font_height +
+            theme->padding * 2;
+    }
     theme->button_size = theme->label_height - 2;
     theme->grip_width = theme->title_height * 1.5;
 
@@ -889,6 +946,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 void RrThemeFree(RrTheme *theme)
 {
     if (theme) {
+        g_free(theme->path);
         g_free(theme->name);
 
         RrColorFree(theme->b_color);
@@ -910,8 +968,8 @@ void RrThemeFree(RrTheme *theme)
         RrColorFree(theme->menu_title_color);
         RrColorFree(theme->menu_disabled_color);
         RrColorFree(theme->menu_selected_color);
-        RrColorFree(theme->menu_bullet_normal_color);
-        RrColorFree(theme->menu_bullet_selected_color);
+
+        g_free(theme->def_win_icon);
 
         RrPixmapMaskFree(theme->max_mask);
         RrPixmapMaskFree(theme->max_toggled_mask);
@@ -938,10 +996,10 @@ void RrThemeFree(RrTheme *theme)
         RrPixmapMaskFree(theme->close_pressed_mask);
         RrPixmapMaskFree(theme->menu_bullet_mask);
 
-        RrFontClose(theme->winfont_focused); 
-        RrFontClose(theme->winfont_unfocused);
-        RrFontClose(theme->mtitlefont);
-        RrFontClose(theme->mfont);
+        RrFontClose(theme->win_font_focused); 
+        RrFontClose(theme->win_font_unfocused);
+        RrFontClose(theme->menu_title_font);
+        RrFontClose(theme->menu_font);
 
         RrAppearanceFree(theme->a_disabled_focused_max);
         RrAppearanceFree(theme->a_disabled_unfocused_max);
@@ -1012,28 +1070,47 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_clear_tex);
         RrAppearanceFree(theme->app_hilite_bg);
         RrAppearanceFree(theme->app_unhilite_bg);
+        RrAppearanceFree(theme->app_hilite_fg);
+        RrAppearanceFree(theme->app_unhilite_fg);
         RrAppearanceFree(theme->app_hilite_label);
         RrAppearanceFree(theme->app_unhilite_label);
+
+        g_free(theme);
     }
 }
 
 static XrmDatabase loaddb(RrTheme *theme, char *name)
 {
-    XrmDatabase db;
+    GSList *it;
+    XrmDatabase db = NULL;
+    gchar *s;
 
-    char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
-                               name, "themerc", NULL);
-    if ((db = XrmGetFileDatabase(s)))
-        theme->path = g_path_get_dirname(s);
-    g_free(s);
-    if (db == NULL) {
-	char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
+    if (name[0] == '/') {
+        s = g_build_filename(name, "openbox-3", "themerc", NULL);
 	if ((db = XrmGetFileDatabase(s)))
             theme->path = g_path_get_dirname(s);
-	g_free(s);
+        g_free(s);
+    } else {
+        /* XXX backwards compatibility, remove me sometime later */
+        s = g_build_filename(g_get_home_dir(), ".themes", name,
+                             "openbox-3", "themerc", NULL);
+        if ((db = XrmGetFileDatabase(s)))
+            theme->path = g_path_get_dirname(s);
+        g_free(s);
+
+        for (it = parse_xdg_data_dir_paths(); !db && it;
+             it = g_slist_next(it))
+        {
+            s = g_build_filename(it->data, "themes", name,
+                                 "openbox-3", "themerc", NULL);
+            if ((db = XrmGetFileDatabase(s)))
+                theme->path = g_path_get_dirname(s);
+            g_free(s);
+        }
     }
+
     if (db == NULL) {
-        char *s = g_build_filename(name, "themerc", NULL);
+        s = g_build_filename(name, "themerc", NULL);
 	if ((db = XrmGetFileDatabase(s)))
             theme->path = g_path_get_dirname(s);
         g_free(s);
@@ -1201,8 +1278,8 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
 
     cname = g_strconcat(rname, ".color", NULL);
     ctoname = g_strconcat(rname, ".colorTo", NULL);
-    bcname = g_strconcat(rname, ".borderColor", NULL);
-    icname = g_strconcat(rname, ".interlaceColor", NULL);
+    bcname = g_strconcat(rname, ".border.color", NULL);
+    icname = g_strconcat(rname, ".interlace.color", NULL);
 
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
 	retvalue.addr != NULL) {
@@ -1246,3 +1323,28 @@ static void set_default_appearance(RrAppearance *a)
     a->surface.primary = RrColorNew(a->inst, 0, 0, 0);
     a->surface.secondary = RrColorNew(a->inst, 0, 0, 0);
 }
+
+/* Reads the output from gimp's C-Source file format into valid RGBA data for
+   an RrTextureRGBA. */
+static RrPixel32* read_c_image(gint width, gint height, const guint8 *data)
+{
+    RrPixel32 *im, *p;
+    gint i;
+
+    p = im = g_memdup(data, width * height * sizeof(RrPixel32));
+
+    for (i = 0; i < width * height; ++i) {
+        guchar a = ((*p >> 24) & 0xff);
+        guchar b = ((*p >> 16) & 0xff);
+        guchar g = ((*p >>  8) & 0xff);
+        guchar r = ((*p >>  0) & 0xff);
+
+        *p = ((r << RrDefaultRedOffset) +
+              (g << RrDefaultGreenOffset) +
+              (b << RrDefaultBlueOffset) +
+              (a << RrDefaultAlphaOffset));
+        p++;
+    }
+
+    return im;
+}