theme->a_menu_item = RrAppearanceNew(inst, 1);
theme->a_menu_disabled = RrAppearanceNew(inst, 1);
theme->a_menu_hilite = RrAppearanceNew(inst, 1);
+ theme->a_menu_bullet = RrAppearanceNew(inst, 1);
+ theme->a_clear = RrAppearanceNew(inst, 0);
theme->app_hilite_bg = RrAppearanceNew(inst, 0);
theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
if (!read_color(db, inst,
"menu.frame.textColor", &theme->menu_color))
theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+ if (!read_color(db, inst,
+ "menu.bullet.picColor", &theme->menu_color))
+ theme->menu_bullet_color = RrColorNew(inst, 0, 0, 0);
if (!read_color(db, inst,
"menu.frame.disableColor", &theme->menu_disabled_color))
theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
"menu.hilite.textColor", &theme->menu_hilite_color))
theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0);
+
if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) {
+ if (!read_mask(inst, "max_pressed.xbm", theme,
+ &theme->max_pressed_mask)) {
+ theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
+ }
if (!read_mask(inst, "max_toggled.xbm", theme,
&theme->max_toggled_mask)) {
- theme->max_toggled_mask = RrPixmapMaskCopy(theme->max_mask);
+ theme->max_toggled_mask =
+ RrPixmapMaskCopy(theme->max_pressed_mask);
}
if (!read_mask(inst, "max_disabled.xbm", theme,
&theme->max_disabled_mask)) {
}
} else {
{
- char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
- theme->max_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+ theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
}
{
- char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
- theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+ theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
}
+ theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
}
if (read_mask(inst, "iconify.xbm", theme, &theme->iconify_mask)) {
+ if (!read_mask(inst, "iconify_pressed.xbm", theme,
+ &theme->iconify_pressed_mask)) {
+ theme->iconify_pressed_mask =
+ RrPixmapMaskCopy(theme->iconify_mask);
+ }
if (!read_mask(inst, "iconify_disabled.xbm", theme,
&theme->iconify_disabled_mask)) {
theme->iconify_disabled_mask =
}
} else {
{
- char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
- theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+ theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
}
+ theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask);
theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask);
theme->iconify_hover_mask = RrPixmapMaskCopy(theme->iconify_mask);
}
- if (read_mask(inst, "stick.xbm", theme, &theme->desk_mask)) {
- if (!read_mask(inst, "stick_toggled.xbm", theme,
+ if (read_mask(inst, "desk.xbm", theme, &theme->desk_mask)) {
+ if (!read_mask(inst, "desk_pressed.xbm", theme,
+ &theme->desk_pressed_mask)) {
+ theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+ }
+ if (!read_mask(inst, "desk_toggled.xbm", theme,
&theme->desk_toggled_mask)) {
- theme->desk_toggled_mask = RrPixmapMaskCopy(theme->desk_mask);
+ theme->desk_toggled_mask =
+ RrPixmapMaskCopy(theme->desk_pressed_mask);
+ }
+ if (!read_mask(inst, "desk_disabled.xbm", theme,
+ &theme->desk_disabled_mask)) {
+ theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+ }
+ if (!read_mask(inst, "desk_hover.xbm", theme,
+ &theme->desk_hover_mask)) {
+ theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
}
} else {
{
- char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
- theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+ theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
}
{
- char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
- theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+ theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
+ (char*)data);
}
+ theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
+ theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
+ theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
}
if (read_mask(inst, "shade.xbm", theme, &theme->shade_mask)) {
+ if (!read_mask(inst, "shade_pressed.xbm", theme,
+ &theme->shade_pressed_mask)) {
+ theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
+ }
if (!read_mask(inst, "shade_toggled.xbm", theme,
&theme->shade_toggled_mask)) {
- theme->shade_toggled_mask = RrPixmapMaskCopy(theme->shade_mask);
+ theme->shade_toggled_mask =
+ RrPixmapMaskCopy(theme->shade_pressed_mask);
}
if (!read_mask(inst, "shade_disabled.xbm", theme,
&theme->shade_disabled_mask)) {
}
} else {
{
- char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
- theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+ theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
}
{
- char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
- theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
+ theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
+ (char*)data);
}
+ theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
}
if (read_mask(inst, "close.xbm", theme, &theme->close_mask)) {
+ if (!read_mask(inst, "close_pressed.xbm", theme,
+ &theme->close_pressed_mask)) {
+ theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
+ }
if (!read_mask(inst, "close_disabled.xbm", theme,
&theme->close_disabled_mask)) {
theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
}
} else {
{
- char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
- theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data);
+ guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+ theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
}
+ theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
- }
+ }
+
+ if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) {
+ guchar data[] = { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 };
+ theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8, (char*)data);
+ }
/* read the decoration textures */
if (!read_appearance(db, inst,
RrAppearanceCopy(theme->a_focused_pressed_max);
theme->a_icon->surface.grad = RR_SURFACE_PARENTREL;
+ theme->a_clear->surface.grad = RR_SURFACE_PARENTREL;
/* set up the textures */
theme->a_focused_label->texture[0].type =
theme->a_menu_item->surface.grad =
theme->a_menu_disabled->surface.grad =
+ theme->a_menu_bullet->surface.grad =
theme->app_icon->surface.grad = RR_SURFACE_PARENTREL;
theme->a_menu_item->texture[0].type =
theme->menu_disabled_color;
theme->a_menu_hilite->texture[0].data.text.color =
theme->menu_hilite_color;
+ theme->a_menu_bullet->texture[0].data.mask.color =
+ theme->menu_bullet_color;
theme->a_disabled_focused_max->texture[0].type =
theme->a_disabled_unfocused_max->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 = RR_TEXTURE_MASK;
+ theme->a_unfocused_pressed_iconify->texture[0].type =
+ theme->a_menu_bullet->texture[0].type = RR_TEXTURE_MASK;
+
theme->a_disabled_focused_max->texture[0].data.mask.mask =
theme->a_disabled_unfocused_max->texture[0].data.mask.mask =
theme->max_disabled_mask;
theme->a_hover_focused_max->texture[0].data.mask.mask =
theme->a_hover_unfocused_max->texture[0].data.mask.mask =
theme->max_hover_mask;
+ theme->a_focused_pressed_max->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_max->texture[0].data.mask.mask =
+ theme->max_pressed_mask;
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_mask;
theme->a_toggled_focused_max->texture[0].data.mask.mask =
theme->a_toggled_unfocused_max->texture[0].data.mask.mask =
theme->close_hover_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->close_pressed_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_disabled_focused_desk->texture[0].data.mask.mask =
theme->a_hover_focused_desk->texture[0].data.mask.mask =
theme->a_hover_unfocused_desk->texture[0].data.mask.mask =
theme->desk_hover_mask;
+ theme->a_focused_pressed_desk->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_desk->texture[0].data.mask.mask =
+ theme->desk_pressed_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_mask;
theme->a_toggled_focused_desk->texture[0].data.mask.mask =
theme->a_toggled_unfocused_desk->texture[0].data.mask.mask =
- theme->desk_mask;
+ theme->desk_toggled_mask;
theme->a_disabled_focused_shade->texture[0].data.mask.mask =
theme->a_disabled_unfocused_shade->texture[0].data.mask.mask =
theme->shade_disabled_mask;
theme->a_hover_focused_shade->texture[0].data.mask.mask =
theme->a_hover_unfocused_shade->texture[0].data.mask.mask =
theme->shade_hover_mask;
+ theme->a_focused_pressed_shade->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_shade->texture[0].data.mask.mask =
+ theme->shade_pressed_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_mask;
theme->a_toggled_focused_shade->texture[0].data.mask.mask =
theme->a_toggled_unfocused_shade->texture[0].data.mask.mask =
- theme->shade_mask;
+ theme->shade_toggled_mask;
theme->a_disabled_focused_iconify->texture[0].data.mask.mask =
theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask =
theme->iconify_disabled_mask;
theme->a_hover_focused_iconify->texture[0].data.mask.mask =
theme->a_hover_unfocused_iconify->texture[0].data.mask.mask =
theme->iconify_hover_mask;
+ theme->a_focused_pressed_iconify->texture[0].data.mask.mask =
+ theme->a_unfocused_pressed_iconify->texture[0].data.mask.mask =
+ theme->iconify_pressed_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_menu_bullet->texture[0].data.mask.mask =
+ theme->menu_bullet_mask;
theme->a_disabled_focused_max->texture[0].data.mask.color =
theme->a_disabled_focused_close->texture[0].data.mask.color =
theme->a_disabled_focused_desk->texture[0].data.mask.color =
theme->a_unfocused_pressed_shade->texture[0].data.mask.color =
theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
theme->titlebut_unfocused_pressed_color;
+ theme->a_menu_bullet->texture[0].data.mask.color =
+ theme->menu_bullet_color;
XrmDestroyDatabase(db);
RrPixmapMaskFree(theme->max_toggled_mask);
RrPixmapMaskFree(theme->max_disabled_mask);
RrPixmapMaskFree(theme->max_hover_mask);
+ RrPixmapMaskFree(theme->max_pressed_mask);
RrPixmapMaskFree(theme->desk_mask);
RrPixmapMaskFree(theme->desk_toggled_mask);
RrPixmapMaskFree(theme->desk_disabled_mask);
RrPixmapMaskFree(theme->desk_hover_mask);
+ RrPixmapMaskFree(theme->desk_pressed_mask);
RrPixmapMaskFree(theme->shade_mask);
RrPixmapMaskFree(theme->shade_toggled_mask);
RrPixmapMaskFree(theme->shade_disabled_mask);
RrPixmapMaskFree(theme->shade_hover_mask);
+ RrPixmapMaskFree(theme->shade_pressed_mask);
RrPixmapMaskFree(theme->iconify_mask);
RrPixmapMaskFree(theme->iconify_disabled_mask);
RrPixmapMaskFree(theme->iconify_hover_mask);
+ RrPixmapMaskFree(theme->iconify_pressed_mask);
RrPixmapMaskFree(theme->close_mask);
RrPixmapMaskFree(theme->close_disabled_mask);
RrPixmapMaskFree(theme->close_hover_mask);
+ RrPixmapMaskFree(theme->close_pressed_mask);
+ RrPixmapMaskFree(theme->menu_bullet_mask);
RrFontClose(theme->winfont);
RrFontClose(theme->mtitlefont);
RrAppearanceFree(theme->a_menu_item);
RrAppearanceFree(theme->a_menu_disabled);
RrAppearanceFree(theme->a_menu_hilite);
+ RrAppearanceFree(theme->a_clear);
RrAppearanceFree(theme->app_hilite_bg);
RrAppearanceFree(theme->app_unhilite_bg);
RrAppearanceFree(theme->app_hilite_label);
{
XrmDatabase db;
- char *s = g_build_filename(name, "themerc", NULL);
+ char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
+ name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
if (db == NULL) {
- char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- name, "themerc", NULL);
+ char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
}
if (db == NULL) {
- char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
+ char *s = g_build_filename(name, "themerc", NULL);
if ((db = XrmGetFileDatabase(s)))
theme->path = g_path_get_dirname(s);
g_free(s);
unsigned int w, h;
unsigned char *b;
- s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
- theme->name, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
+ s = g_build_filename(theme->path, maskname, NULL);
+ if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess) {
ret = TRUE;
- else {
- g_free(s);
- s = g_build_filename(THEMEDIR, theme->name, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
- ret = TRUE;
- else {
- g_free(s);
- s = g_build_filename(theme->path, maskname, NULL);
- if (XReadBitmapFileData(s, &w, &h, &b, &hx, &hy) == BitmapSuccess)
- ret = TRUE;
- }
- }
-
- if (ret) {
*value = RrPixmapMaskNew(inst, w, h, (char*)b);
XFree(b);
}
-
g_free(s);
return ret;