summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--render/theme.c29
-rw-r--r--render/theme.h3
-rw-r--r--themes/BBstylE/themerc6
-rw-r--r--themes/I-merry/themerc6
-rw-r--r--themes/Light-Industry-big/themerc11
-rw-r--r--themes/Light-Industry/themerc11
-rw-r--r--themes/Om4Ob/openbox-3/themerc6
-rw-r--r--themes/TheBear/openbox-3/themerc6
-rw-r--r--themes/greenz/themerc10
-rw-r--r--themes/planton/themerc12
10 files changed, 55 insertions, 45 deletions
diff --git a/render/theme.c b/render/theme.c
index 6880f008..71770f83 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -87,14 +87,24 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
}
/* load the font stuff */
- if (!read_string(db, "window.title.xftfont", &font_str))
+ if (!read_string(db, "window.focus.font", &font_str))
font_str = "arial,sans:bold:pixelsize=10:shadow=y:shadowtint=50";
- if (!(theme->winfont = RrFontOpen(inst, font_str))) {
+ if (!(theme->winfont_focused = RrFontOpen(inst, font_str))) {
RrThemeFree(theme);
return NULL;
}
- theme->winfont_height = RrFontHeight(theme->winfont);
+ theme->winfont_height = RrFontHeight(theme->winfont_focused);
+
+ if (!read_string(db, "window.unfocus.font", &font_str))
+ /* font_str will already be set to the last one */;
+
+ if (!(theme->winfont_unfocused = RrFontOpen(inst, font_str))) {
+ RrThemeFree(theme);
+ return NULL;
+ }
+ theme->winfont_height = MAX(theme->winfont_height,
+ RrFontHeight(theme->winfont_unfocused));
winjust = RR_JUSTIFY_LEFT;
if (read_string(db, "window.justify", &str)) {
@@ -104,7 +114,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
winjust = RR_JUSTIFY_CENTER;
}
- if (!read_string(db, "menu.title.xftfont", &font_str))
+ if (!read_string(db, "menu.title.font", &font_str))
font_str = "arial,sans:bold:pixelsize=12:shadow=y";
if (!(theme->mtitlefont = RrFontOpen(inst, font_str))) {
@@ -121,7 +131,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
mtitlejust = RR_JUSTIFY_CENTER;
}
- if (!read_string(db, "menu.frame.xftfont", &font_str))
+ if (!read_string(db, "menu.frame.font", &font_str))
font_str = "arial,sans:bold:pixelsize=11:shadow=y";
if (!(theme->mfont = RrFontOpen(inst, font_str))) {
@@ -606,7 +616,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
theme->a_focused_label->texture[0].data.text.justify = winjust;
theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
theme->a_focused_label->texture[0].data.text.font =
- theme->app_hilite_label->texture[0].data.text.font = theme->winfont;
+ theme->app_hilite_label->texture[0].data.text.font =
+ theme->winfont_focused;
theme->a_focused_label->texture[0].data.text.color =
theme->app_hilite_label->texture[0].data.text.color =
theme->title_focused_color;
@@ -616,7 +627,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
theme->a_unfocused_label->texture[0].data.text.justify = winjust;
theme->app_unhilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
theme->a_unfocused_label->texture[0].data.text.font =
- theme->app_unhilite_label->texture[0].data.text.font = theme->winfont;
+ theme->app_unhilite_label->texture[0].data.text.font =
+ theme->winfont_unfocused;
theme->a_unfocused_label->texture[0].data.text.color =
theme->app_unhilite_label->texture[0].data.text.color =
theme->title_unfocused_color;
@@ -886,7 +898,8 @@ void RrThemeFree(RrTheme *theme)
RrPixmapMaskFree(theme->close_pressed_mask);
RrPixmapMaskFree(theme->menu_bullet_mask);
- RrFontClose(theme->winfont);
+ RrFontClose(theme->winfont_focused);
+ RrFontClose(theme->winfont_unfocused);
RrFontClose(theme->mtitlefont);
RrFontClose(theme->mfont);
diff --git a/render/theme.h b/render/theme.h
index e425ae2a..db5eb3aa 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -46,7 +46,8 @@ struct _RrTheme {
/* style settings - fonts */
gint winfont_height;
- RrFont *winfont;
+ RrFont *winfont_focused;
+ RrFont *winfont_unfocused;
gint mtitlefont_height;
RrFont *mtitlefont;
gint mfont_height;
diff --git a/themes/BBstylE/themerc b/themes/BBstylE/themerc
index 99760fc0..3f9bbf78 100644
--- a/themes/BBstylE/themerc
+++ b/themes/BBstylE/themerc
@@ -138,9 +138,9 @@ rootCommand: wmsetbg /win/lin/lefm.png
window.title.layout: ILMC
!! font me!
-window.title.xftfont: Borzoi:pixelsize=10
-menu.frame.xftfont: National First Font:pixelsize=15
-menu.title.xftfont: Borzoi:pixelsize=10
+window.focus.font: Borzoi:pixelsize=10
+menu.frame.font: National First Font:pixelsize=15
+menu.title.font: Borzoi:pixelsize=10
diff --git a/themes/I-merry/themerc b/themes/I-merry/themerc
index 93714732..85833ccc 100644
--- a/themes/I-merry/themerc
+++ b/themes/I-merry/themerc
@@ -128,6 +128,6 @@ frameWidth: 0
!! Miscellaneous settings
borderColor: #222222
!! font me!
-window.title.xftfont: Bitstream Vera Sans:bold:pixelsize=10
-menu.frame.xftfont: National First Font:pixelsize=15
-menu.title.xftfont: Bitstream Vera Sans:bold:pixelsize=10
+window.focus.font: Bitstream Vera Sans:bold:pixelsize=10
+menu.frame.font: National First Font:pixelsize=15
+menu.title.font: Bitstream Vera Sans:bold:pixelsize=10
diff --git a/themes/Light-Industry-big/themerc b/themes/Light-Industry-big/themerc
index fba75041..46b81a23 100644
--- a/themes/Light-Industry-big/themerc
+++ b/themes/Light-Industry-big/themerc
@@ -111,8 +111,9 @@ frameWidth: 0
borderColor: #091d2e
!! font me!
-!window.title.xftfont: Borzoi:pixelsize=9:shadow=y:shadowtint=75
-window.title.xftfont: Bitstream Vera Sans:bold:pixelsize=11:shadow=y:shadowtint=30
-menu.frame.xftfont: National First Font:pixelsize=15
-!menu.title.xftfont: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowtint=75
-menu.title.xftfont: Bitstream Vera Sans:bold:pixelsize=10
+!window.title.font: Borzoi:pixelsize=9:shadow=y:shadowtint=75
+window.focus.font: Bitstream Vera Sans:bold:pixelsize=11:shadow=y:shadowtint=30
+window.unfocus.font: Bitstream Vera Sans:bold:pixelsize=11
+menu.frame.font: National First Font:pixelsize=15
+!menu.title.font: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowtint=75
+menu.title.font: Bitstream Vera Sans:bold:pixelsize=10
diff --git a/themes/Light-Industry/themerc b/themes/Light-Industry/themerc
index 141a3e67..769dd3d2 100644
--- a/themes/Light-Industry/themerc
+++ b/themes/Light-Industry/themerc
@@ -115,8 +115,9 @@ frameWidth: 0
borderColor: #091d2e
!! font me!
-!window.title.xftfont: Borzoi:pixelsize=11
-window.title.xftfont: Bitstream Vera Sans:bold:pixelsize=10
-menu.frame.xftfont: National First Font:pixelsize=15
-!menu.title.xftfont: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowtint=75
-menu.title.xftfont: Bitstream Vera Sans:bold:pixelsize=10
+!window.title.font: Borzoi:pixelsize=11
+window.focus.font: Bitstream Vera Sans:bold:pixelsize=10:shadow=y:shadowoffset=1:shadowtint=75
+window.unfocus.font: Bitstream Vera Sans:bold:pixelsize=10
+menu.frame.font: National First Font:pixelsize=15
+!menu.title.font: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowtint=75
+menu.title.font: Bitstream Vera Sans:bold:pixelsize=10
diff --git a/themes/Om4Ob/openbox-3/themerc b/themes/Om4Ob/openbox-3/themerc
index 5361e3e6..064f93f8 100644
--- a/themes/Om4Ob/openbox-3/themerc
+++ b/themes/Om4Ob/openbox-3/themerc
@@ -1,9 +1,9 @@
style.author: miklos
style.date: Aug 1, 2003
-window.title.xftfont: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
-menu.title.xftfont: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
-menu.frame.xftfont: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
+window.focus.font: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
+menu.title.font: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
+menu.frame.font: arial:pixelsize=10:shadow=y:shadowtint=6:shadowoffset=1
! Menu settings...
diff --git a/themes/TheBear/openbox-3/themerc b/themes/TheBear/openbox-3/themerc
index 8adb78f1..bf7b0f04 100644
--- a/themes/TheBear/openbox-3/themerc
+++ b/themes/TheBear/openbox-3/themerc
@@ -113,6 +113,6 @@ frameWidth: 0
borderColor: #222222
!! font me!
-window.title.xftfont: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowtint=90
-menu.frame.xftfont: National First Font:pixelsize=15
-menu.title.xftfont: Bitstream Vera Sans:bold:pixelsize=10
+window.focus.font: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowtint=90
+menu.frame.font: National First Font:pixelsize=15
+menu.title.font: Bitstream Vera Sans:bold:pixelsize=10
diff --git a/themes/greenz/themerc b/themes/greenz/themerc
index 75bfb595..85dc3dc3 100644
--- a/themes/greenz/themerc
+++ b/themes/greenz/themerc
@@ -113,8 +113,8 @@ borderColor: #091d2e
window.title.layout: NLIMC
!! font me!
-#window.title.xftfont: Borzoi:pixelsize=11
-window.title.xftfont: Bitstream Vera Sans:bold:pixelsize=10
-menu.frame.xftfont: National First Font:pixelsize=15
-#menu.title.xftfont: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowtint=75
-menu.title.xftfont: Bitstream Vera Sans:bold:pixelsize=10
+#window.focus.font: Borzoi:pixelsize=11
+window.focus.font: Bitstream Vera Sans:bold:pixelsize=10
+menu.frame.font: National First Font:pixelsize=15
+#menu.title.font: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowtint=75
+menu.title.font: Bitstream Vera Sans:bold:pixelsize=10
diff --git a/themes/planton/themerc b/themes/planton/themerc
index 7a826c8e..96814bb3 100644
--- a/themes/planton/themerc
+++ b/themes/planton/themerc
@@ -7,12 +7,6 @@ menu.title.colorTo: #39658b
menu.title.borderColor: #000000
menu.title.textColor: #ffffff
menu.title.justify: center
-menu.title.font: -b&h-lucida-medium-r-normal-sans-10-100-75-75-p-58-iso8859-1
-menu.title.xft.font: Microsoft Sans Serif
-menu.title.xft.size: 6
-menu.title.xft.flags: normal
-menu.title.xft.shadow.offset: 1
-menu.title.xft.shadow.tint: 25
menu.frame: raised solid bevel1
menu.frame.color: #f6f6f6
@@ -127,8 +121,8 @@ borderColor: #24272f
#borderColor: #222222
!! font me!
-window.title.xftfont: Borzoi:pixelsize=10
-menu.frame.xftfont: National First Font:pixelsize=15
-menu.title.xftfont: Borzoi:pixelsize=10
+window.focus.font: Borzoi:pixelsize=10
+menu.frame.font: National First Font:pixelsize=15
+menu.title.font: Borzoi:pixelsize=10
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-17 06:54:55 +0000