add a separate font config for onscreendisplays change menutitle in the rc to menuheader fix up the xsd for fonts
Dana Jansens danakj@orodu.net
7 files changed,
45 insertions(+),
12 deletions(-)
M
data/rc.xml.in
→
data/rc.xml.in
@@ -44,26 +44,32 @@ -->
<keepBorder>yes</keepBorder> <hideDisabled>no</hideDisabled> <font place="ActiveWindow"> - <name>arial,sans</name> + <name>sans</name> <size>7</size> <weight>bold</weight> <slant>normal</slant> </font> <font place="InactiveWindow"> - <name>arial,sans</name> + <name>sans</name> <size>7</size> <weight>bold</weight> <slant>normal</slant> </font> - <font place="MenuTitle"> - <name>arial,sans</name> + <font place="MenuHeader"> + <name>sans</name> <size>8</size> <weight>bold</weight> <slant>normal</slant> </font> <font place="MenuItem"> - <name>arial,sans</name> - <size>8</size> + <name>sans</name> + <size>9</size> + <weight>bold</weight> + <slant>normal</slant> + </font> + <font place="OnScreenDisplay"> + <name>sans</name> + <size>9</size> <weight>bold</weight> <slant>normal</slant> </font>
M
data/rc.xsd
→
data/rc.xsd
@@ -47,10 +47,12 @@ Sun Mar 4 13:49:37 EST 2007 - danakj(a)orodu.net
Removing font shadows - they are going back into the themerc Tue Apr 24 18:42:24 UTC 2007 - mikachu(a)openbox.org Removed fourCorners option. - Wed Apr 25 14:02:40 UTC 2007 + Wed Apr 25 14:02:40 UTC 2007 - mikachu(a)openbox.org Fixed values for layer to be above/below, not top/bottom. Add chroot attribute and keybind element to keybind element. Remove xsd:sequence from everywhere, we don't care about order. + Thu Apr 26 09:11:03 EDT 2007 - danakj(a)orodu.net + Add the place attribute for fonts --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://openbox.org/"@@ -117,6 +119,7 @@ <xsd:element minOccurs="0" name="name" type="xsd:string"/>
<xsd:element minOccurs="0" name="size" type="xsd:integer"/> <xsd:element minOccurs="0" name="weight" type="ob:fontweight"/> <xsd:element minOccurs="0" name="slant" type="ob:fontslant"/> + <xsd:attribute name="place" type="ob:fontplace" use="required"/> </xsd:complexType> <xsd:complexType name="desktops"> <xsd:annotation>@@ -331,6 +334,15 @@ <xsd:enumeration value="true"/>
<xsd:enumeration value="false"/> <xsd:enumeration value="on"/> <xsd:enumeration value="off"/> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="fontplace"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="ActiveWindow"/> + <xsd:enumeration value="InactiveWindow"/> + <xsd:enumeration value="MenuHeader"/> + <xsd:enumeration value="MenuItem"/> + <xsd:enumeration value="OnScreenDisplay"/> </xsd:restriction> </xsd:simpleType> <xsd:simpleType name="fontweight">
M
openbox/config.c
→
openbox/config.c
@@ -46,6 +46,7 @@ RrFont *config_font_activewindow;
RrFont *config_font_inactivewindow; RrFont *config_font_menuitem; RrFont *config_font_menutitle; +RrFont *config_font_osd; gint config_desktops_num; GSList *config_desktops_names;@@ -467,10 +468,12 @@ if (parse_attr_contains("ActiveWindow", n, "place"))
font = &config_font_activewindow; else if (parse_attr_contains("InactiveWindow", n, "place")) font = &config_font_inactivewindow; - else if (parse_attr_contains("MenuTitle", n, "place")) + else if (parse_attr_contains("MenuHeader", n, "place")) font = &config_font_menutitle; else if (parse_attr_contains("MenuItem", n, "place")) font = &config_font_menuitem; + else if (parse_attr_contains("OnScreenDisplay", n, "place")) + font = &config_font_osd; else goto next_font;
M
openbox/config.h
→
openbox/config.h
@@ -97,6 +97,8 @@ /*! The font for menu titles */
extern RrFont *config_font_menutitle; /*! The font for menu items */ extern RrFont *config_font_menuitem; +/*! The font for on-screen-displays/popups */ +extern RrFont *config_font_osd; /*! The number of desktops */ extern gint config_desktops_num;
M
openbox/openbox.c
→
openbox/openbox.c
@@ -241,7 +241,8 @@ if ((theme = RrThemeNew(ob_rr_inst, config_theme,
config_font_activewindow, config_font_inactivewindow, config_font_menutitle, - config_font_menuitem))) + config_font_menuitem, + config_font_osd))) { RrThemeFree(ob_rr_theme); ob_rr_theme = theme;
M
render/theme.c
→
render/theme.c
@@ -66,7 +66,8 @@ #define FIND(type, args...) find_##type(&ps, root, args)
RrTheme* RrThemeNew(const RrInstance *inst, gchar *name, RrFont *active_window_font, RrFont *inactive_window_font, - RrFont *menu_title_font, RrFont *menu_item_font) + RrFont *menu_title_font, RrFont *menu_item_font, + RrFont *osd_font) { ParseState ps; xmlNodePtr root;@@ -172,6 +173,12 @@ theme->menu_font = menu_item_font;
RrFontRef(menu_item_font); } else theme->menu_font = RrFontOpenDefault(inst); + + if (osd_font) { + theme->osd_font = osd_font; + RrFontRef(osd_font); + } else + theme->osd_font = RrFontOpenDefault(inst); /* load direct dimensions */ if (!FIND(int, L("menu","overlap"),@@ -771,8 +778,8 @@ theme->osd_hilite_label->texture[0].type = RR_TEXTURE_TEXT;
theme->a_focused_label->texture[0].data.text.justify = winjust; theme->osd_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->a_focused_label->texture[0].data.text.font = - theme->osd_hilite_label->texture[0].data.text.font = theme->win_font_focused; + theme->osd_hilite_label->texture[0].data.text.font = theme->osd_font; theme->a_focused_label->texture[0].data.text.color = theme->title_focused_color; theme->osd_hilite_label->texture[0].data.text.color =
M
render/theme.h
→
render/theme.h
@@ -34,6 +34,7 @@ RrFont *win_font_focused;
RrFont *win_font_unfocused; RrFont *menu_title_font; RrFont *menu_font; + RrFont *osd_font; /* style settings - geometry */ gint paddingx;@@ -226,7 +227,8 @@ /*! The font values are all optional. If a NULL is used for any of them, then
the default font will be used. */ RrTheme* RrThemeNew(const RrInstance *inst, gchar *theme, RrFont *active_window_font, RrFont *inactive_window_font, - RrFont *menu_title_font, RrFont *menu_item_font); + RrFont *menu_title_font, RrFont *menu_item_font, + RrFont *osd_font); void RrThemeFree(RrTheme *theme); G_END_DECLS