X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=engines%2Fopenbox%2Fopenbox.c;h=184262ec25f88e30e165f7e2020edef7db0ae614;hb=b6ad10764e75923ecb55d3dce96415eb991c64ec;hp=80e9e81216d11382eda7f70b67c2d5148bd3fa87;hpb=bb3e654edef54efd6d0c24cbf6014eb4f9468037;p=chaz%2Fopenbox

diff --git a/engines/openbox/openbox.c b/engines/openbox/openbox.c
index 80e9e812..184262ec 100644
--- a/engines/openbox/openbox.c
+++ b/engines/openbox/openbox.c
@@ -7,6 +7,7 @@
 #include "../../render/render.h"
 #include "../../render/color.h"
 #include "../../render/font.h"
+#include "../../render/mask.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
@@ -33,11 +34,18 @@ color_rgb *s_cb_focused_color;
 color_rgb *s_cb_unfocused_color;
 color_rgb *s_title_focused_color;
 color_rgb *s_title_unfocused_color;
+color_rgb *s_titlebut_focused_color;
+color_rgb *s_titlebut_unfocused_color;
 /* style settings - fonts */
 int s_winfont_height;
 int s_winfont_shadow;
 int s_winfont_shadow_offset;
 ObFont *s_winfont;
+/* style settings - masks */
+pixmap_mask *s_max_mask;
+pixmap_mask *s_icon_mask;
+pixmap_mask *s_desk_mask;
+pixmap_mask *s_close_mask;
 
 /* global appearances */
 Appearance *a_focused_unpressed_max;
@@ -134,13 +142,16 @@ gboolean startup()
     g_quark_from_string("icon");
     g_quark_from_string("close");
 
-    s_b_color = s_cb_unfocused_color = s_cb_focused_color = NULL;
+    s_b_color = s_cb_unfocused_color = s_cb_focused_color = 
+        s_title_unfocused_color = s_title_focused_color = 
+        s_titlebut_unfocused_color = s_titlebut_focused_color = NULL;
     s_winfont = NULL;
+    s_max_mask = s_icon_mask = s_desk_mask = s_close_mask = NULL;
 
-    a_focused_unpressed_max = appearance_new(Surface_Planar, 0);//1);
-    a_focused_pressed_max = appearance_new(Surface_Planar, 0);//1);
-    a_unfocused_unpressed_max = appearance_new(Surface_Planar, 0);//1);
-    a_unfocused_pressed_max = appearance_new(Surface_Planar, 0);//1);
+    a_focused_unpressed_max = appearance_new(Surface_Planar, 1);
+    a_focused_pressed_max = appearance_new(Surface_Planar, 1);
+    a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1);
+    a_unfocused_pressed_max = appearance_new(Surface_Planar, 1);
     a_focused_unpressed_close = NULL;
     a_focused_pressed_close = NULL;
     a_unfocused_unpressed_close = NULL;
@@ -163,18 +174,6 @@ gboolean startup()
     a_focused_handle = appearance_new(Surface_Planar, 0);
     a_unfocused_handle = appearance_new(Surface_Planar, 0);
 
-    a_focused_label->texture[0].type = Text;
-    a_focused_label->texture[0].data.text.font = s_winfont;
-    a_focused_label->texture[0].data.text.shadow = s_winfont_shadow;
-    a_focused_label->texture[0].data.text.offset = s_winfont_shadow_offset;
-    a_focused_label->texture[0].data.text.color = s_title_focused_color;
-
-    a_unfocused_label->texture[0].type = Text;
-    a_unfocused_label->texture[0].data.text.font = s_winfont;
-    a_unfocused_label->texture[0].data.text.shadow = s_winfont_shadow;
-    a_unfocused_label->texture[0].data.text.offset = s_winfont_shadow_offset;
-    a_unfocused_label->texture[0].data.text.color = s_title_unfocused_color;
-
     return load();
 }
 
@@ -183,6 +182,17 @@ void shutdown()
     if (s_b_color != NULL) color_free(s_b_color);
     if (s_cb_unfocused_color != NULL) color_free(s_cb_unfocused_color);
     if (s_cb_focused_color != NULL) color_free(s_cb_focused_color);
+    if (s_title_unfocused_color != NULL) color_free(s_title_unfocused_color);
+    if (s_title_focused_color != NULL) color_free(s_title_focused_color);
+    if (s_titlebut_unfocused_color != NULL)
+        color_free(s_titlebut_unfocused_color);
+    if (s_titlebut_focused_color != NULL)
+        color_free(s_titlebut_focused_color);
+
+    if (s_max_mask != NULL) pixmap_mask_free(s_max_mask);
+    if (s_desk_mask != NULL) pixmap_mask_free(s_desk_mask);
+    if (s_icon_mask != NULL) pixmap_mask_free(s_icon_mask);
+    if (s_close_mask != NULL) pixmap_mask_free(s_close_mask);
 
     if (s_winfont != NULL) font_close(s_winfont);
 
@@ -747,16 +757,17 @@ static void render(ObFrame *self)
 
 static void render_label(ObFrame *self)
 {
+    Appearance *a;
+
     if (self->label_x < 0) return;
 
+    a = (self->frame.client->focused ?
+         self->a_focused_label : self->a_focused_label);
+
     /* set the texture's text! */
-    self->a_focused_label->texture[0].data.text.string =
-        self->frame.client->title;
+    a->texture[0].data.text.string = self->frame.client->title;
 
-    paint(self->label, (self->frame.client->focused ?
-			self->a_focused_label :
-			self->a_unfocused_label),
-	  self->label_width, LABEL_HEIGHT);
+    paint(self->label, a, self->label_width, LABEL_HEIGHT);
 }
 
 static void render_icon(ObFrame *self)