Merge branch 'backport' into work

[dana/openbox.git] / data / rc.xsd

diff --git a/data/rc.xsd b/data/rc.xsd
index 4b7d88d..de227ea 100644 (file)
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -175,6 +175,7 @@
         <xsd:element name="y" type="ob:center_or_int"/>
        <xsd:element name="monitor" type="ob:mouse_or_int"/>    
         <xsd:element minOccurs="0" name="head" type="xsd:string"/>
+        <xsd:attribute name="force" type="ob:bool"/>
     </xsd:complexType>
     <xsd:complexType name="application">
         <xsd:element minOccurs="0" name="decor" type="xsd:bool"/>
@@ -188,10 +189,11 @@
         <xsd:element minOccurs="0" name="skip_taskbar" type="ob:bool"/>
         <xsd:element minOccurs="0" name="fullscreen" type="ob:bool"/>
         <xsd:element minOccurs="0" name="maximized" type="ob:maximization"/>
+        <xsd:attribute name="role" type="xsd:string"/>
+        <xsd:attribute name="type" type="ob:clienttype"/>
         <!-- at least one of these must be present -->
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="class" type="xsd:string"/>
-        <xsd:attribute name="role" type="xsd:string"/>
     </xsd:complexType>
     <xsd:complexType name="applications">
         <xsd:element minOccurs="0" maxOccurs="unbounded" name="application" type="ob:application"/>
@@ -251,6 +253,18 @@
             <xsd:enumeration value="Unshade"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="clienttype">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="desktop"/>
+            <xsd:enumeration value="dock"/>
+            <xsd:enumeration value="toolbar"/>
+            <xsd:enumeration value="menu"/>
+            <xsd:enumeration value="splash"/>
+            <xsd:enumeration value="utility"/>
+            <xsd:enumeration value="dialog"/>
+            <xsd:enumeration value="normal"/>
+        </xsd:restriction>
+    </xsd:simpleType>
     <xsd:simpleType name="bool">
         <!-- this is copied to maximization.  Keep that in sync. -->
         <xsd:restriction base="xsd:string">