move the openbox engine into librender and the kernel. the theme is loaded and stored inside librender. the frame is decorated and managed inside the kernel.

6 files changed, 907 insertions, 3 deletions

diff --git a/render/.cvsignore b/render/.cvsignore
index 7a8b3196..f3de6485 100644
--- a/render/.cvsignore
+++ b/render/.cvsignore
@@ -9,3 +9,4 @@ mask.lo
 render.lo
 test.lo
 libobrender.la
+theme.lo
diff --git a/render/font.h b/render/font.h
index eaa89d56..6a5d4c65 100644
--- a/render/font.h
+++ b/render/font.h
@@ -2,7 +2,7 @@
 #define __font_h
 #include <X11/Xft/Xft.h>
 #include "render.h"
-#include "../kernel/geom.h"
+#include "kernel/geom.h"
 
 void font_startup(void);
 ObFont *font_open(char *fontstring);
diff --git a/render/mask.h b/render/mask.h
index 89716f85..9328daf1 100644
--- a/render/mask.h
+++ b/render/mask.h
@@ -2,7 +2,7 @@
 #define __mask_h
 
 #include "render.h"
-#include "../kernel/geom.h"
+#include "kernel/geom.h"
 
 pixmap_mask *pixmap_mask_new(int w, int h, char *data);
 pixmap_mask *pixmap_mask_copy(pixmap_mask *src);
diff --git a/render/render.h b/render/render.h
index 1a41b219..ff11c65c 100644
--- a/render/render.h
+++ b/render/render.h
@@ -6,7 +6,7 @@
 #include <X11/Xft/Xft.h>
 #include <glib.h>
 #include "color.h"
-#include "../kernel/geom.h"
+#include "kernel/geom.h"
 
 typedef enum {
     Surface_Planar,
diff --git a/render/theme.c b/render/theme.c
new file mode 100644
index 00000000..d6f248ce
--- /dev/null
+++ b/render/theme.c
@@ -0,0 +1,819 @@
+#include "render.h"
+#include "color.h"
+#include "font.h"
+#include "mask.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xresource.h>
+
+/* style settings - geometry */
+int theme_bevel;
+int theme_handle_height;
+int theme_bwidth;
+int theme_cbwidth;
+/* style settings - colors */
+color_rgb *theme_b_color;
+color_rgb *theme_cb_focused_color;
+color_rgb *theme_cb_unfocused_color;
+color_rgb *theme_title_focused_color;
+color_rgb *theme_title_unfocused_color;
+color_rgb *theme_titlebut_focused_color;
+color_rgb *theme_titlebut_unfocused_color;
+/* style settings - fonts */
+int theme_winfont_height;
+ObFont *theme_winfont;
+gboolean theme_winfont_shadow;
+int theme_winfont_shadow_offset;
+int theme_winfont_shadow_tint;
+/* style settings - title layout */
+char *theme_title_layout;
+/* style settings - masks */
+pixmap_mask *theme_max_set_mask;
+pixmap_mask *theme_max_unset_mask;
+pixmap_mask *theme_iconify_mask;
+pixmap_mask *theme_desk_set_mask;
+pixmap_mask *theme_desk_unset_mask;
+pixmap_mask *theme_shade_set_mask;
+pixmap_mask *theme_shade_unset_mask;
+pixmap_mask *theme_close_mask;
+
+/* global appearances */
+Appearance *theme_a_focused_unpressed_max;
+Appearance *theme_a_focused_pressed_max;
+Appearance *theme_a_focused_pressed_set_max;
+Appearance *theme_a_unfocused_unpressed_max;
+Appearance *theme_a_unfocused_pressed_max;
+Appearance *theme_a_unfocused_pressed_set_max;
+Appearance *theme_a_focused_unpressed_close;
+Appearance *theme_a_focused_pressed_close;
+Appearance *theme_a_unfocused_unpressed_close;
+Appearance *theme_a_unfocused_pressed_close;
+Appearance *theme_a_focused_unpressed_desk;
+Appearance *theme_a_focused_pressed_desk;
+Appearance *theme_a_focused_pressed_set_desk;
+Appearance *theme_a_unfocused_unpressed_desk;
+Appearance *theme_a_unfocused_pressed_desk;
+Appearance *theme_a_unfocused_pressed_set_desk;
+Appearance *theme_a_focused_unpressed_shade;
+Appearance *theme_a_focused_pressed_shade;
+Appearance *theme_a_focused_pressed_set_shade;
+Appearance *theme_a_unfocused_unpressed_shade;
+Appearance *theme_a_unfocused_pressed_shade;
+Appearance *theme_a_unfocused_pressed_set_shade;
+Appearance *theme_a_focused_unpressed_iconify;
+Appearance *theme_a_focused_pressed_iconify;
+Appearance *theme_a_unfocused_unpressed_iconify;
+Appearance *theme_a_unfocused_pressed_iconify;
+Appearance *theme_a_focused_grip;
+Appearance *theme_a_unfocused_grip;
+Appearance *theme_a_focused_title;
+Appearance *theme_a_unfocused_title;
+Appearance *theme_a_focused_label;
+Appearance *theme_a_unfocused_label;
+Appearance *theme_a_icon; /* always parentrelative, so no focused/unfocused */
+Appearance *theme_a_focused_handle;
+Appearance *theme_a_unfocused_handle;
+
+Appearance *theme_app_hilite_label;
+Appearance *theme_app_unhilite_label;
+
+void theme_startup()
+{
+    theme_b_color = theme_cb_unfocused_color = theme_cb_focused_color = 
+        theme_title_unfocused_color = theme_title_focused_color = 
+        theme_titlebut_unfocused_color = theme_titlebut_focused_color = NULL;
+    theme_winfont = NULL;
+    theme_title_layout = NULL;
+    theme_max_set_mask = theme_max_unset_mask = NULL;
+    theme_desk_set_mask = theme_desk_unset_mask = NULL;
+    theme_shade_set_mask = theme_shade_unset_mask = NULL;
+    theme_iconify_mask = theme_close_mask = NULL;
+
+    theme_a_focused_unpressed_max = appearance_new(Surface_Planar, 1);
+    theme_a_focused_pressed_max = appearance_new(Surface_Planar, 1);
+    theme_a_focused_pressed_set_max = appearance_new(Surface_Planar, 1);
+    theme_a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1);
+    theme_a_unfocused_pressed_max = appearance_new(Surface_Planar, 1);
+    theme_a_unfocused_pressed_set_max = appearance_new(Surface_Planar, 1);
+    theme_a_focused_unpressed_close = NULL;
+    theme_a_focused_pressed_close = NULL;
+    theme_a_unfocused_unpressed_close = NULL;
+    theme_a_unfocused_pressed_close = NULL;
+    theme_a_focused_unpressed_desk = NULL;
+    theme_a_focused_pressed_desk = NULL;
+    theme_a_focused_pressed_set_desk = NULL;
+    theme_a_unfocused_unpressed_desk = NULL;
+    theme_a_unfocused_pressed_desk = NULL;
+    theme_a_unfocused_pressed_set_desk = NULL;
+    theme_a_focused_unpressed_shade = NULL;
+    theme_a_focused_pressed_shade = NULL;
+    theme_a_focused_pressed_set_shade = NULL;
+    theme_a_unfocused_unpressed_shade = NULL;
+    theme_a_unfocused_pressed_shade = NULL;
+    theme_a_unfocused_pressed_set_shade = NULL;
+    theme_a_focused_unpressed_iconify = NULL;
+    theme_a_focused_pressed_iconify = NULL;
+    theme_a_unfocused_unpressed_iconify = NULL;
+    theme_a_unfocused_pressed_iconify = NULL;
+    theme_a_focused_grip = appearance_new(Surface_Planar, 0);
+    theme_a_unfocused_grip = appearance_new(Surface_Planar, 0);
+    theme_a_focused_title = appearance_new(Surface_Planar, 0);
+    theme_a_unfocused_title = appearance_new(Surface_Planar, 0);
+    theme_a_focused_label = appearance_new(Surface_Planar, 1);
+    theme_a_unfocused_label = appearance_new(Surface_Planar, 1);
+    theme_a_icon = appearance_new(Surface_Planar, 1);
+    theme_a_focused_handle = appearance_new(Surface_Planar, 0);
+    theme_a_unfocused_handle = appearance_new(Surface_Planar, 0);
+    theme_app_hilite_label = appearance_new(Surface_Planar, 1);
+    theme_app_unhilite_label = appearance_new(Surface_Planar, 1);
+
+}
+
+void theme_shutdown()
+{
+    color_free(theme_b_color);
+    color_free(theme_cb_unfocused_color);
+    color_free(theme_cb_focused_color);
+    color_free(theme_title_unfocused_color);
+    color_free(theme_title_focused_color);
+    color_free(theme_titlebut_unfocused_color);
+    color_free(theme_titlebut_focused_color);
+
+    pixmap_mask_free(theme_max_set_mask);
+    pixmap_mask_free(theme_max_unset_mask);
+    pixmap_mask_free(theme_desk_set_mask);
+    pixmap_mask_free(theme_desk_unset_mask);
+    pixmap_mask_free(theme_shade_set_mask);
+    pixmap_mask_free(theme_shade_unset_mask);
+    pixmap_mask_free(theme_iconify_mask);
+    pixmap_mask_free(theme_close_mask);
+
+    font_close(theme_winfont);
+    g_free(theme_title_layout);
+
+    appearance_free(theme_a_focused_unpressed_max);
+    appearance_free(theme_a_focused_pressed_max);
+    appearance_free(theme_a_focused_pressed_set_max);
+    appearance_free(theme_a_unfocused_unpressed_max);
+    appearance_free(theme_a_unfocused_pressed_max);
+    appearance_free(theme_a_unfocused_pressed_set_max);
+    appearance_free(theme_a_focused_unpressed_close);
+    appearance_free(theme_a_focused_pressed_close);
+    appearance_free(theme_a_unfocused_unpressed_close);
+    appearance_free(theme_a_unfocused_pressed_close);
+    appearance_free(theme_a_focused_unpressed_desk);
+    appearance_free(theme_a_focused_pressed_desk);
+    appearance_free(theme_a_unfocused_unpressed_desk);
+    appearance_free(theme_a_unfocused_pressed_desk);
+    appearance_free(theme_a_focused_unpressed_shade);
+    appearance_free(theme_a_focused_pressed_shade);
+    appearance_free(theme_a_unfocused_unpressed_shade);
+    appearance_free(theme_a_unfocused_pressed_shade);
+    appearance_free(theme_a_focused_unpressed_iconify);
+    appearance_free(theme_a_focused_pressed_iconify);
+    appearance_free(theme_a_unfocused_unpressed_iconify);
+    appearance_free(theme_a_unfocused_pressed_iconify);
+    appearance_free(theme_a_focused_grip);
+    appearance_free(theme_a_unfocused_grip);
+    appearance_free(theme_a_focused_title);
+    appearance_free(theme_a_unfocused_title);
+    appearance_free(theme_a_focused_label);
+    appearance_free(theme_a_unfocused_label);
+    appearance_free(theme_a_icon);
+    appearance_free(theme_a_focused_handle);
+    appearance_free(theme_a_unfocused_handle);
+    appearance_free(theme_app_hilite_label);
+    appearance_free(theme_app_unhilite_label);
+}
+
+static XrmDatabase loaddb(char *theme)
+{
+    XrmDatabase db;
+
+    db = XrmGetFileDatabase(theme);
+    if (db == NULL) {
+	char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
+				   theme, NULL);
+	db = XrmGetFileDatabase(s);
+	g_free(s);
+    }
+    if (db == NULL) {
+	char *s = g_build_filename(THEMEDIR, theme, NULL);
+	db = XrmGetFileDatabase(s);
+	g_free(s);
+    }
+    return db;
+}
+
+static char *create_class_name(char *rname)
+{
+    char *rclass = g_strdup(rname);
+    char *p = rclass;
+
+    while (TRUE) {
+	*p = toupper(*p);
+	p = strchr(p+1, '.');
+	if (p == NULL) break;
+	++p;
+	if (*p == '\0') break;
+    }
+    return rclass;
+}
+
+static gboolean read_int(XrmDatabase db, char *rname, int *value)
+{
+    gboolean ret = FALSE;
+    char *rclass = create_class_name(rname);
+    char *rettype, *end;
+    XrmValue retvalue;
+  
+    if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
+	retvalue.addr != NULL) {
+	*value = (int)strtol(retvalue.addr, &end, 10);
+	if (end != retvalue.addr)
+	    ret = TRUE;
+    }
+
+    g_free(rclass);
+    return ret;
+}
+
+static gboolean read_string(XrmDatabase db, char *rname, char **value)
+{
+    gboolean ret = FALSE;
+    char *rclass = create_class_name(rname);
+    char *rettype;
+    XrmValue retvalue;
+  
+    if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
+	retvalue.addr != NULL) {
+	*value = g_strdup(retvalue.addr);
+	ret = TRUE;
+    }
+
+    g_free(rclass);
+    return ret;
+}
+
+static gboolean read_color(XrmDatabase db, char *rname, color_rgb **value)
+{
+    gboolean ret = FALSE;
+    char *rclass = create_class_name(rname);
+    char *rettype;
+    XrmValue retvalue;
+  
+    if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
+	retvalue.addr != NULL) {
+	color_rgb *c = color_parse(retvalue.addr);
+	if (c != NULL) {
+	    *value = c;
+	    ret = TRUE;
+	}
+    }
+
+    g_free(rclass);
+    return ret;
+}
+
+static gboolean read_mask(XrmDatabase db, char *rname, char *theme,
+                          pixmap_mask **value)
+{
+    gboolean ret = FALSE;
+    char *rclass = create_class_name(rname);
+    char *rettype;
+    char *s;
+    char *button_dir;
+    XrmValue retvalue;
+    int hx, hy; /* ignored */
+    unsigned int w, h;
+    unsigned char *b;
+  
+    if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
+        retvalue.addr != NULL) {
+
+	button_dir = g_strdup_printf("%s_buttons", theme);
+
+        s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
+                             button_dir, retvalue.addr, NULL);
+
+        if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
+            ret = TRUE;
+        else {
+            g_free(s);
+            s = g_build_filename(THEMEDIR, button_dir, retvalue.addr, NULL);
+	
+            if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) 
+                ret = TRUE;
+            else {
+                char *themename;
+
+                g_free(s);
+                themename = g_path_get_basename(theme);
+                s = g_strdup_printf("%s/%s_buttons/%s", theme,
+                                    themename, retvalue.addr);
+                g_free(themename);
+                if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
+                    BitmapSuccess) 
+                    ret = TRUE;
+                else
+                    g_message("Unable to find bitmap '%s'", retvalue.addr);
+            }
+        }
+
+        if (ret) {
+            *value = pixmap_mask_new(w, h, (char*)b);
+            XFree(b);
+        }
+      
+        g_free(s);
+        g_free(button_dir);
+    }
+
+    g_free(rclass);
+    return ret;
+}
+
+static void parse_appearance(char *tex, SurfaceColorType *grad,
+                             ReliefType *relief, BevelType *bevel,
+                             gboolean *interlaced, gboolean *border)
+{
+    char *t;
+
+    /* convert to all lowercase */
+    for (t = tex; *t != '\0'; ++t)
+	*t = g_ascii_tolower(*t);
+
+    if (strstr(tex, "parentrelative") != NULL) {
+	*grad = Background_ParentRelative;
+    } else {
+	if (strstr(tex, "gradient") != NULL) {
+	    if (strstr(tex, "crossdiagonal") != NULL)
+		*grad = Background_CrossDiagonal;
+	    else if (strstr(tex, "rectangle") != NULL)
+		*grad = Background_Rectangle;
+	    else if (strstr(tex, "pyramid") != NULL)
+		*grad = Background_Pyramid;
+	    else if (strstr(tex, "pipecross") != NULL)
+		*grad = Background_PipeCross;
+	    else if (strstr(tex, "elliptic") != NULL)
+		*grad = Background_Elliptic;
+	    else if (strstr(tex, "horizontal") != NULL)
+		*grad = Background_Horizontal;
+	    else if (strstr(tex, "vertical") != NULL)
+		*grad = Background_Vertical;
+	    else
+		*grad = Background_Diagonal;
+	} else {
+	    *grad = Background_Solid;
+	}
+
+	if (strstr(tex, "sunken") != NULL)
+	    *relief = Sunken;
+	else if (strstr(tex, "flat") != NULL)
+	    *relief = Flat;
+	else
+	    *relief = Raised;
+	
+	*border = FALSE;
+	if (*relief == Flat) {
+	    if (strstr(tex, "border") != NULL)
+		*border = TRUE;
+	} else {
+	    if (strstr(tex, "bevel2") != NULL)
+		*bevel = Bevel2;
+	    else
+		*bevel = Bevel1;
+	}
+
+	if (strstr(tex, "interlaced") != NULL)
+	    *interlaced = TRUE;
+	else
+	    *interlaced = FALSE;
+    }
+}
+
+
+static gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value)
+{
+    gboolean ret = FALSE;
+    char *rclass = create_class_name(rname), *cname, *ctoname, *bcname;
+    char *rettype;
+    XrmValue retvalue;
+
+    cname = g_strconcat(rname, ".color", NULL);
+    ctoname = g_strconcat(rname, ".colorTo", NULL);
+    bcname = g_strconcat(rname, ".borderColor", NULL);
+
+    if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
+	retvalue.addr != NULL) {
+	parse_appearance(retvalue.addr,
+			 &value->surface.data.planar.grad,
+			 &value->surface.data.planar.relief,
+			 &value->surface.data.planar.bevel,
+			 &value->surface.data.planar.interlaced,
+			 &value->surface.data.planar.border);
+	if (!read_color(db, cname, &value->surface.data.planar.primary))
+	    value->surface.data.planar.primary = color_new(0, 0, 0);
+	if (!read_color(db, ctoname, &value->surface.data.planar.secondary))
+	    value->surface.data.planar.secondary = color_new(0, 0, 0);
+	if (value->surface.data.planar.border)
+	    if (!read_color(db, bcname,
+			    &value->surface.data.planar.border_color))
+		value->surface.data.planar.border_color = color_new(0, 0, 0);
+	ret = TRUE;
+    }
+
+    g_free(bcname);
+    g_free(ctoname);
+    g_free(cname);
+    g_free(rclass);
+    return ret;
+}
+
+static void set_default_appearance(Appearance *a)
+{
+    a->surface.data.planar.grad = Background_Solid;
+    a->surface.data.planar.relief = Flat;
+    a->surface.data.planar.bevel = Bevel1;
+    a->surface.data.planar.interlaced = FALSE;
+    a->surface.data.planar.border = FALSE;
+    a->surface.data.planar.primary = color_new(0, 0, 0);
+    a->surface.data.planar.secondary = color_new(0, 0, 0);
+}
+
+char *theme_load(char *theme)
+{
+    XrmDatabase db = NULL;
+    char *loaded = NULL;
+    Justify winjust;
+    char *winjust_str;
+    char *winfont_str;
+
+    if (theme) {
+	db = loaddb(theme);
+        if (db == NULL) {
+	    g_warning("Failed to load the theme '%s'", theme);
+	    g_message("Falling back to the default: '%s'", DEFAULT_THEME);
+	} else
+            loaded = g_strdup(theme);
+    }
+    if (db == NULL) {
+	db = loaddb(DEFAULT_THEME);
+	if (db == NULL) {
+	    g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
+	    return NULL;
+	} else
+            loaded = g_strdup(DEFAULT_THEME);
+    }
+
+    /* load the font stuff */
+    winfont_str = "arial-8:bold";
+    theme_winfont_shadow = FALSE;
+    theme_winfont_shadow_offset = 1;
+    theme_winfont_shadow_tint = 25;
+
+    theme_winfont = font_open(winfont_str);
+    theme_winfont_height = font_height(theme_winfont, theme_winfont_shadow,
+                                      theme_winfont_shadow_offset);
+
+    winjust = Justify_Left;
+    if (read_string(db, "window.justify", &winjust_str)) {
+        if (!g_ascii_strcasecmp(winjust_str, "right"))
+            winjust = Justify_Right;
+        else if (!g_ascii_strcasecmp(winjust_str, "center"))
+            winjust = Justify_Center;
+        g_free(winjust_str);
+    }
+
+    /* load the title layout */
+    theme_title_layout = g_strdup("NLIMC");
+
+    if (!read_int(db, "handleWidth", &theme_handle_height) ||
+	theme_handle_height < 0 || theme_handle_height > 100)
+        theme_handle_height = 6;
+    if (!read_int(db, "bevelWidth", &theme_bevel) ||
+	theme_bevel <= 0 || theme_bevel > 100) theme_bevel = 3;
+    if (!read_int(db, "borderWidth", &theme_bwidth) ||
+	theme_bwidth < 0 || theme_bwidth > 100) theme_bwidth = 1;
+    if (!read_int(db, "frameWidth", &theme_cbwidth) ||
+	theme_cbwidth < 0 || theme_cbwidth > 100) theme_cbwidth = theme_bevel;
+
+    if (!read_color(db, "borderColor", &theme_b_color))
+	theme_b_color = color_new(0, 0, 0);
+    if (!read_color(db, "window.frame.focusColor", &theme_cb_focused_color))
+	theme_cb_focused_color = color_new(0xff, 0xff, 0xff);
+    if (!read_color(db, "window.frame.unfocusColor", &theme_cb_unfocused_color))
+	theme_cb_unfocused_color = color_new(0xff, 0xff, 0xff);
+    if (!read_color(db, "window.label.focus.textColor",
+                    &theme_title_focused_color))
+	theme_title_focused_color = color_new(0x0, 0x0, 0x0);
+    if (!read_color(db, "window.label.unfocus.textColor",
+                    &theme_title_unfocused_color))
+	theme_title_unfocused_color = color_new(0xff, 0xff, 0xff);
+    if (!read_color(db, "window.button.focus.picColor",
+                    &theme_titlebut_focused_color))
+	theme_titlebut_focused_color = color_new(0, 0, 0);
+    if (!read_color(db, "window.button.unfocus.picColor",
+                    &theme_titlebut_unfocused_color))
+	theme_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff);
+
+    if (read_mask(db, "window.button.max.mask", theme, &theme_max_unset_mask)){
+        if (!read_mask(db, "window.button.max.toggled.mask", theme,
+                       &theme_max_set_mask)) {
+            theme_max_set_mask = pixmap_mask_copy(theme_max_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+            theme_max_unset_mask = pixmap_mask_new(7, 7, data);
+        }
+        {
+            char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+            theme_max_set_mask = pixmap_mask_new(7, 7, data);
+        }
+    }
+
+    if (!read_mask(db, "window.button.icon.mask", theme,
+                   &theme_iconify_mask)) {
+        char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+        theme_iconify_mask = pixmap_mask_new(7, 7, data);
+    }
+
+    if (read_mask(db, "window.button.stick.mask", theme,
+                   &theme_desk_unset_mask)) {
+        if (!read_mask(db, "window.button.stick.toggled.mask", theme,
+                       &theme_desk_set_mask)) {
+            theme_desk_set_mask =
+                pixmap_mask_copy(theme_desk_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+            theme_desk_unset_mask = pixmap_mask_new(7, 7, data);
+        }
+        {
+            char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+            theme_desk_set_mask = pixmap_mask_new(7, 7, data);
+        }
+    }
+
+    if (read_mask(db, "window.button.shade.mask", theme,
+                   &theme_shade_unset_mask)) {
+        if (!read_mask(db, "window.button.shade.toggled.mask", theme,
+                       &theme_shade_set_mask)) {
+            theme_shade_set_mask =
+                pixmap_mask_copy(theme_shade_unset_mask);
+        }
+    } else {
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+            theme_shade_unset_mask = pixmap_mask_new(7, 7, data);
+        }
+        {
+            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
+            theme_shade_set_mask = pixmap_mask_new(7, 7, data);
+        }
+    }
+
+    if (!read_mask(db, "window.button.close.mask", theme,
+                   &theme_close_mask)) {
+        char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+        theme_close_mask = pixmap_mask_new(7, 7, data);
+    }        
+
+    /* read the decoration textures */
+    if (!read_appearance(db, "window.title.focus", theme_a_focused_title))
+	set_default_appearance(theme_a_focused_title);
+    if (!read_appearance(db, "window.title.unfocus", theme_a_unfocused_title))
+	set_default_appearance(theme_a_unfocused_title);
+    if (!read_appearance(db, "window.label.focus", theme_a_focused_label))
+	set_default_appearance(theme_a_focused_label);
+    if (!read_appearance(db, "window.label.unfocus", theme_a_unfocused_label))
+	set_default_appearance(theme_a_unfocused_label);
+    if (!read_appearance(db, "window.handle.focus", theme_a_focused_handle))
+	set_default_appearance(theme_a_focused_handle);
+    if (!read_appearance(db, "window.handle.unfocus", theme_a_unfocused_handle))
+	set_default_appearance(theme_a_unfocused_handle);
+    if (!read_appearance(db, "window.grip.focus", theme_a_focused_grip))
+	set_default_appearance(theme_a_focused_grip);
+    if (!read_appearance(db, "window.grip.unfocus", theme_a_unfocused_grip))
+	set_default_appearance(theme_a_unfocused_grip);
+
+    /* read the appearances for rendering non-decorations. these cannot be
+       parent-relative */
+    if (theme_a_focused_label->surface.data.planar.grad !=
+        Background_ParentRelative) {
+        if (!read_appearance(db, "window.label.focus", theme_app_hilite_label))
+            set_default_appearance(theme_app_hilite_label);
+    } else {
+        if (!read_appearance(db, "window.title.focus", theme_app_hilite_label))
+            set_default_appearance(theme_app_hilite_label);
+    }
+    if (theme_a_unfocused_label->surface.data.planar.grad !=
+        Background_ParentRelative) {
+        if (!read_appearance(db, "window.label.unfocus",
+                             theme_app_unhilite_label))
+            set_default_appearance(theme_app_unhilite_label);
+    } else {
+        if (!read_appearance(db, "window.title.unfocus",
+                             theme_app_unhilite_label))
+            set_default_appearance(theme_app_unhilite_label);
+    }
+
+    /* read buttons textures */
+    if (!read_appearance(db, "window.button.pressed.focus",
+			 theme_a_focused_pressed_max))
+	if (!read_appearance(db, "window.button.pressed",
+                             theme_a_focused_pressed_max))
+	    set_default_appearance(theme_a_focused_pressed_max);
+    if (!read_appearance(db, "window.button.pressed.unfocus",
+			 theme_a_unfocused_pressed_max))
+	if (!read_appearance(db, "window.button.pressed",
+			     theme_a_unfocused_pressed_max))
+	    set_default_appearance(theme_a_unfocused_pressed_max);
+    if (!read_appearance(db, "window.button.focus",
+			 theme_a_focused_unpressed_max))
+	set_default_appearance(theme_a_focused_unpressed_max);
+    if (!read_appearance(db, "window.button.unfocus",
+			 theme_a_unfocused_unpressed_max))
+	set_default_appearance(theme_a_unfocused_unpressed_max);
+
+    theme_a_unfocused_unpressed_close =
+        appearance_copy(theme_a_unfocused_unpressed_max);
+    theme_a_unfocused_pressed_close =
+        appearance_copy(theme_a_unfocused_pressed_max);
+    theme_a_focused_unpressed_close =
+        appearance_copy(theme_a_focused_unpressed_max);
+    theme_a_focused_pressed_close =
+        appearance_copy(theme_a_focused_pressed_max);
+    theme_a_unfocused_unpressed_desk =
+        appearance_copy(theme_a_unfocused_unpressed_max);
+    theme_a_unfocused_pressed_desk =
+        appearance_copy(theme_a_unfocused_pressed_max);
+    theme_a_unfocused_pressed_set_desk =
+        appearance_copy(theme_a_unfocused_pressed_max);
+    theme_a_focused_unpressed_desk =
+        appearance_copy(theme_a_focused_unpressed_max);
+    theme_a_focused_pressed_desk =
+        appearance_copy(theme_a_focused_pressed_max);
+    theme_a_focused_pressed_set_desk =
+        appearance_copy(theme_a_focused_pressed_max);
+    theme_a_unfocused_unpressed_shade =
+        appearance_copy(theme_a_unfocused_unpressed_max);
+    theme_a_unfocused_pressed_shade =
+        appearance_copy(theme_a_unfocused_pressed_max);
+    theme_a_unfocused_pressed_set_shade =
+        appearance_copy(theme_a_unfocused_pressed_max);
+    theme_a_focused_unpressed_shade =
+        appearance_copy(theme_a_focused_unpressed_max);
+    theme_a_focused_pressed_shade =
+        appearance_copy(theme_a_focused_pressed_max);
+    theme_a_focused_pressed_set_shade =
+        appearance_copy(theme_a_focused_pressed_max);
+    theme_a_unfocused_unpressed_iconify =
+        appearance_copy(theme_a_unfocused_unpressed_max);
+    theme_a_unfocused_pressed_iconify =
+        appearance_copy(theme_a_unfocused_pressed_max);
+    theme_a_focused_unpressed_iconify =
+        appearance_copy(theme_a_focused_unpressed_max);
+    theme_a_focused_pressed_iconify =
+        appearance_copy(theme_a_focused_pressed_max);
+    theme_a_unfocused_pressed_set_max =
+        appearance_copy(theme_a_unfocused_pressed_max);
+    theme_a_focused_pressed_set_max =
+        appearance_copy(theme_a_focused_pressed_max);
+
+    theme_a_icon->surface.data.planar.grad = Background_ParentRelative;
+
+    /* set up the textures */
+    theme_a_focused_label->texture[0].type = 
+        theme_app_hilite_label->texture[0].type = Text;
+    theme_a_focused_label->texture[0].data.text.justify =
+        theme_app_hilite_label->texture[0].data.text.justify = winjust;
+    theme_a_focused_label->texture[0].data.text.font =
+        theme_app_hilite_label->texture[0].data.text.font = theme_winfont;
+    theme_a_focused_label->texture[0].data.text.shadow =
+        theme_app_hilite_label->texture[0].data.text.shadow =
+        theme_winfont_shadow;
+    theme_a_focused_label->texture[0].data.text.offset =
+        theme_app_hilite_label->texture[0].data.text.offset =
+        theme_winfont_shadow_offset;
+    theme_a_focused_label->texture[0].data.text.tint =
+        theme_app_hilite_label->texture[0].data.text.tint =
+        theme_winfont_shadow_tint;
+    theme_a_focused_label->texture[0].data.text.color =
+        theme_app_hilite_label->texture[0].data.text.color =
+        theme_title_focused_color;
+
+    theme_a_unfocused_label->texture[0].type =
+        theme_app_unhilite_label->texture[0].type = Text;
+    theme_a_unfocused_label->texture[0].data.text.justify =
+        theme_app_unhilite_label->texture[0].data.text.justify = winjust;
+    theme_a_unfocused_label->texture[0].data.text.font =
+        theme_app_unhilite_label->texture[0].data.text.font = theme_winfont;
+    theme_a_unfocused_label->texture[0].data.text.shadow =
+        theme_app_unhilite_label->texture[0].data.text.shadow =
+        theme_winfont_shadow;
+    theme_a_unfocused_label->texture[0].data.text.offset =
+        theme_app_unhilite_label->texture[0].data.text.offset =
+        theme_winfont_shadow_offset;
+    theme_a_unfocused_label->texture[0].data.text.tint =
+        theme_app_unhilite_label->texture[0].data.text.tint =
+        theme_winfont_shadow_tint;
+    theme_a_unfocused_label->texture[0].data.text.color =
+        theme_app_unhilite_label->texture[0].data.text.color =
+        theme_title_unfocused_color;
+
+    theme_a_focused_unpressed_max->texture[0].type = 
+        theme_a_focused_pressed_max->texture[0].type = 
+        theme_a_focused_pressed_set_max->texture[0].type =  
+        theme_a_unfocused_unpressed_max->texture[0].type = 
+        theme_a_unfocused_pressed_max->texture[0].type = 
+        theme_a_unfocused_pressed_set_max->texture[0].type = 
+        theme_a_focused_unpressed_close->texture[0].type = 
+        theme_a_focused_pressed_close->texture[0].type = 
+        theme_a_unfocused_unpressed_close->texture[0].type = 
+        theme_a_unfocused_pressed_close->texture[0].type = 
+        theme_a_focused_unpressed_desk->texture[0].type = 
+        theme_a_focused_pressed_desk->texture[0].type = 
+        theme_a_focused_pressed_set_desk->texture[0].type = 
+        theme_a_unfocused_unpressed_desk->texture[0].type = 
+        theme_a_unfocused_pressed_desk->texture[0].type = 
+        theme_a_unfocused_pressed_set_desk->texture[0].type = 
+        theme_a_focused_unpressed_shade->texture[0].type = 
+        theme_a_focused_pressed_shade->texture[0].type = 
+        theme_a_focused_pressed_set_shade->texture[0].type = 
+        theme_a_unfocused_unpressed_shade->texture[0].type = 
+        theme_a_unfocused_pressed_shade->texture[0].type = 
+        theme_a_unfocused_pressed_set_shade->texture[0].type = 
+        theme_a_focused_unpressed_iconify->texture[0].type = 
+        theme_a_focused_pressed_iconify->texture[0].type = 
+        theme_a_unfocused_unpressed_iconify->texture[0].type = 
+        theme_a_unfocused_pressed_iconify->texture[0].type = Bitmask;
+    theme_a_focused_unpressed_max->texture[0].data.mask.mask = 
+        theme_a_unfocused_unpressed_max->texture[0].data.mask.mask = 
+        theme_a_focused_pressed_max->texture[0].data.mask.mask = 
+        theme_a_unfocused_pressed_max->texture[0].data.mask.mask =
+        theme_max_unset_mask;
+    theme_a_focused_pressed_set_max->texture[0].data.mask.mask = 
+        theme_a_unfocused_pressed_set_max->texture[0].data.mask.mask =
+        theme_max_set_mask;
+    theme_a_focused_pressed_close->texture[0].data.mask.mask = 
+        theme_a_unfocused_pressed_close->texture[0].data.mask.mask =
+        theme_a_focused_unpressed_close->texture[0].data.mask.mask = 
+        theme_a_unfocused_unpressed_close->texture[0].data.mask.mask =
+        theme_close_mask;
+    theme_a_focused_unpressed_desk->texture[0].data.mask.mask = 
+        theme_a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
+        theme_a_focused_pressed_desk->texture[0].data.mask.mask = 
+        theme_a_unfocused_pressed_desk->texture[0].data.mask.mask =
+        theme_desk_unset_mask;
+    theme_a_focused_pressed_set_desk->texture[0].data.mask.mask = 
+        theme_a_unfocused_pressed_set_desk->texture[0].data.mask.mask =
+        theme_desk_set_mask;
+    theme_a_focused_unpressed_shade->texture[0].data.mask.mask = 
+        theme_a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
+        theme_a_focused_pressed_shade->texture[0].data.mask.mask = 
+        theme_a_unfocused_pressed_shade->texture[0].data.mask.mask =
+        theme_shade_unset_mask;
+    theme_a_focused_pressed_set_shade->texture[0].data.mask.mask = 
+        theme_a_unfocused_pressed_set_shade->texture[0].data.mask.mask =
+        theme_shade_set_mask;
+    theme_a_focused_unpressed_iconify->texture[0].data.mask.mask = 
+        theme_a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
+        theme_a_focused_pressed_iconify->texture[0].data.mask.mask = 
+        theme_a_unfocused_pressed_iconify->texture[0].data.mask.mask =
+        theme_iconify_mask;
+    theme_a_focused_unpressed_max->texture[0].data.mask.color = 
+        theme_a_focused_pressed_max->texture[0].data.mask.color = 
+        theme_a_focused_pressed_set_max->texture[0].data.mask.color = 
+        theme_a_focused_unpressed_close->texture[0].data.mask.color = 
+        theme_a_focused_pressed_close->texture[0].data.mask.color = 
+        theme_a_focused_unpressed_desk->texture[0].data.mask.color = 
+        theme_a_focused_pressed_desk->texture[0].data.mask.color = 
+        theme_a_focused_pressed_set_desk->texture[0].data.mask.color = 
+        theme_a_focused_unpressed_shade->texture[0].data.mask.color = 
+        theme_a_focused_pressed_shade->texture[0].data.mask.color = 
+        theme_a_focused_pressed_set_shade->texture[0].data.mask.color = 
+        theme_a_focused_unpressed_iconify->texture[0].data.mask.color = 
+        theme_a_focused_pressed_iconify->texture[0].data.mask.color =
+        theme_titlebut_focused_color;
+    theme_a_unfocused_unpressed_max->texture[0].data.mask.color = 
+        theme_a_unfocused_pressed_max->texture[0].data.mask.color = 
+        theme_a_unfocused_pressed_set_max->texture[0].data.mask.color = 
+        theme_a_unfocused_unpressed_close->texture[0].data.mask.color = 
+        theme_a_unfocused_pressed_close->texture[0].data.mask.color = 
+        theme_a_unfocused_unpressed_desk->texture[0].data.mask.color = 
+        theme_a_unfocused_pressed_desk->texture[0].data.mask.color = 
+        theme_a_unfocused_pressed_set_desk->texture[0].data.mask.color = 
+        theme_a_unfocused_unpressed_shade->texture[0].data.mask.color = 
+        theme_a_unfocused_pressed_shade->texture[0].data.mask.color = 
+        theme_a_unfocused_pressed_set_shade->texture[0].data.mask.color = 
+        theme_a_unfocused_unpressed_iconify->texture[0].data.mask.color = 
+        theme_a_unfocused_pressed_iconify->texture[0].data.mask.color =
+        theme_titlebut_unfocused_color;
+
+    XrmDestroyDatabase(db);
+
+    return loaded;
+}
diff --git a/render/theme.h b/render/theme.h
new file mode 100644
index 00000000..5d5bac10
--- /dev/null
+++ b/render/theme.h
@@ -0,0 +1,84 @@
+#ifndef __theme_h
+#define __theme_h
+
+#include "render.h"
+#include "color.h"
+#include "font.h"
+#include "mask.h"
+
+extern int theme_bevel;
+extern int theme_handle_height;
+extern int theme_bwidth;
+extern int theme_cbwidth;
+
+#define theme_label_height (theme_winfont_height + 2)
+#define theme_title_height (theme_label_height + theme_bevel * 2)
+#define theme_button_size  (theme_label_height - 2)
+#define theme_grip_width   (theme_button_size * 2)
+
+extern color_rgb *theme_b_color;
+extern color_rgb *theme_cb_focused_color;
+extern color_rgb *theme_cb_unfocused_color;
+extern color_rgb *theme_title_focused_color;
+extern color_rgb *theme_title_unfocused_color;
+extern color_rgb *theme_titlebut_focused_color;
+extern color_rgb *theme_titlebut_unfocused_color;
+
+extern int theme_winfont_height;
+extern ObFont *theme_winfont;
+extern char *theme_title_layout;
+
+extern pixmap_mask *theme_max_set_mask;
+extern pixmap_mask *theme_max_unset_mask;
+extern pixmap_mask *theme_iconify_mask;
+extern pixmap_mask *theme_desk_set_mask;
+extern pixmap_mask *theme_desk_unset_mask;
+extern pixmap_mask *theme_shade_set_mask;
+extern pixmap_mask *theme_shade_unset_mask;
+extern pixmap_mask *theme_close_mask;
+
+extern Appearance *theme_a_focused_unpressed_max;
+extern Appearance *theme_a_focused_pressed_max;
+extern Appearance *theme_a_focused_pressed_set_max;
+extern Appearance *theme_a_unfocused_unpressed_max;
+extern Appearance *theme_a_unfocused_pressed_max;
+extern Appearance *theme_a_unfocused_pressed_set_max;
+extern Appearance *theme_a_focused_unpressed_close;
+extern Appearance *theme_a_focused_pressed_close;
+extern Appearance *theme_a_unfocused_unpressed_close;
+extern Appearance *theme_a_unfocused_pressed_close;
+extern Appearance *theme_a_focused_unpressed_desk;
+extern Appearance *theme_a_focused_pressed_desk;
+extern Appearance *theme_a_focused_pressed_set_desk;
+extern Appearance *theme_a_unfocused_unpressed_desk;
+extern Appearance *theme_a_unfocused_pressed_desk;
+extern Appearance *theme_a_unfocused_pressed_set_desk;
+extern Appearance *theme_a_focused_unpressed_shade;
+extern Appearance *theme_a_focused_pressed_shade;
+extern Appearance *theme_a_focused_pressed_set_shade;
+extern Appearance *theme_a_unfocused_unpressed_shade;
+extern Appearance *theme_a_unfocused_pressed_shade;
+extern Appearance *theme_a_unfocused_pressed_set_shade;
+extern Appearance *theme_a_focused_unpressed_iconify;
+extern Appearance *theme_a_focused_pressed_iconify;
+extern Appearance *theme_a_unfocused_unpressed_iconify;
+extern Appearance *theme_a_unfocused_pressed_iconify;
+extern Appearance *theme_a_focused_grip;
+extern Appearance *theme_a_unfocused_grip;
+extern Appearance *theme_a_focused_title;
+extern Appearance *theme_a_unfocused_title;
+extern Appearance *theme_a_focused_label;
+extern Appearance *theme_a_unfocused_label;
+extern Appearance *theme_a_icon;
+extern Appearance *theme_a_focused_handle;
+extern Appearance *theme_a_unfocused_handle;
+
+extern Appearance *theme_app_hilite_label;
+extern Appearance *theme_app_unhilite_label;
+
+void theme_startup();
+void theme_shutdown();
+
+char *theme_load(char *theme);
+
+#endif