make themes inside a directory

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index a8a3eda2cb8a57e27f507781d03118c996226fe5..e8f0e88474bc3751595a558c1f5be4dc0dd04d8e 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -6,6 +6,9 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 
 static XrmDatabase loaddb(RrTheme *theme, char *name);
 static gboolean read_int(XrmDatabase db, char *rname, int *value);
@@ -34,6 +37,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 
     theme->a_disabled_focused_max = RrAppearanceNew(inst, 1);
     theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1);
+    theme->a_hover_focused_max = RrAppearanceNew(inst, 1);
+    theme->a_hover_unfocused_max = RrAppearanceNew(inst, 1);
     theme->a_focused_unpressed_max = RrAppearanceNew(inst, 1);
     theme->a_focused_pressed_max = RrAppearanceNew(inst, 1);
     theme->a_focused_pressed_set_max = RrAppearanceNew(inst, 1);
@@ -131,11 +136,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             mjust = RR_JUSTIFY_CENTER;
     }
 
-    /* load the title layout */
-    if (!read_string(db, "window.title.layout", &font_str))
-        font_str = "NLIMC";
-    theme->title_layout = g_strdup(font_str);
-
     /* load direct dimensions */
     if (!read_int(db, "menuOverlap", &theme->menu_overlap) ||
        theme->menu_overlap < 0 || theme->menu_overlap > 20)
@@ -171,12 +171,29 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
        theme->title_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
     if (!read_color(db, inst,
                     "window.button.focus.picColor",
-                    &theme->titlebut_focused_color))
-       theme->titlebut_focused_color = RrColorNew(inst, 0, 0, 0);
+                    &theme->titlebut_focused_unpressed_color))
+       theme->titlebut_focused_unpressed_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
                     "window.button.unfocus.picColor",
-                    &theme->titlebut_unfocused_color))
-       theme->titlebut_unfocused_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+                    &theme->titlebut_unfocused_unpressed_color))
+       theme->titlebut_unfocused_unpressed_color =
+            RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "window.button.pressed.focus.picColor",
+                    &theme->titlebut_focused_pressed_color))
+       theme->titlebut_focused_pressed_color =
+            RrColorNew(inst,
+                       theme->titlebut_focused_unpressed_color->r,
+                       theme->titlebut_focused_unpressed_color->g,
+                       theme->titlebut_focused_unpressed_color->b);
+    if (!read_color(db, inst,
+                    "window.button.pressed.unfocus.picColor",
+                    &theme->titlebut_unfocused_pressed_color))
+       theme->titlebut_unfocused_pressed_color =
+            RrColorNew(inst,
+                       theme->titlebut_unfocused_unpressed_color->r,
+                       theme->titlebut_unfocused_unpressed_color->g,
+                       theme->titlebut_unfocused_unpressed_color->b);
     if (!read_color(db, inst,
                     "window.button.disabled.focus.picColor",
                     &theme->titlebut_disabled_focused_color))
@@ -186,6 +203,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                     "window.button.disabled.unfocus.picColor",
                     &theme->titlebut_disabled_unfocused_color))
        theme->titlebut_disabled_unfocused_color = RrColorNew(inst, 0, 0, 0);
+    if (!read_color(db, inst,
+                    "window.button.hover.focus.picColor",
+                    &theme->titlebut_hover_focused_color))
+       theme->titlebut_hover_focused_color =
+            RrColorNew(inst,
+                       theme->titlebut_focused_unpressed_color->r,
+                       theme->titlebut_focused_unpressed_color->g,
+                       theme->titlebut_focused_unpressed_color->b);
+    if (!read_color(db, inst,
+                    "window.button.hover.unfocus.picColor",
+                    &theme->titlebut_hover_unfocused_color))
+       theme->titlebut_hover_unfocused_color =
+            RrColorNew(inst,
+                       theme->titlebut_unfocused_unpressed_color->r,
+                       theme->titlebut_unfocused_unpressed_color->g,
+                       theme->titlebut_unfocused_unpressed_color->b);
     if (!read_color(db, inst,
                     "menu.title.textColor", &theme->menu_title_color))
         theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
@@ -359,11 +392,27 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                         theme->a_unfocused_unpressed_max,
                          TRUE))
        set_default_appearance(theme->a_unfocused_unpressed_max);
+    if (!read_appearance(db, inst,
+                         "window.button.hover.focus",
+                        theme->a_hover_focused_max,
+                         TRUE))
+        theme->a_hover_focused_max =
+            RrAppearanceCopy(theme->a_focused_unpressed_max);
+    if (!read_appearance(db, inst,
+                         "window.button.hover.unfocus",
+                        theme->a_hover_unfocused_max,
+                         TRUE))
+        theme->a_hover_unfocused_max =
+            RrAppearanceCopy(theme->a_unfocused_unpressed_max);
 
     theme->a_disabled_focused_close =
         RrAppearanceCopy(theme->a_disabled_focused_max);
     theme->a_disabled_unfocused_close =
         RrAppearanceCopy(theme->a_disabled_unfocused_max);
+    theme->a_hover_focused_close =
+        RrAppearanceCopy(theme->a_hover_focused_max);
+    theme->a_hover_unfocused_close =
+        RrAppearanceCopy(theme->a_hover_unfocused_max);
     theme->a_unfocused_unpressed_close =
         RrAppearanceCopy(theme->a_unfocused_unpressed_max);
     theme->a_unfocused_pressed_close =
@@ -376,6 +425,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_disabled_focused_max);
     theme->a_disabled_unfocused_desk =
         RrAppearanceCopy(theme->a_disabled_unfocused_max);
+    theme->a_hover_focused_desk =
+        RrAppearanceCopy(theme->a_hover_focused_max);
+    theme->a_hover_unfocused_desk =
+        RrAppearanceCopy(theme->a_hover_unfocused_max);
     theme->a_unfocused_unpressed_desk =
         RrAppearanceCopy(theme->a_unfocused_unpressed_max);
     theme->a_unfocused_pressed_desk =
@@ -392,6 +445,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_disabled_focused_max);
     theme->a_disabled_unfocused_shade =
         RrAppearanceCopy(theme->a_disabled_unfocused_max);
+    theme->a_hover_focused_shade =
+        RrAppearanceCopy(theme->a_hover_focused_max);
+    theme->a_hover_unfocused_shade =
+        RrAppearanceCopy(theme->a_hover_unfocused_max);
     theme->a_unfocused_unpressed_shade =
         RrAppearanceCopy(theme->a_unfocused_unpressed_max);
     theme->a_unfocused_pressed_shade =
@@ -408,6 +465,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_disabled_focused_max);
     theme->a_disabled_unfocused_iconify =
         RrAppearanceCopy(theme->a_disabled_focused_max);
+    theme->a_hover_focused_iconify =
+        RrAppearanceCopy(theme->a_hover_focused_max);
+    theme->a_hover_unfocused_iconify =
+        RrAppearanceCopy(theme->a_hover_unfocused_max);
     theme->a_unfocused_unpressed_iconify =
         RrAppearanceCopy(theme->a_unfocused_unpressed_max);
     theme->a_unfocused_pressed_iconify =
@@ -470,6 +531,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 
     theme->a_disabled_focused_max->texture[0].type = 
         theme->a_disabled_unfocused_max->texture[0].type = 
+        theme->a_hover_focused_max->texture[0].type = 
+        theme->a_hover_unfocused_max->texture[0].type = 
         theme->a_focused_unpressed_max->texture[0].type = 
         theme->a_focused_pressed_max->texture[0].type = 
         theme->a_focused_pressed_set_max->texture[0].type =  
@@ -478,12 +541,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_pressed_set_max->texture[0].type = 
         theme->a_disabled_focused_close->texture[0].type = 
         theme->a_disabled_unfocused_close->texture[0].type = 
+        theme->a_hover_focused_close->texture[0].type = 
+        theme->a_hover_unfocused_close->texture[0].type = 
         theme->a_focused_unpressed_close->texture[0].type = 
         theme->a_focused_pressed_close->texture[0].type = 
         theme->a_unfocused_unpressed_close->texture[0].type = 
         theme->a_unfocused_pressed_close->texture[0].type = 
         theme->a_disabled_focused_desk->texture[0].type = 
         theme->a_disabled_unfocused_desk->texture[0].type = 
+        theme->a_hover_focused_desk->texture[0].type = 
+        theme->a_hover_unfocused_desk->texture[0].type = 
         theme->a_focused_unpressed_desk->texture[0].type = 
         theme->a_focused_pressed_desk->texture[0].type = 
         theme->a_focused_pressed_set_desk->texture[0].type = 
@@ -492,6 +559,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_pressed_set_desk->texture[0].type = 
         theme->a_disabled_focused_shade->texture[0].type = 
         theme->a_disabled_unfocused_shade->texture[0].type = 
+        theme->a_hover_focused_shade->texture[0].type = 
+        theme->a_hover_unfocused_shade->texture[0].type = 
         theme->a_focused_unpressed_shade->texture[0].type = 
         theme->a_focused_pressed_shade->texture[0].type = 
         theme->a_focused_pressed_set_shade->texture[0].type = 
@@ -500,12 +569,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_pressed_set_shade->texture[0].type = 
         theme->a_disabled_focused_iconify->texture[0].type = 
         theme->a_disabled_unfocused_iconify->texture[0].type = 
+        theme->a_hover_focused_iconify->texture[0].type = 
+        theme->a_hover_unfocused_iconify->texture[0].type = 
         theme->a_focused_unpressed_iconify->texture[0].type = 
         theme->a_focused_pressed_iconify->texture[0].type = 
         theme->a_unfocused_unpressed_iconify->texture[0].type = 
         theme->a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK;
     theme->a_disabled_focused_max->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_max->texture[0].data.mask.mask = 
+        theme->a_hover_focused_max->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_max->texture[0].data.mask.mask = 
         theme->a_focused_unpressed_max->texture[0].data.mask.mask = 
         theme->a_unfocused_unpressed_max->texture[0].data.mask.mask = 
         theme->a_focused_pressed_max->texture[0].data.mask.mask = 
@@ -516,6 +589,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->max_set_mask;
     theme->a_disabled_focused_close->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_close->texture[0].data.mask.mask = 
+        theme->a_hover_focused_close->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_close->texture[0].data.mask.mask = 
         theme->a_focused_pressed_close->texture[0].data.mask.mask = 
         theme->a_unfocused_pressed_close->texture[0].data.mask.mask =
         theme->a_focused_unpressed_close->texture[0].data.mask.mask = 
@@ -523,6 +598,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->close_mask;
     theme->a_disabled_focused_desk->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_desk->texture[0].data.mask.mask = 
+        theme->a_hover_focused_desk->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_desk->texture[0].data.mask.mask = 
         theme->a_focused_unpressed_desk->texture[0].data.mask.mask = 
         theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
         theme->a_focused_pressed_desk->texture[0].data.mask.mask = 
@@ -533,6 +610,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->desk_set_mask;
     theme->a_disabled_focused_shade->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = 
+        theme->a_hover_focused_shade->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_shade->texture[0].data.mask.mask = 
         theme->a_focused_unpressed_shade->texture[0].data.mask.mask = 
         theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
         theme->a_focused_pressed_shade->texture[0].data.mask.mask = 
@@ -543,6 +622,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->shade_set_mask;
     theme->a_disabled_focused_iconify->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = 
+        theme->a_hover_focused_iconify->texture[0].data.mask.mask = 
+        theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = 
         theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = 
         theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
         theme->a_focused_pressed_iconify->texture[0].data.mask.mask = 
@@ -560,34 +641,48 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_disabled_unfocused_shade->texture[0].data.mask.color = 
         theme->a_disabled_unfocused_iconify->texture[0].data.mask.color = 
         theme->titlebut_disabled_unfocused_color;
+    theme->a_hover_focused_max->texture[0].data.mask.color = 
+        theme->a_hover_focused_close->texture[0].data.mask.color = 
+        theme->a_hover_focused_desk->texture[0].data.mask.color = 
+        theme->a_hover_focused_shade->texture[0].data.mask.color = 
+        theme->a_hover_focused_iconify->texture[0].data.mask.color = 
+        theme->titlebut_hover_focused_color;
+    theme->a_hover_unfocused_max->texture[0].data.mask.color = 
+        theme->a_hover_unfocused_close->texture[0].data.mask.color = 
+        theme->a_hover_unfocused_desk->texture[0].data.mask.color = 
+        theme->a_hover_unfocused_shade->texture[0].data.mask.color = 
+        theme->a_hover_unfocused_iconify->texture[0].data.mask.color = 
+        theme->titlebut_hover_unfocused_color;
     theme->a_focused_unpressed_max->texture[0].data.mask.color = 
-        theme->a_focused_pressed_max->texture[0].data.mask.color = 
-        theme->a_focused_pressed_set_max->texture[0].data.mask.color = 
         theme->a_focused_unpressed_close->texture[0].data.mask.color = 
-        theme->a_focused_pressed_close->texture[0].data.mask.color = 
         theme->a_focused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_shade->texture[0].data.mask.color = 
+        theme->a_focused_unpressed_iconify->texture[0].data.mask.color = 
+        theme->titlebut_focused_unpressed_color;
+    theme->a_focused_pressed_max->texture[0].data.mask.color = 
+        theme->a_focused_pressed_set_max->texture[0].data.mask.color = 
+        theme->a_focused_pressed_close->texture[0].data.mask.color = 
         theme->a_focused_pressed_desk->texture[0].data.mask.color = 
         theme->a_focused_pressed_set_desk->texture[0].data.mask.color = 
-        theme->a_focused_unpressed_shade->texture[0].data.mask.color = 
         theme->a_focused_pressed_shade->texture[0].data.mask.color = 
         theme->a_focused_pressed_set_shade->texture[0].data.mask.color = 
-        theme->a_focused_unpressed_iconify->texture[0].data.mask.color = 
         theme->a_focused_pressed_iconify->texture[0].data.mask.color =
-        theme->titlebut_focused_color;
+        theme->titlebut_focused_pressed_color;
     theme->a_unfocused_unpressed_max->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_close->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = 
+        theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
+        theme->titlebut_unfocused_unpressed_color;
         theme->a_unfocused_pressed_max->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_set_max->texture[0].data.mask.color = 
-        theme->a_unfocused_unpressed_close->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_close->texture[0].data.mask.color = 
-        theme->a_unfocused_unpressed_desk->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_desk->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_set_desk->texture[0].data.mask.color = 
-        theme->a_unfocused_unpressed_shade->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_shade->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_set_shade->texture[0].data.mask.color = 
-        theme->a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
-        theme->titlebut_unfocused_color;
+        theme->titlebut_unfocused_pressed_color;
 
     XrmDestroyDatabase(db);
 
@@ -609,8 +704,14 @@ void RrThemeFree(RrTheme *theme)
         RrColorFree(theme->cb_focused_color);
         RrColorFree(theme->title_unfocused_color);
         RrColorFree(theme->title_focused_color);
-        RrColorFree(theme->titlebut_unfocused_color);
-        RrColorFree(theme->titlebut_focused_color);
+        RrColorFree(theme->titlebut_disabled_focused_color);
+        RrColorFree(theme->titlebut_disabled_unfocused_color);
+        RrColorFree(theme->titlebut_hover_focused_color);
+        RrColorFree(theme->titlebut_hover_unfocused_color);
+        RrColorFree(theme->titlebut_unfocused_pressed_color);
+        RrColorFree(theme->titlebut_focused_pressed_color);
+        RrColorFree(theme->titlebut_unfocused_unpressed_color);
+        RrColorFree(theme->titlebut_focused_unpressed_color);
         RrColorFree(theme->menu_color);
         RrColorFree(theme->menu_title_color);
         RrColorFree(theme->menu_disabled_color);
@@ -629,26 +730,44 @@ void RrThemeFree(RrTheme *theme)
         RrFontClose(theme->mtitlefont);
         RrFontClose(theme->mfont);
 
-        g_free(theme->title_layout);
-
+        RrAppearanceFree(theme->a_disabled_focused_max);
+        RrAppearanceFree(theme->a_disabled_unfocused_max);
+        RrAppearanceFree(theme->a_hover_focused_max);
+        RrAppearanceFree(theme->a_hover_unfocused_max);
         RrAppearanceFree(theme->a_focused_unpressed_max);
         RrAppearanceFree(theme->a_focused_pressed_max);
         RrAppearanceFree(theme->a_focused_pressed_set_max);
         RrAppearanceFree(theme->a_unfocused_unpressed_max);
         RrAppearanceFree(theme->a_unfocused_pressed_max);
         RrAppearanceFree(theme->a_unfocused_pressed_set_max);
+        RrAppearanceFree(theme->a_disabled_focused_close);
+        RrAppearanceFree(theme->a_disabled_unfocused_close);
+        RrAppearanceFree(theme->a_hover_focused_close);
+        RrAppearanceFree(theme->a_hover_unfocused_close);
         RrAppearanceFree(theme->a_focused_unpressed_close);
         RrAppearanceFree(theme->a_focused_pressed_close);
         RrAppearanceFree(theme->a_unfocused_unpressed_close);
         RrAppearanceFree(theme->a_unfocused_pressed_close);
+        RrAppearanceFree(theme->a_disabled_focused_desk);
+        RrAppearanceFree(theme->a_disabled_unfocused_desk);
+        RrAppearanceFree(theme->a_hover_focused_desk);
+        RrAppearanceFree(theme->a_hover_unfocused_desk);
         RrAppearanceFree(theme->a_focused_unpressed_desk);
         RrAppearanceFree(theme->a_focused_pressed_desk);
         RrAppearanceFree(theme->a_unfocused_unpressed_desk);
         RrAppearanceFree(theme->a_unfocused_pressed_desk);
+        RrAppearanceFree(theme->a_disabled_focused_shade);
+        RrAppearanceFree(theme->a_disabled_unfocused_shade);
+        RrAppearanceFree(theme->a_hover_focused_shade);
+        RrAppearanceFree(theme->a_hover_unfocused_shade);
         RrAppearanceFree(theme->a_focused_unpressed_shade);
         RrAppearanceFree(theme->a_focused_pressed_shade);
         RrAppearanceFree(theme->a_unfocused_unpressed_shade);
         RrAppearanceFree(theme->a_unfocused_pressed_shade);
+        RrAppearanceFree(theme->a_disabled_focused_iconify);
+        RrAppearanceFree(theme->a_disabled_unfocused_iconify);
+        RrAppearanceFree(theme->a_hover_focused_iconify);
+        RrAppearanceFree(theme->a_hover_unfocused_iconify);
         RrAppearanceFree(theme->a_focused_unpressed_iconify);
         RrAppearanceFree(theme->a_focused_pressed_iconify);
         RrAppearanceFree(theme->a_unfocused_unpressed_iconify);
@@ -679,17 +798,19 @@ static XrmDatabase loaddb(RrTheme *theme, char *name)
 {
     XrmDatabase db;
 
-    if ((db = XrmGetFileDatabase(name)))
-        theme->path = g_path_get_dirname(name);
+    char *s = g_build_filename(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(g_get_home_dir(), ".openbox", "themes",
-                                  name, NULL);
+                                  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, NULL);
+       char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
        if ((db = XrmGetFileDatabase(s)))
             theme->path = g_path_get_dirname(s);
         g_free(s);
@@ -775,25 +896,22 @@ static gboolean read_mask(const RrInstance *inst,
 {
     gboolean ret = FALSE;
     char *s;
-    char *data_dir;
     int hx, hy; /* ignored */
     unsigned int w, h;
     unsigned char *b;
 
-    data_dir = g_strdup_printf("%s_data", theme->name);
-
     s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
-                         data_dir, maskname, NULL);
+                         theme->name, maskname, NULL);
     if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
         ret = TRUE;
     else {
         g_free(s);
-        s = g_build_filename(THEMEDIR, data_dir, maskname, NULL);
+        s = g_build_filename(THEMEDIR, theme->name, maskname, NULL);
         if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
             ret = TRUE;
         else {
             g_free(s);
-            s = g_build_filename(theme->path, data_dir, maskname, NULL);
+            s = g_build_filename(theme->path, maskname, NULL);
             if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
                 ret = TRUE;
         }
@@ -805,7 +923,6 @@ static gboolean read_mask(const RrInstance *inst,
     }
       
     g_free(s);
-    g_free(data_dir);
 
     return ret;
 }