move the themes

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

diff --git a/engines/openbox/obengine.c b/engines/openbox/obengine.c
index 4dda711e1cd03c8d50360aea32d72e7be31bde9e..75396c8a6ca5b4c4a569ba38b34d82fe597d4763 100644 (file)
--- a/engines/openbox/obengine.c
+++ b/engines/openbox/obengine.c
@@ -1,10 +1,10 @@
 #include "obtheme.h"
 #include "obrender.h"
 #include "obengine.h"
-#include "../../kernel/openbox.h"
-#include "../../kernel/extensions.h"
-#include "../../kernel/dispatch.h"
-#include "../../kernel/config.h"
+#include "kernel/openbox.h"
+#include "kernel/extensions.h"
+#include "kernel/dispatch.h"
+#include "kernel/config.h"
 
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
@@ -34,9 +34,6 @@ color_rgb *ob_s_titlebut_focused_color;
 color_rgb *ob_s_titlebut_unfocused_color;
 /* style settings - fonts */
 int ob_s_winfont_height;
-int ob_s_winfont_shadow;
-int ob_s_winfont_shadow_offset;
-int ob_s_winfont_shadow_tint;
 ObFont *ob_s_winfont;
 /* style settings - masks */
 pixmap_mask *ob_s_max_set_mask;
@@ -85,6 +82,9 @@ Appearance *ob_a_icon; /* always parentrelative, so no focused/unfocused */
 Appearance *ob_a_focused_handle;
 Appearance *ob_a_unfocused_handle;
 
+Appearance *ob_app_hilite_label;
+Appearance *ob_app_unhilite_label;
+
 static void layout_title(ObFrame *self);
 static void mouse_event(const ObEvent *e, ObFrame *self);
 
@@ -143,6 +143,8 @@ gboolean startup()
     ob_a_icon = appearance_new(Surface_Planar, 1);
     ob_a_focused_handle = appearance_new(Surface_Planar, 0);
     ob_a_unfocused_handle = appearance_new(Surface_Planar, 0);
+    ob_app_hilite_label = appearance_new(Surface_Planar, 1);
+    ob_app_unhilite_label = appearance_new(Surface_Planar, 1);
 
     if (obtheme_load()) {
         RECT_SET(ob_a_focused_pressed_desk->area, 0, 0,
@@ -287,6 +289,8 @@ void shutdown()
     appearance_free(ob_a_icon);
     appearance_free(ob_a_focused_handle);
     appearance_free(ob_a_unfocused_handle);
+    appearance_free(ob_app_hilite_label);
+    appearance_free(ob_app_unhilite_label);
 }
 
 static Window createWindow(Window parent, unsigned long mask,
@@ -694,16 +698,12 @@ static void layout_title(ObFrame *self)
     char *lc;
     int x;
     gboolean n, d, i, l, m, c, s;
-    ConfigValue layout;
 
     n = d = i = l = m = c = s = FALSE;
 
-    if (!config_get("titlebar.layout", Config_String, &layout))
-        g_assert_not_reached();
-
     /* figure out whats being shown, and the width of the label */
     self->label_width = self->width - (ob_s_bevel + 1) * 2;
-    for (lc = layout.string; *lc != '\0'; ++lc) {
+    for (lc = config_engine_layout; *lc != '\0'; ++lc) {
        switch (*lc) {
        case 'N':
            if (!(self->frame.client->decorations & Decor_Icon)) break;
@@ -761,7 +761,7 @@ static void layout_title(ObFrame *self)
     if (!c) XUnmapWindow(ob_display, self->close);
 
     x = ob_s_bevel + 1;
-    for (lc = layout.string; *lc != '\0'; ++lc) {
+    for (lc = config_engine_layout; *lc != '\0'; ++lc) {
        switch (*lc) {
        case 'N':
            if (!n) break;