X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=97f5e1f5865df388219777d742fa36814b43e658;hb=063f837f542549cb8fa4399eefaf5e48b3774cf2;hp=d29b35af6ba658827c0f3530ac0332cd29036808;hpb=c0ddd76ac57f088cbb3647165b12b54982554577;p=chaz%2Fopenbox

diff --git a/render/theme.c b/render/theme.c
index d29b35af..97f5e1f5 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -74,6 +74,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     RrJustify winjust, mtitlejust;
     gchar *str;
     RrTheme *theme;
+    gboolean userdef;
 
     if (name) {
         if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) {
@@ -196,31 +197,40 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
               &theme->paddingx, &theme->paddingy, 0, 100, 0, 100))
         theme->paddingx = theme->paddingy = 3;
 
-    if (!FIND(int, L("window","border","width"),
+    if (!FIND(int, L("dimensions","window","border"),
               &theme->fbwidth, 0, 100))
         theme->fbwidth = 1;
 
     /* menu border width inherits from frame border width */
-    if (!FIND(int, L("menu","border","width"),
+    if (!FIND(int, L("dimensions","menu","border"),
               &theme->mbwidth, 0, 100))
         theme->mbwidth = theme->fbwidth;
 
-    if (!FIND(point, L("window","clientpadding"), &theme->cbwidthx,
-              &theme->cbwidthy, 0, 100, 0, 100))
+    if (!FIND(point, L("dimensions","window","clientpadding"),
+              &theme->cbwidthx, &theme->cbwidthy, 0, 100, 0, 100))
         theme->cbwidthx = theme->cbwidthy = 1;
 
     /* load colors */
-    if (!FIND(color, L("window","border","primary"),
-              &theme->frame_b_color, NULL))
-        theme->frame_b_color = RrColorNew(inst, 0, 0, 0);
-
-    /* menu border color inherits from frame border color */
-    if (!FIND(color, L("menu","border","primary"),
-              &theme->menu_b_color, NULL))
-        theme->menu_b_color = RrColorNew(inst,
-                                         theme->frame_b_color->r,
-                                         theme->frame_b_color->g,
-                                         theme->frame_b_color->b);
+    if (!FIND(color, L("window","active","border"),
+              &theme->frame_focused_border_color, NULL))
+        theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0);
+    /* frame unfocused border color inherits from frame focused border color */
+    if (!FIND(color, L("window","inactive","border"),
+              &theme->frame_unfocused_border_color, NULL))
+        theme->frame_unfocused_border_color =
+            RrColorNew(inst,
+                       theme->frame_focused_border_color->r,
+                       theme->frame_focused_border_color->g,
+                       theme->frame_focused_border_color->b);
+
+    /* menu border color inherits from frame focused border color */
+    if (!FIND(color, L("menu","border"),
+              &theme->menu_border_color, NULL))
+        theme->menu_border_color =
+            RrColorNew(inst,
+                       theme->frame_focused_border_color->r,
+                       theme->frame_focused_border_color->g,
+                       theme->frame_focused_border_color->b);
     if (!FIND(color, L("window","active","clientpadding"),
               &theme->cb_focused_color, NULL))
         theme->cb_focused_color = RrColorNew(inst, 255, 255, 255);
@@ -416,163 +426,125 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     }
     
     /* load the image masks */
-    if (read_mask(&ps, "max.xbm", &theme->max_mask)) {
-        if (!read_mask(&ps, "max_pressed.xbm", &theme->max_pressed_mask))
-            theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
-        if (!read_mask(&ps, "max_toggled.xbm",  &theme->max_toggled_mask))
-            theme->max_toggled_mask =
-                RrPixmapMaskCopy(theme->max_pressed_mask);
-        if (!read_mask(&ps, "max_toggled_pressed.xbm",
-                       &theme->max_toggled_pressed_mask))
-            theme->max_toggled_pressed_mask =
-                RrPixmapMaskCopy(theme->max_toggled_mask);
-        if (!read_mask(&ps, "max_toggled_hover.xbm",
-                       &theme->max_toggled_hover_mask))
-            theme->max_toggled_hover_mask =
-                RrPixmapMaskCopy(theme->max_toggled_mask);
-        if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask))
-            theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
-        if (!read_mask(&ps, "max_hover.xbm", &theme->max_hover_mask))
-            theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
-    } else {
-        {
-            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
-            theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data);
-        }
-        {
-            guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
-            theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data);
+
+    /* maximize button masks */
+    userdef = TRUE;
+    if (!read_mask(&ps, "max.xbm", &theme->max_mask)) {
+            guchar data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };
+            theme->max_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
+            userdef = FALSE;
+    }
+    if (!read_mask(&ps, "max_toggled.xbm",  &theme->max_toggled_mask)) {
+        if (userdef)
+            theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask);
+        else {
+            guchar data[] = { 0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f };
+            theme->max_toggled_mask = RrPixmapMaskNew(inst, 6, 6,(gchar*)data);
         }
+    }
+    if (!read_mask(&ps, "max_pressed.xbm", &theme->max_pressed_mask))
         theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+    if (!read_mask(&ps, "max_disabled.xbm", &theme->max_disabled_mask))
         theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
+    if (!read_mask(&ps, "max_hover.xbm", &theme->max_hover_mask))
         theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
+    if (!read_mask(&ps, "max_toggled_pressed.xbm",
+                   &theme->max_toggled_pressed_mask))
         theme->max_toggled_pressed_mask =
             RrPixmapMaskCopy(theme->max_toggled_mask);
+    if (!read_mask(&ps, "max_toggled_hover.xbm",
+                   &theme->max_toggled_hover_mask))
         theme->max_toggled_hover_mask =
             RrPixmapMaskCopy(theme->max_toggled_mask);
-    }
 
-    if (read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) {
-        if (!read_mask(&ps, "iconify_pressed.xbm",
-                       &theme->iconify_pressed_mask))
-            theme->iconify_pressed_mask =
-                RrPixmapMaskCopy(theme->iconify_mask);
-        if (!read_mask(&ps, "iconify_disabled.xbm",
-                       &theme->iconify_disabled_mask))
-            theme->iconify_disabled_mask =
-                RrPixmapMaskCopy(theme->iconify_mask);
-        if (!read_mask(&ps, "iconify_hover.xbm", &theme->iconify_hover_mask))
-            theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
-    } else {
-        {
-            guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
-            theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data);
-        }
+    /* iconify button masks */
+    if (!read_mask(&ps, "iconify.xbm", &theme->iconify_mask)) {
+        guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f };
+        theme->iconify_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
+    }
+    if (!read_mask(&ps, "iconify_pressed.xbm", &theme->iconify_pressed_mask))
         theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask);
+    if (!read_mask(&ps, "iconify_disabled.xbm", &theme->iconify_disabled_mask))
         theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask);
+    if (!read_mask(&ps, "iconify_hover.xbm", &theme->iconify_hover_mask))
         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(&ps, "desk.xbm", &theme->desk_mask)) {
-        if (!read_mask(&ps, "desk_pressed.xbm", &theme->desk_pressed_mask))
-            theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
-        if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask))
+    /* all desktops button masks */
+    userdef = TRUE;
+    if (!read_mask(&ps, "desk.xbm", &theme->desk_mask)) {
+        guchar data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 };
+        theme->desk_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
+        userdef = FALSE;
+    }
+    if (!read_mask(&ps, "desk_toggled.xbm", &theme->desk_toggled_mask)) {
+        if (userdef)
+            theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask);
+        else {
+            guchar data[] = { 0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 };
             theme->desk_toggled_mask =
-                RrPixmapMaskCopy(theme->desk_pressed_mask);
-        if (!read_mask(&ps, "desk_toggled_pressed.xbm",
-                       &theme->desk_toggled_pressed_mask))
-            theme->desk_toggled_pressed_mask =
-                RrPixmapMaskCopy(theme->desk_toggled_mask);
-        if (!read_mask(&ps, "desk_toggled_hover.xbm",
-                       &theme->desk_toggled_hover_mask))
-            theme->desk_toggled_hover_mask =
-                RrPixmapMaskCopy(theme->desk_toggled_mask);
-        if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask))
-            theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
-        if (!read_mask(&ps, "desk_hover.xbm", &theme->desk_hover_mask))
-            theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
-    } else {
-        {
-            guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
-            theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data);
-        }
-        {
-            guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
-            theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
-                                                       (gchar*)data);
+                RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
         }
+    }
+    if (!read_mask(&ps, "desk_pressed.xbm", &theme->desk_pressed_mask))
         theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+    if (!read_mask(&ps, "desk_disabled.xbm", &theme->desk_disabled_mask))
         theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+    if (!read_mask(&ps, "desk_hover.xbm", &theme->desk_hover_mask))
         theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
+    if (!read_mask(&ps, "desk_toggled_pressed.xbm",
+                   &theme->desk_toggled_pressed_mask))
         theme->desk_toggled_pressed_mask =
             RrPixmapMaskCopy(theme->desk_toggled_mask);
+    if (!read_mask(&ps, "desk_toggled_hover.xbm",
+                   &theme->desk_toggled_hover_mask))
         theme->desk_toggled_hover_mask =
             RrPixmapMaskCopy(theme->desk_toggled_mask);
-    }
 
-    if (read_mask(&ps, "shade.xbm", &theme->shade_mask)) {
-        if (!read_mask(&ps, "shade_pressed.xbm", &theme->shade_pressed_mask))
-            theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
-        if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask))
-            theme->shade_toggled_mask =
-                RrPixmapMaskCopy(theme->shade_pressed_mask);
-        if (!read_mask(&ps, "shade_toggled_pressed.xbm",
-                       &theme->shade_toggled_pressed_mask))
-            theme->shade_toggled_pressed_mask =
-                RrPixmapMaskCopy(theme->shade_toggled_mask);
-        if (!read_mask(&ps, "shade_toggled_hover.xbm",
-                       &theme->shade_toggled_hover_mask))
-            theme->shade_toggled_hover_mask =
-                RrPixmapMaskCopy(theme->shade_toggled_mask);
-        if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask))
-            theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
-        if (!read_mask(&ps, "shade_hover.xbm", &theme->shade_hover_mask))
-            theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
-    } else {
-        {
-            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
-            theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data);
-        }
-        {
-            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
-            theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
-                                                        (gchar*)data);
-        }
+    /* shade button masks */
+    if (!read_mask(&ps, "shade.xbm", &theme->shade_mask)) {
+        guchar data[] = { 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 };
+        theme->shade_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
+    }
+    if (!read_mask(&ps, "shade_toggled.xbm", &theme->shade_toggled_mask))
+        theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask);
+    if (!read_mask(&ps, "shade_pressed.xbm", &theme->shade_pressed_mask))
         theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+    if (!read_mask(&ps, "shade_disabled.xbm", &theme->shade_disabled_mask))
         theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
+    if (!read_mask(&ps, "shade_hover.xbm", &theme->shade_hover_mask))
         theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
+    if (!read_mask(&ps, "shade_toggled_pressed.xbm",
+                   &theme->shade_toggled_pressed_mask))
         theme->shade_toggled_pressed_mask =
             RrPixmapMaskCopy(theme->shade_toggled_mask);
+    if (!read_mask(&ps, "shade_toggled_hover.xbm",
+                   &theme->shade_toggled_hover_mask))
         theme->shade_toggled_hover_mask =
             RrPixmapMaskCopy(theme->shade_toggled_mask);
-    }
 
-    if (read_mask(&ps, "close.xbm", &theme->close_mask)) {
-        if (!read_mask(&ps, "close_pressed.xbm", &theme->close_pressed_mask))
-            theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
-        if (!read_mask(&ps, "close_disabled.xbm", &theme->close_disabled_mask))
-            theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
-        if (!read_mask(&ps, "close_hover.xbm", &theme->close_hover_mask))
-            theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
-    } else {
-        {
-            guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
-            theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (gchar*)data);
-        }
+    /* close button masks */
+    if (!read_mask(&ps, "close.xbm", &theme->close_mask)) {
+        guchar data[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };
+        theme->close_mask = RrPixmapMaskNew(inst, 6, 6, (gchar*)data);
+    }
+    if (!read_mask(&ps, "close_pressed.xbm", &theme->close_pressed_mask))
         theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
+    if (!read_mask(&ps, "close_disabled.xbm", &theme->close_disabled_mask))
         theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
+    if (!read_mask(&ps, "close_hover.xbm", &theme->close_hover_mask))
         theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
-    }
 
+    /* submenu bullet mask */
     if (!read_mask(&ps, "bullet.xbm", &theme->menu_bullet_mask)) {
         guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };
         theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (gchar*)data);
     }
 
+    /* setup the default window icon */
+    theme->def_win_icon = read_c_image(OB_DEFAULT_ICON_WIDTH,
+                                       OB_DEFAULT_ICON_HEIGHT,
+                                       OB_DEFAULT_ICON_pixel_data);
+
     /* read the decoration textures */
     if (!FIND(appearance, L("window","active","titlebar"),
               theme->a_focused_title, FALSE))
@@ -1191,6 +1163,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         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);
+        theme->label_height += theme->label_height & 1;
 
         /* 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
@@ -1219,8 +1192,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
 void RrThemeFree(RrTheme *theme)
 {
     if (theme) {
-        RrColorFree(theme->menu_b_color);
-        RrColorFree(theme->frame_b_color);
+        RrColorFree(theme->menu_border_color);
+        RrColorFree(theme->frame_focused_border_color);
+        RrColorFree(theme->frame_unfocused_border_color);
         RrColorFree(theme->cb_unfocused_color);
         RrColorFree(theme->cb_focused_color);
         RrColorFree(theme->title_focused_color);