X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=engines%2Fopenbox%2Fobtheme.c;h=ccd17cc0bf7da1ff8f1c629703cf834c274bb38a;hb=49eea4715faa55a0da670112619f22da6e20f5aa;hp=f1bb2981b88eeaaa802c97817249b37b523fc3d9;hpb=51c0c7398236a5dd7064562dcb37ce3331f2dd0b;p=chaz%2Fopenbox

diff --git a/engines/openbox/obtheme.c b/engines/openbox/obtheme.c
index f1bb2981..ccd17cc0 100644
--- a/engines/openbox/obtheme.c
+++ b/engines/openbox/obtheme.c
@@ -328,7 +328,8 @@ gboolean obtheme_load()
     }
 
     if (!read_int(db, "handleWidth", &ob_s_handle_height) ||
-	ob_s_handle_height < 0 || ob_s_handle_height > 100) ob_s_handle_height = 6;
+	ob_s_handle_height < 0 || ob_s_handle_height > 100)
+        ob_s_handle_height = 6;
     if (!read_int(db, "bevelWidth", &ob_s_bevel) ||
 	ob_s_bevel <= 0 || ob_s_bevel > 100) ob_s_bevel = 3;
     if (!read_int(db, "borderWidth", &ob_s_bwidth) ||
@@ -344,7 +345,7 @@ gboolean obtheme_load()
 	ob_s_cb_unfocused_color = color_new(0xff, 0xff, 0xff);
     if (!read_color(db, "window.label.focus.textColor",
                     &ob_s_title_focused_color))
-	ob_s_title_focused_color = color_new(0xff, 0xff, 0xff);
+	ob_s_title_focused_color = color_new(0x0, 0x0, 0x0);
     if (!read_color(db, "window.label.unfocus.textColor",
                     &ob_s_title_unfocused_color))
 	ob_s_title_unfocused_color = color_new(0xff, 0xff, 0xff);
@@ -355,20 +356,67 @@ gboolean obtheme_load()
                     &ob_s_titlebut_unfocused_color))
 	ob_s_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff);
 
-    if (!read_mask(db, "window.button.max.mask", &ob_s_max_mask)) {
-        char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f  };
-        ob_s_max_mask = pixmap_mask_new(7, 7, data);
+    if (read_mask(db, "window.button.max.mask", &ob_s_max_unset_mask)) {
+        if (!read_mask(db, "window.button.max.toggled.mask",
+                       &ob_s_max_set_mask)) {
+            ob_s_max_set_mask = pixmap_mask_copy(ob_s_max_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+            ob_s_max_unset_mask = pixmap_mask_new(7, 7, data);
+        }
+        {
+            char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+            ob_s_max_set_mask = pixmap_mask_new(7, 7, data);
+        }
     }
-    if (!read_mask(db, "window.button.icon.mask", &ob_s_icon_mask)) {
-        char data[] = { 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e };
-        ob_s_icon_mask = pixmap_mask_new(7, 7, data);
+
+    if (!read_mask(db, "window.button.icon.mask",
+                   &ob_s_iconify_mask)) {
+        char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+        ob_s_iconify_mask = pixmap_mask_new(7, 7, data);
     }
-    if (!read_mask(db, "window.button.stick.mask", &ob_s_desk_mask)) {
-        char data[] = { 0x00, 0x36, 0x36, 0x00, 0x36, 0x36, 0x00 };
-        ob_s_desk_mask = pixmap_mask_new(7, 7, data);
+
+    if (read_mask(db, "window.button.stick.mask",
+                   &ob_s_desk_unset_mask)) {
+        if (!read_mask(db, "window.button.stick.toggled.mask",
+                       &ob_s_desk_set_mask)) {
+            ob_s_desk_set_mask =
+                pixmap_mask_copy(ob_s_desk_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+            ob_s_desk_unset_mask = pixmap_mask_new(7, 7, data);
+        }
+        {
+            char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+            ob_s_desk_set_mask = pixmap_mask_new(7, 7, data);
+        }
     }
-    if (!read_mask(db, "window.button.close.mask", &ob_s_close_mask)) {
-        char data[] = { 0x22, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x22 };
+
+    if (read_mask(db, "window.button.shade.mask",
+                   &ob_s_shade_unset_mask)) {
+        if (!read_mask(db, "window.button.shade.toggled.mask",
+                       &ob_s_shade_set_mask)) {
+            ob_s_shade_set_mask =
+                pixmap_mask_copy(ob_s_shade_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+            ob_s_shade_unset_mask = pixmap_mask_new(7, 7, data);
+        }
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
+            ob_s_shade_set_mask = pixmap_mask_new(7, 7, data);
+        }
+    }
+
+    if (!read_mask(db, "window.button.close.mask",
+                   &ob_s_close_mask)) {
+        char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
         ob_s_close_mask = pixmap_mask_new(7, 7, data);
     }        
 
@@ -414,8 +462,19 @@ gboolean obtheme_load()
     ob_a_unfocused_unpressed_desk =
         appearance_copy(ob_a_unfocused_unpressed_max);
     ob_a_unfocused_pressed_desk = appearance_copy(ob_a_unfocused_pressed_max);
+    ob_a_unfocused_pressed_set_desk =
+        appearance_copy(ob_a_unfocused_pressed_max);
     ob_a_focused_unpressed_desk = appearance_copy(ob_a_focused_unpressed_max);
     ob_a_focused_pressed_desk = appearance_copy(ob_a_focused_pressed_max);
+    ob_a_focused_pressed_set_desk = appearance_copy(ob_a_focused_pressed_max);
+    ob_a_unfocused_unpressed_shade =
+        appearance_copy(ob_a_unfocused_unpressed_max);
+    ob_a_unfocused_pressed_shade = appearance_copy(ob_a_unfocused_pressed_max);
+    ob_a_unfocused_pressed_set_shade =
+        appearance_copy(ob_a_unfocused_pressed_max);
+    ob_a_focused_unpressed_shade = appearance_copy(ob_a_focused_unpressed_max);
+    ob_a_focused_pressed_shade = appearance_copy(ob_a_focused_pressed_max);
+    ob_a_focused_pressed_set_shade = appearance_copy(ob_a_focused_pressed_max);
     ob_a_unfocused_unpressed_iconify =
         appearance_copy(ob_a_unfocused_unpressed_max);
     ob_a_unfocused_pressed_iconify =
@@ -423,6 +482,9 @@ gboolean obtheme_load()
     ob_a_focused_unpressed_iconify =
         appearance_copy(ob_a_focused_unpressed_max);
     ob_a_focused_pressed_iconify = appearance_copy(ob_a_focused_pressed_max);
+    ob_a_unfocused_pressed_set_max =
+        appearance_copy(ob_a_unfocused_pressed_max);
+    ob_a_focused_pressed_set_max = appearance_copy(ob_a_focused_pressed_max);
 
     ob_a_icon->surface.data.planar.grad = Background_ParentRelative;
 
@@ -446,54 +508,89 @@ gboolean obtheme_load()
 
     ob_a_focused_unpressed_max->texture[0].type = 
         ob_a_focused_pressed_max->texture[0].type = 
+        ob_a_focused_pressed_set_max->texture[0].type =  
         ob_a_unfocused_unpressed_max->texture[0].type = 
         ob_a_unfocused_pressed_max->texture[0].type = 
+        ob_a_unfocused_pressed_set_max->texture[0].type = 
         ob_a_focused_unpressed_close->texture[0].type = 
         ob_a_focused_pressed_close->texture[0].type = 
         ob_a_unfocused_unpressed_close->texture[0].type = 
         ob_a_unfocused_pressed_close->texture[0].type = 
         ob_a_focused_unpressed_desk->texture[0].type = 
         ob_a_focused_pressed_desk->texture[0].type = 
+        ob_a_focused_pressed_set_desk->texture[0].type = 
         ob_a_unfocused_unpressed_desk->texture[0].type = 
         ob_a_unfocused_pressed_desk->texture[0].type = 
+        ob_a_unfocused_pressed_set_desk->texture[0].type = 
+        ob_a_focused_unpressed_shade->texture[0].type = 
+        ob_a_focused_pressed_shade->texture[0].type = 
+        ob_a_focused_pressed_set_shade->texture[0].type = 
+        ob_a_unfocused_unpressed_shade->texture[0].type = 
+        ob_a_unfocused_pressed_shade->texture[0].type = 
+        ob_a_unfocused_pressed_set_shade->texture[0].type = 
         ob_a_focused_unpressed_iconify->texture[0].type = 
         ob_a_focused_pressed_iconify->texture[0].type = 
         ob_a_unfocused_unpressed_iconify->texture[0].type = 
         ob_a_unfocused_pressed_iconify->texture[0].type = Bitmask;
     ob_a_focused_unpressed_max->texture[0].data.mask.mask = 
-        ob_a_focused_pressed_max->texture[0].data.mask.mask = 
         ob_a_unfocused_unpressed_max->texture[0].data.mask.mask = 
-        ob_a_unfocused_pressed_max->texture[0].data.mask.mask = ob_s_max_mask;
-    ob_a_focused_unpressed_close->texture[0].data.mask.mask = 
-        ob_a_focused_pressed_close->texture[0].data.mask.mask = 
-        ob_a_unfocused_unpressed_close->texture[0].data.mask.mask = 
+        ob_a_focused_pressed_max->texture[0].data.mask.mask = 
+        ob_a_unfocused_pressed_max->texture[0].data.mask.mask =
+        ob_s_max_unset_mask;
+    ob_a_focused_pressed_set_max->texture[0].data.mask.mask = 
+        ob_a_unfocused_pressed_set_max->texture[0].data.mask.mask =
+        ob_s_max_set_mask;
+    ob_a_focused_pressed_close->texture[0].data.mask.mask = 
         ob_a_unfocused_pressed_close->texture[0].data.mask.mask =
+        ob_a_focused_unpressed_close->texture[0].data.mask.mask = 
+        ob_a_unfocused_unpressed_close->texture[0].data.mask.mask =
         ob_s_close_mask;
     ob_a_focused_unpressed_desk->texture[0].data.mask.mask = 
-        ob_a_focused_pressed_desk->texture[0].data.mask.mask = 
         ob_a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
+        ob_a_focused_pressed_desk->texture[0].data.mask.mask = 
         ob_a_unfocused_pressed_desk->texture[0].data.mask.mask =
-        ob_s_desk_mask;
+        ob_s_desk_unset_mask;
+    ob_a_focused_pressed_set_desk->texture[0].data.mask.mask = 
+        ob_a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
+        ob_s_desk_set_mask;
+    ob_a_focused_unpressed_shade->texture[0].data.mask.mask = 
+        ob_a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
+        ob_a_focused_pressed_shade->texture[0].data.mask.mask = 
+        ob_a_unfocused_pressed_shade->texture[0].data.mask.mask =
+        ob_s_shade_unset_mask;
+    ob_a_focused_pressed_set_shade->texture[0].data.mask.mask = 
+        ob_a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
+        ob_s_shade_set_mask;
     ob_a_focused_unpressed_iconify->texture[0].data.mask.mask = 
-        ob_a_focused_pressed_iconify->texture[0].data.mask.mask = 
         ob_a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
+        ob_a_focused_pressed_iconify->texture[0].data.mask.mask = 
         ob_a_unfocused_pressed_iconify->texture[0].data.mask.mask =
-        ob_s_icon_mask;
+        ob_s_iconify_mask;
     ob_a_focused_unpressed_max->texture[0].data.mask.color = 
         ob_a_focused_pressed_max->texture[0].data.mask.color = 
+        ob_a_focused_pressed_set_max->texture[0].data.mask.color = 
         ob_a_focused_unpressed_close->texture[0].data.mask.color = 
         ob_a_focused_pressed_close->texture[0].data.mask.color = 
         ob_a_focused_unpressed_desk->texture[0].data.mask.color = 
         ob_a_focused_pressed_desk->texture[0].data.mask.color = 
+        ob_a_focused_pressed_set_desk->texture[0].data.mask.color = 
+        ob_a_focused_unpressed_shade->texture[0].data.mask.color = 
+        ob_a_focused_pressed_shade->texture[0].data.mask.color = 
+        ob_a_focused_pressed_set_shade->texture[0].data.mask.color = 
         ob_a_focused_unpressed_iconify->texture[0].data.mask.color = 
         ob_a_focused_pressed_iconify->texture[0].data.mask.color =
         ob_s_titlebut_focused_color;
     ob_a_unfocused_unpressed_max->texture[0].data.mask.color = 
         ob_a_unfocused_pressed_max->texture[0].data.mask.color = 
+        ob_a_unfocused_pressed_set_max->texture[0].data.mask.color = 
         ob_a_unfocused_unpressed_close->texture[0].data.mask.color = 
         ob_a_unfocused_pressed_close->texture[0].data.mask.color = 
         ob_a_unfocused_unpressed_desk->texture[0].data.mask.color = 
         ob_a_unfocused_pressed_desk->texture[0].data.mask.color = 
+        ob_a_unfocused_pressed_set_desk->texture[0].data.mask.color = 
+        ob_a_unfocused_unpressed_shade->texture[0].data.mask.color = 
+        ob_a_unfocused_pressed_shade->texture[0].data.mask.color = 
+        ob_a_unfocused_pressed_set_shade->texture[0].data.mask.color = 
         ob_a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
         ob_a_unfocused_pressed_iconify->texture[0].data.mask.color =
         ob_s_titlebut_unfocused_color;