add the new font things to our example rc.xml and the xsd stylesheet

diff --git a/data/rc.xml.in b/data/rc.xml.in
index 9a1bf8fccbbf5a6b91a79ab207d4ab592355f96c..e7b4d5098cb1b2085f1fc22476a5b787d6467ca7 100644 (file)
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -43,6 +43,46 @@
   -->
   <keepBorder>yes</keepBorder>
   <hideDisabled>no</hideDisabled>
+  <font place="ActiveWindow">
+    <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="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>
 
 <desktops>

diff --git a/data/rc.xsd b/data/rc.xsd
index b841512f71897e90343e0ec0494b1a60dbad1e7d..7a3dba6144d700fb73b4472fe05b91a7937df7c5 100644 (file)
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -41,6 +41,8 @@
          hack code for great justice
      Tue Oct 31 03:30:26 UTC 2006 - mikachu(a)openbox.org
          Add movefromedge* actions
+     Sun Mar  4 12:12:19 EST 2007 - danakj(a)orodu.net
+         Add font section to theme section
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://openbox.org/"
@@ -109,8 +111,25 @@
             <xs:element minOccurs="0" name="titleNumber" type="ob:bool"/>
             <xs:element minOccurs="0" name="keepBorder" type="ob:bool"/>
             <xs:element minOccurs="0" name="hideDisabled" type="ob:bool"/>
+            <xs:element minOccurs="0" name="font" type="ob:font"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="font">
+        <xs:sequence>
+            <xs:element minOccurs="0" name="name" type="xs:string"/>
+            <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>
@@ -349,6 +368,19 @@
             <xs:enumeration value="off"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="fontweight">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="normal"/>
+            <xs:enumeration value="bold"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="fontslant">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="normal"/>
+            <xs:enumeration value="italic"/>
+            <xs:enumeration value="opaque"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:simpleType name="button">
         <xs:restriction base="xs:string">
             <xs:enumeration value="Left"/>