#include <ctype.h>
#include <string.h>
-static gboolean read_int(XrmDatabase db, gchar *rname, gint *value);
-static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value);
-static gboolean read_color(XrmDatabase db, gchar *rname,
+static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value);
+static gboolean read_string(XrmDatabase db, const gchar *rname,
+ const gchar **value);
+static gboolean read_color(XrmDatabase db, const gchar *rname,
gint *r, gint *g, gint *b);
-static int parse_inline_number(char *p)
+static int parse_inline_number(const char *p)
{
int neg = 1;
int res = 0;
return res;
}
-static gchar *create_class_name(gchar *rname)
+static gchar *create_class_name(const gchar *rname)
{
gchar *rclass = g_strdup(rname);
gchar *p = rclass;
return rclass;
}
-static gboolean read_int(XrmDatabase db, gchar *rname, gint *value)
+static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value)
{
gboolean ret = FALSE;
gchar *rclass = create_class_name(rname);
return ret;
}
-static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value)
+static gboolean read_string(XrmDatabase db, const gchar *rname,
+ const gchar **value)
{
gboolean ret = FALSE;
gchar *rclass = create_class_name(rname);
if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
retvalue.addr != NULL) {
- *value = retvalue.addr;
- g_strstrip(*value);
+ *value = g_strstrip(retvalue.addr);
ret = TRUE;
}
return -1;
}
-static gboolean parse_color(gchar *c, gint *r, gint *g, gint *b)
+static gboolean parse_color(const gchar *c, gint *r, gint *g, gint *b)
{
int dig1, dig2, i, color[3];
int len = strlen(c);
return FALSE;
}
-static gboolean read_color(XrmDatabase db, gchar *rname,
+static gboolean read_color(XrmDatabase db, const gchar *rname,
gint *r, gint *g, gint *b)
{
gboolean ret = FALSE;
{
XrmDatabase db;
int i,j,k;
- gchar *s;
+ const gchar *s;
int ret = 0;
if (argc > 1) {
CONT2("dimensions", "handle", NUM(i));
if (read_int(db, "padding.width", &i)) {
- ATTR2("dimensions", "padding", "horizontal", NUM(i));
- ATTR2("dimensions", "padding", "vertical", NUM(i));
+ ATTR2("dimensions", "padding", "x", NUM(i));
+ ATTR2("dimensions", "padding", "y", NUM(i));
}
if (read_int(db, "borderWidth", &i)) {
}
if (read_int(db, "window.client.padding.width", &i)) {
- ATTR2("window", "clientpadding", "horizontal", NUM(i));
- ATTR2("window", "clientpadding", "vertical", NUM(i));
+ ATTR2("window", "clientpadding", "x", NUM(i));
+ ATTR2("window", "clientpadding", "y", NUM(i));
}
if (read_string(db, "window.label.text.justify", &s)) {
if (read_color(db, "window.active.button.toggled.image.color",
&i, &j, &k))
- COLOR5("window","active","buttons","toggled","image",i,j,k,255);
+ COLOR5("window","active","buttons","toggled-unpressed","image",i,j,k,255);
if (read_color(db, "window.inactive.button.toggled.image.color",
&i, &j, &k))
- COLOR5("window","inactive","buttons","toggled","image",i,j,k,255);
+ COLOR5("window","inactive","buttons","toggled-unpressed","image",i,j,k,255);
if (read_color(db, "menu.title.text.color",
&i, &j, &k))
COLOR3("menu","inactive","primary",i,j,k,255);
if (read_color(db, "menu.items.disabled.text.color",
- &i, &j, &k))
+ &i, &j, &k)) {
COLOR3("menu","disabled","primary",i,j,k,255);
+ COLOR4("menu","activedisabled","text","primary",i,j,k,255);
+ }
if (read_color(db, "menu.items.active.text.color",
&i, &j, &k))
APPEARANCE3("window.inactive.grip.bg", "window", "inactive", "grip");
APPEARANCE2("menu.items.bg", "menu", "entries");
APPEARANCE2("menu.items.active.bg", "menu", "active");
+ APPEARANCE2("menu.items.active.bg", "menu", "activedisabled");
APPEARANCE2("menu.title.bg", "menu", "title");
APPEARANCE4("window.active.button.disabled.bg",
APPEARANCE4("window.inactive.button.pressed.bg",
"window", "inactive", "buttons", "pressed");
APPEARANCE4("window.active.button.toggled.bg",
- "window", "active", "buttons", "toggled");
+ "window", "active", "buttons", "toggled-unpressed");
APPEARANCE4("window.inactive.button.toggled.bg",
- "window", "inactive", "buttons", "toggled");
+ "window", "inactive", "buttons", "toggled-unpressed");
APPEARANCE4("window.active.button.unpressed.bg",
"window", "active", "buttons", "unpressed");
APPEARANCE4("window.inactive.button.unpressed.bg",
{
i = parse_inline_number(p + strlen("shadowtint="));
j = (i > 0 ? 0 : 255);
- i = ABS(i);
+ i = ABS(i*255/100);
COLOR6("window","active","label","text","shadow","primary",
j,j,j,i);
}
{
i = parse_inline_number(p + strlen("shadowtint="));
j = (i > 0 ? 0 : 255);
- i = ABS(i);
+ i = ABS(i*255/100);
COLOR6("window","inactive","label","text","shadow","primary",
j,j,j,i);
}
{
i = parse_inline_number(p + strlen("shadowtint="));
j = (i > 0 ? 0 : 255);
- i = ABS(i);
+ i = ABS(i*255/100);
COLOR5("menu","title","text","shadow","primary",j,j,j,i);
}
}
- if (read_string(db, "menu.items.text.font", &s)) {
+ if (read_string(db, "menu.items.font", &s)) {
char *p;
if (strstr(s, "shadow=y")) {
if ((p = strstr(s, "shadowoffset=")))
ATTR5("menu","active","text","shadow","offset","y",NUM(i));
ATTR4("menu","disabled","shadow","offset","x",NUM(i));
ATTR4("menu","disabled","shadow","offset","y",NUM(i));
+ ATTR5("menu","activedisabled","text","shadow","offset","x",NUM(i));
+ ATTR5("menu","activedisabled","text","shadow","offset","y",NUM(i));
}
if ((p = strstr(s, "shadowtint=")))
{
i = parse_inline_number(p + strlen("shadowtint="));
j = (i > 0 ? 0 : 255);
- i = ABS(i);
+ i = ABS(i*255/100);
COLOR4("menu","inactive","shadow","primary",j,j,j,i);
COLOR5("menu","active","text","shadow","primary",j,j,j,i);
COLOR4("menu","disabled","shadow","primary",j,j,j,i);
+ COLOR5("menu","activedisabled","text","shadow","primary",j,j,j,i);
}
}