replaced one too many bevels

[chaz/openbox] / engines / openbox / openbox.c

diff --git a/engines/openbox/openbox.c b/engines/openbox/openbox.c
index 75dc32679c43498c9ee9f89736719744846b42ed..cab29ea0401311bd60e2fe568d7ed038ece9d789 100644 (file)
--- 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;
@@ -135,13 +143,15 @@ gboolean startup()
     g_quark_from_string("close");
 
     s_b_color = s_cb_unfocused_color = s_cb_focused_color = 
-        s_title_unfocused_color = s_title_focused_color = NULL;
+        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;
@@ -174,6 +184,15 @@ void shutdown()
     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);
 
@@ -575,28 +594,30 @@ void frame_release_client(ObFrame *self, Client *client)
 static void layout_title(ObFrame *self)
 {
     const char *lc;
-    int x;
+    int x, sep;
     gboolean n, d, i, l, m ,c;
+
     n = d = i = l = m = c = FALSE;
+    sep = s_bevel + 1;
 
     /* figure out whats being shown, and the width of the label */
-    self->label_width = self->width - s_bevel * 2;
+    self->label_width = self->width - sep * 2;
     for (lc = themerc_titlebar_layout; *lc != '\0'; ++lc) {
        switch (*lc) {
        case 'N':
            if (!(self->frame.client->decorations & Decor_Icon)) break;
            n = TRUE;
-           self->label_width -= BUTTON_SIZE + s_bevel;
+           self->label_width -= BUTTON_SIZE + sep;
            break;
        case 'D':
            if (!(self->frame.client->decorations & Decor_AllDesktops)) break;
            d = TRUE;
-           self->label_width -= BUTTON_SIZE + s_bevel;
+           self->label_width -= BUTTON_SIZE + sep;
            break;
        case 'I':
            if (!(self->frame.client->decorations & Decor_Iconify)) break;
            i = TRUE;
-           self->label_width -= BUTTON_SIZE + s_bevel;
+           self->label_width -= BUTTON_SIZE + sep;
            break;
        case 'L':
            l = TRUE;
@@ -604,12 +625,12 @@ static void layout_title(ObFrame *self)
        case 'M':
            if (!(self->frame.client->decorations & Decor_Maximize)) break;
            m = TRUE;
-           self->label_width -= BUTTON_SIZE + s_bevel;
+           self->label_width -= BUTTON_SIZE + sep;
            break;
        case 'C':
            if (!(self->frame.client->decorations & Decor_Close)) break;
            c = TRUE;
-           self->label_width -= BUTTON_SIZE + s_bevel;
+           self->label_width -= BUTTON_SIZE + sep;
            break;
        }
     }
@@ -648,7 +669,7 @@ static void layout_title(ObFrame *self)
        self->close_x = -1;
     }
 
-    x = s_bevel;
+    x = sep;
     for (lc = themerc_titlebar_layout; *lc != '\0'; ++lc) {
        switch (*lc) {
        case 'N':
@@ -656,42 +677,42 @@ static void layout_title(ObFrame *self)
            self->icon_x = x;
            XMapWindow(ob_display, self->icon);
            XMoveWindow(ob_display, self->icon, x, s_bevel + 1);
-           x += BUTTON_SIZE + s_bevel;
+           x += BUTTON_SIZE + sep;
            break;
        case 'D':
            if (!d) break;
            self->desk_x = x;
            XMapWindow(ob_display, self->desk);
            XMoveWindow(ob_display, self->desk, x, s_bevel + 1);
-           x += BUTTON_SIZE + s_bevel;
+           x += BUTTON_SIZE + sep;
            break;
        case 'I':
            if (!i) break;
            self->iconify_x = x;
            XMapWindow(ob_display, self->iconify);
            XMoveWindow(ob_display, self->iconify, x, s_bevel + 1);
-           x += BUTTON_SIZE + s_bevel;
+           x += BUTTON_SIZE + sep;
            break;
        case 'L':
            if (!l) break;
            self->label_x = x;
            XMapWindow(ob_display, self->label);
            XMoveWindow(ob_display, self->label, x, s_bevel);
-           x += self->label_width + s_bevel;
+           x += self->label_width + sep;
            break;
        case 'M':
            if (!m) break;
            self->max_x = x;
            XMapWindow(ob_display, self->max);
            XMoveWindow(ob_display, self->max, x, s_bevel + 1);
-           x += BUTTON_SIZE + s_bevel;
+           x += BUTTON_SIZE + sep;
            break;
        case 'C':
            if (!c) break;
            self->close_x = x;
            XMapWindow(ob_display, self->close);
            XMoveWindow(ob_display, self->close, x, s_bevel + 1);
-           x += BUTTON_SIZE + s_bevel;
+           x += BUTTON_SIZE + sep;
            break;
        }
     }