#include "obengine.h"
-#include "../../kernel/config.h"
-#include "../../kernel/openbox.h"
+#include "kernel/openbox.h"
+#include "kernel/engine.h"
#include <glib.h>
#include <X11/Xlib.h>
int hx, hy; /* ignored */
unsigned int w, h;
unsigned char *b;
- ConfigValue theme;
if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
retvalue.addr != NULL) {
- if (!config_get("theme", Config_String, &theme))
- g_assert_not_reached(); /* where's the default!? its not set? */
- button_dir = g_strdup_printf("%s_buttons", theme.string);
+ button_dir = g_strdup_printf("%s_buttons", engine_theme);
s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
"openbox", button_dir, retvalue.addr, NULL);
char *themename;
g_free(s);
- themename = g_path_get_basename(theme.string);
- s = g_strdup_printf("%s_buttons/%s", theme.string,
+ themename = g_path_get_basename(engine_theme);
+ s = g_strdup_printf("%s_buttons/%s", engine_theme,
themename);
g_free(themename);
if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) ==
XrmDatabase db = NULL;
Justify winjust;
char *winjuststr;
- ConfigValue theme, shadow, offset, font;
- if (config_get("theme", Config_String, &theme)) {
- db = loaddb(theme.string);
+ if (engine_theme) {
+ db = loaddb(engine_theme);
if (db == NULL) {
- g_warning("Failed to load the theme '%s'", theme.string);
+ g_warning("Failed to load the theme '%s'", engine_theme);
g_message("Falling back to the default: '%s'", DEFAULT_THEME);
}
}
g_warning("Failed to load the theme '%s'.", DEFAULT_THEME);
return FALSE;
}
- /* change to reflect what was actually loaded */
- theme.string = DEFAULT_THEME;
- config_set("theme", Config_String, theme);
+ /* set it to what was loaded */
+ g_free(engine_theme);
+ engine_theme = g_strdup(DEFAULT_THEME);
}
/* load the font, not from the theme file tho, its in the config */
- if (!config_get("font.shadow", Config_Bool, &shadow)) {
- shadow.bool = TRUE; /* default */
- config_set("font.shadow", Config_Bool, shadow);
- }
- ob_s_winfont_shadow = shadow.bool;
- if (!config_get("font.shadow.offset", Config_Integer, &offset) ||
- offset.integer < 0 || offset.integer >= 10) {
- offset.integer = 1; /* default */
- config_set("font.shadow.offset", Config_Integer, offset);
- }
- ob_s_winfont_shadow_offset = offset.integer;
- if (!config_get("font", Config_String, &font)) {
- font.string = DEFAULT_FONT;
- config_set("font", Config_String, font);
- }
- ob_s_winfont = font_open(font.string);
- ob_s_winfont_height = font_height(ob_s_winfont, ob_s_winfont_shadow,
- ob_s_winfont_shadow_offset);
+ ob_s_winfont = font_open(engine_font);
+ ob_s_winfont_height = font_height(ob_s_winfont, engine_shadow,
+ engine_shadow_offset);
winjust = Justify_Left;
if (read_string(db, "window.justify", &winjuststr)) {
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);
}
} else {
{
- char data[] = { 0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };
- ob_s_max_unset_mask = pixmap_mask_new(6, 6, data);
+ char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+ ob_s_max_unset_mask = pixmap_mask_new(7, 7, data);
}
{
- char data[] = { 0x3c, 0x24, 0x27, 0x3f, 0x0f, 0x0f };
- ob_s_max_set_mask = pixmap_mask_new(6, 6, 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_iconify_mask)) {
- char data[] = { 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f };
- ob_s_iconify_mask = pixmap_mask_new(6, 6, data);
+ 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",
}
} else {
{
- char data[] = { 0x33, 0x33, 0x00, 0x00, 0x33, 0x33 };
- ob_s_desk_unset_mask = pixmap_mask_new(6, 6, data);
+ char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+ ob_s_desk_unset_mask = pixmap_mask_new(7, 7, data);
}
{
- char data[] = { 0x0c, 0x0c, 0x3f, 0x3f, 0x0c, 0x0c };
- ob_s_desk_set_mask = pixmap_mask_new(6, 6, 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.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[] = { 0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };
- ob_s_close_mask = pixmap_mask_new(6, 6, data);
+ char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+ ob_s_close_mask = pixmap_mask_new(7, 7, data);
}
if (!read_appearance(db, "window.title.focus", ob_a_focused_title))
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 =
ob_a_focused_label->texture[0].type = Text;
ob_a_focused_label->texture[0].data.text.justify = winjust;
ob_a_focused_label->texture[0].data.text.font = ob_s_winfont;
- ob_a_focused_label->texture[0].data.text.shadow = ob_s_winfont_shadow;
- ob_a_focused_label->texture[0].data.text.offset =
- ob_s_winfont_shadow_offset;
+ ob_a_focused_label->texture[0].data.text.shadow = engine_shadow;
+ ob_a_focused_label->texture[0].data.text.offset = engine_shadow_offset;
+ ob_a_focused_label->texture[0].data.text.tint = engine_shadow_tint;
ob_a_focused_label->texture[0].data.text.color = ob_s_title_focused_color;
ob_a_unfocused_label->texture[0].type = Text;
ob_a_unfocused_label->texture[0].data.text.justify = winjust;
ob_a_unfocused_label->texture[0].data.text.font = ob_s_winfont;
- ob_a_unfocused_label->texture[0].data.text.shadow = ob_s_winfont_shadow;
- ob_a_unfocused_label->texture[0].data.text.offset =
- ob_s_winfont_shadow_offset;
+ ob_a_unfocused_label->texture[0].data.text.shadow = engine_shadow;
+ ob_a_unfocused_label->texture[0].data.text.offset = engine_shadow_offset;
+ ob_a_unfocused_label->texture[0].data.text.tint = engine_shadow_tint;
ob_a_unfocused_label->texture[0].data.text.color =
ob_s_title_unfocused_color;
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_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_unfocused_unpressed_iconify->texture[0].data.mask.mask =
ob_a_focused_pressed_iconify->texture[0].data.mask.mask =
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_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;
projects / chaz / openbox / blobdiff