look in theme dirs first, use the theme as the path as a last attempt only!

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index cb2b636afbcf4f7580ce9112510e4d3dcd078ce2..ca3283a27807efdbfe6cdd07e9c237950fd66d43 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -59,6 +59,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_menu_item = RrAppearanceNew(inst, 1);
     theme->a_menu_disabled = RrAppearanceNew(inst, 1);
     theme->a_menu_hilite = RrAppearanceNew(inst, 1);
+    theme->a_clear = RrAppearanceNew(inst, 0);
 
     theme->app_hilite_bg = RrAppearanceNew(inst, 0);
     theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
@@ -249,9 +250,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0);
 
     if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) {
+        if (!read_mask(inst, "max_pressed.xbm", theme,
+                       &theme->max_pressed_mask)) {
+            theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+        } 
         if (!read_mask(inst, "max_toggled.xbm", theme,
                        &theme->max_toggled_mask)) {
-            theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask);
+            theme->max_toggled_mask =
+                RrPixmapMaskCopy(theme->max_pressed_mask);
         }
         if (!read_mask(inst, "max_disabled.xbm", theme,
                        &theme->max_disabled_mask)) {
@@ -269,11 +275,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
             theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
         }
+        theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
         theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
         theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
     }
 
     if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) {
+        if (!read_mask(inst, "iconify_pressed.xbm", theme,
+                       &theme->iconify_pressed_mask)) {
+            theme->iconify_pressed_mask =
+                RrPixmapMaskCopy(theme->iconify_mask);
+        } 
         if (!read_mask(inst, "iconify_disabled.xbm", theme,
                        &theme->iconify_disabled_mask)) {
             theme->iconify_disabled_mask =
@@ -288,14 +300,28 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
             theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
         }
+        theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask);
         theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask);
         theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
     }
 
-    if (read_mask(inst, "stick.xbm", theme, &theme->desk_mask)) {
-        if (!read_mask(inst, "stick_toggled.xbm", theme,
+    if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) {
+        if (!read_mask(inst, "desk_pressed.xbm", theme,
+                       &theme->desk_pressed_mask)) {
+            theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+        } 
+        if (!read_mask(inst, "desk_toggled.xbm", theme,
                        &theme->desk_toggled_mask)) {
-            theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask);
+            theme->desk_toggled_mask =
+                RrPixmapMaskCopy(theme->desk_pressed_mask);
+        }
+        if (!read_mask(inst, "desk_disabled.xbm", theme,
+                       &theme->desk_disabled_mask)) {
+            theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+        } 
+        if (!read_mask(inst, "desk_hover.xbm", theme, 
+                       &theme->desk_hover_mask)) {
+            theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
         }
     } else {
         {
@@ -306,12 +332,20 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
             theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
         }
+        theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+        theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+        theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
     }
 
     if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) {
+        if (!read_mask(inst, "shade_pressed.xbm", theme,
+                       &theme->shade_pressed_mask)) {
+            theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+        } 
         if (!read_mask(inst, "shade_toggled.xbm", theme,
                        &theme->shade_toggled_mask)) {
-            theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask);
+            theme->shade_toggled_mask =
+                RrPixmapMaskCopy(theme->shade_pressed_mask);
         }
         if (!read_mask(inst, "shade_disabled.xbm", theme,
                        &theme->shade_disabled_mask)) {
@@ -330,11 +364,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
             theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
         }
+        theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
         theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
         theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
     }
 
     if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) {
+        if (!read_mask(inst, "close_pressed.xbm", theme,
+                       &theme->close_pressed_mask)) {
+            theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
+        } 
         if (!read_mask(inst, "close_disabled.xbm", theme,
                        &theme->close_disabled_mask)) {
             theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
@@ -348,6 +387,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
             char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
             theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data);
         }
+        theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
         theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
         theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
     }        
@@ -546,6 +586,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_focused_pressed_max);
 
     theme->a_icon->surface.grad = RR_SURFACE_PARENTREL;
+    theme->a_clear->surface.grad = RR_SURFACE_PARENTREL;
 
     /* set up the textures */
     theme->a_focused_label->texture[0].type = 
@@ -644,10 +685,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_hover_focused_max->texture[0].data.mask.mask = 
         theme->a_hover_unfocused_max->texture[0].data.mask.mask = 
         theme->max_hover_mask;
+    theme->a_focused_pressed_max->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
+        theme->max_pressed_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 = 
-        theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
         theme->max_mask;
     theme->a_toggled_focused_max->texture[0].data.mask.mask = 
         theme->a_toggled_unfocused_max->texture[0].data.mask.mask =
@@ -660,7 +702,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->close_hover_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 = 
+        theme->close_pressed_mask;
+    theme->a_focused_unpressed_close->texture[0].data.mask.mask = 
         theme->a_unfocused_unpressed_close->texture[0].data.mask.mask =
         theme->close_mask;
     theme->a_disabled_focused_desk->texture[0].data.mask.mask = 
@@ -669,38 +712,41 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_hover_focused_desk->texture[0].data.mask.mask = 
         theme->a_hover_unfocused_desk->texture[0].data.mask.mask = 
         theme->desk_hover_mask;
+    theme->a_focused_pressed_desk->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
+        theme->desk_pressed_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 = 
-        theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
         theme->desk_mask;
     theme->a_toggled_focused_desk->texture[0].data.mask.mask = 
         theme->a_toggled_unfocused_desk->texture[0].data.mask.mask =
-        theme->desk_mask;
+        theme->desk_toggled_mask;
     theme->a_disabled_focused_shade->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = 
         theme->shade_disabled_mask;
     theme->a_hover_focused_shade->texture[0].data.mask.mask = 
         theme->a_hover_unfocused_shade->texture[0].data.mask.mask = 
         theme->shade_hover_mask;
+    theme->a_focused_pressed_shade->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
+        theme->shade_pressed_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 = 
-        theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
         theme->shade_mask;
     theme->a_toggled_focused_shade->texture[0].data.mask.mask = 
         theme->a_toggled_unfocused_shade->texture[0].data.mask.mask =
-        theme->shade_mask;
+        theme->shade_toggled_mask;
     theme->a_disabled_focused_iconify->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = 
         theme->iconify_disabled_mask;
     theme->a_hover_focused_iconify->texture[0].data.mask.mask = 
         theme->a_hover_unfocused_iconify->texture[0].data.mask.mask = 
         theme->iconify_hover_mask;
+    theme->a_focused_pressed_iconify->texture[0].data.mask.mask = 
+        theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
+        theme->iconify_pressed_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 = 
-        theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
         theme->iconify_mask;
     theme->a_disabled_focused_max->texture[0].data.mask.color = 
         theme->a_disabled_focused_close->texture[0].data.mask.color = 
@@ -798,20 +844,25 @@ void RrThemeFree(RrTheme *theme)
         RrPixmapMaskFree(theme->max_toggled_mask);
         RrPixmapMaskFree(theme->max_disabled_mask);
         RrPixmapMaskFree(theme->max_hover_mask);
+        RrPixmapMaskFree(theme->max_pressed_mask);
         RrPixmapMaskFree(theme->desk_mask);
         RrPixmapMaskFree(theme->desk_toggled_mask);
         RrPixmapMaskFree(theme->desk_disabled_mask);
         RrPixmapMaskFree(theme->desk_hover_mask);
+        RrPixmapMaskFree(theme->desk_pressed_mask);
         RrPixmapMaskFree(theme->shade_mask);
         RrPixmapMaskFree(theme->shade_toggled_mask);
         RrPixmapMaskFree(theme->shade_disabled_mask);
         RrPixmapMaskFree(theme->shade_hover_mask);
+        RrPixmapMaskFree(theme->shade_pressed_mask);
         RrPixmapMaskFree(theme->iconify_mask);
         RrPixmapMaskFree(theme->iconify_disabled_mask);
         RrPixmapMaskFree(theme->iconify_hover_mask);
+        RrPixmapMaskFree(theme->iconify_pressed_mask);
         RrPixmapMaskFree(theme->close_mask);
         RrPixmapMaskFree(theme->close_disabled_mask);
         RrPixmapMaskFree(theme->close_hover_mask);
+        RrPixmapMaskFree(theme->close_pressed_mask);
 
         RrFontClose(theme->winfont);
         RrFontClose(theme->mtitlefont);
@@ -877,6 +928,7 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_menu_item);
         RrAppearanceFree(theme->a_menu_disabled);
         RrAppearanceFree(theme->a_menu_hilite);
+        RrAppearanceFree(theme->a_clear);
         RrAppearanceFree(theme->app_hilite_bg);
         RrAppearanceFree(theme->app_unhilite_bg);
         RrAppearanceFree(theme->app_hilite_label);
@@ -889,19 +941,19 @@ static XrmDatabase loaddb(RrTheme *theme, char *name)
 {
     XrmDatabase db;
 
-    char *s = g_build_filename(name, "themerc", NULL);
+    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(g_get_home_dir(), ".openbox", "themes",
-                                  name, "themerc", NULL);
+       char *s = g_build_filename(THEMEDIR, 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);
+    char *s = g_build_filename(name, "themerc", NULL);
        if ((db = XrmGetFileDatabase(s)))
             theme->path = g_path_get_dirname(s);
         g_free(s);
@@ -991,28 +1043,12 @@ static gboolean read_mask(const RrInstance *inst,
     unsigned int w, h;
     unsigned char *b;
 
-    s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
-                         theme->name, maskname, NULL);
-    if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
+    s = g_build_filename(theme->path, maskname, NULL);
+    if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) {
         ret = TRUE;
-    else {
-        g_free(s);
-        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, maskname, NULL);
-            if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
-                ret = TRUE;
-        }
-    }
-
-    if (ret) {
         *value = RrPixmapMaskNew(inst, w, h, (char*)b);
         XFree(b);
     }
-      
     g_free(s);
 
     return ret;