diff options
| -rw-r--r-- | data/rc.xml.in | 16 | ||||
| -rw-r--r-- | data/rc.xsd | 10 | ||||
| -rw-r--r-- | openbox/config.c | 21 |
3 files changed, 3 insertions, 44 deletions
diff --git a/data/rc.xml.in b/data/rc.xml.in index e7b4d509..b2b6be23 100644 --- a/data/rc.xml.in +++ b/data/rc.xml.in @@ -48,40 +48,24 @@ <size>7</size> <weight>bold</weight> <slant>normal</slant> - <shadow enabled="yes"> - <offset>1</offset> - <tint>30</tint> - </shadow> </font> <font place="InactiveWindow"> <name>arial,sans</name> <size>7</size> <weight>bold</weight> <slant>normal</slant> - <shadow enabled="yes"> - <offset>1</offset> - <tint>30</tint> - </shadow> </font> <font place="MenuTitle"> <name>arial,sans</name> <size>8</size> <weight>bold</weight> <slant>normal</slant> - <shadow enabled="yes"> - <offset>1</offset> - <tint>30</tint> - </shadow> </font> <font place="MenuItem"> <name>arial,sans</name> <size>8</size> <weight>bold</weight> <slant>normal</slant> - <shadow enabled="yes"> - <offset>1</offset> - <tint>30</tint> - </shadow> </font> </theme> diff --git a/data/rc.xsd b/data/rc.xsd index 7a3dba61..1ca631fc 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -43,6 +43,8 @@ Add movefromedge* actions Sun Mar 4 12:12:19 EST 2007 - danakj(a)orodu.net Add font section to theme section + Sun Mar 4 13:49:37 EST 2007 - danakj(a)orodu.net + Removing font shadows - they are going back into the themerc --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://openbox.org/" @@ -120,16 +122,8 @@ <xs:element minOccurs="0" name="size" type="xs:integer"/> <xs:element minOccurs="0" name="weight" type="ob:fontweight"/> <xs:element minOccurs="0" name="slant" type="ob:fontslant"/> - <xs:element minOccurs="0" name="shadow" type="ob:fontshadow"/> </xs:sequence> </xs:complexType> - <xs:complexType name="fontshadow"> - <xs:sequence> - <xs:element minOccurs="0" name="offset" type="xs:integer"/> - <xs:element minOccurs="0" name="tint" type="xs:integer"/> - </xs:sequence> - <xs:attribute name="enabled" type="ob:bool" use="required"/> - </xs:complexType> <xs:complexType name="desktops"> <xs:annotation> <xs:documentation>defines the number and names of desktops</xs:documentation> diff --git a/openbox/config.c b/openbox/config.c index 8f197df5..5e1ee09a 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -452,9 +452,6 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, gint size = RrDefaultFontSize; RrFontWeight weight = RrDefaultFontWeight; RrFontSlant slant = RrDefaultFontSlant; - gboolean shadow = RrDefaultFontShadow; - gint offset = RrDefaultFontShadowOffset; - gchar tint = RrDefaultFontShadowTint; if (parse_attr_contains("ActiveWindow", n, "place")) font = &config_font_activewindow; @@ -489,24 +486,8 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, slant = RR_FONTSLANT_OBLIQUE; g_free(s); } - if ((fnode = parse_find_node("shadow", n->children))) { - xmlNodePtr snode; - gboolean s; - if (parse_attr_bool("enabled", fnode, &s)) - shadow = s; - - if ((snode = parse_find_node("offset", fnode->children))) - offset = parse_int(doc, snode); - if ((snode = parse_find_node("tint", fnode->children))) { - tint = parse_int(doc, snode); - if (tint > 100) tint = 100; - else if (tint < -100) tint = -100; - } - } - - *font = RrFontOpen(ob_rr_inst, name, size, weight, slant, - shadow, offset, tint); + *font = RrFontOpen(ob_rr_inst, name, size, weight, slant); g_free(name); next_font: n = parse_find_node("font", n->next); |