X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=data%2Frc.xsd;h=151541918dc894165c7548d236372cbfbdac5114;hb=881a8647d2eb5f13eccda87a712c180fa9e902cf;hp=71ab68c8b0c2637c1fba586dcb13037b0cb37c39;hpb=3f446e917d18c6b997afaa47832d2287c95acf1b;p=chaz%2Fopenbox

diff --git a/data/rc.xsd b/data/rc.xsd
index 71ab68c8..15154191 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?> <!-- -*- nxml -*- -->
 
-<!-- XML Schema for the openbox windowmanager configuration file -->
+<!-- XML Schema for the Openbox window manager configuration file -->
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://openbox.org/4.0/rc"
@@ -36,7 +36,6 @@
         </xsd:annotation>
         <xsd:element minOccurs="0" name="strength" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="screen_edge_strength" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="edges_hit_layers_below" type="ob:bool"/>
     </xsd:complexType>
     <xsd:complexType name="focus">
         <xsd:annotation>
@@ -45,6 +44,7 @@
         <xsd:element minOccurs="0" name="focusNew" type="ob:bool"/>
         <xsd:element minOccurs="0" name="focusLast" type="ob:bool"/>
         <xsd:element minOccurs="0" name="followMouse" type="ob:bool"/>
+        <xsd:element minOccurs="0" name="underMouse" type="ob:bool"/>
         <xsd:element minOccurs="0" name="focusDelay" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="raiseOnFocus" type="ob:bool"/>
     </xsd:complexType>
@@ -57,7 +57,6 @@
     <xsd:complexType name="theme">
         <xsd:element minOccurs="0" name="name" type="xsd:string"/>
         <xsd:element minOccurs="0" name="titleLayout" type="xsd:string"/>
-        <xsd:element minOccurs="0" name="titleNumber" type="ob:bool"/>
         <xsd:element minOccurs="0" name="keepBorder" type="ob:bool"/>
         <xsd:element minOccurs="0" name="animateIconify" type="ob:bool"/>
         <xsd:element minOccurs="0" name="font" type="ob:font"/>
@@ -154,6 +153,7 @@
     <xsd:complexType name="window_position">
         <xsd:element name="x" type="ob:center_or_int"/>
         <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:complexType>
     <xsd:complexType name="application">
@@ -331,9 +331,17 @@
             <xsd:pattern value="center|0|[1-9][0-9]*"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="mouse_or_int">
+        <xsd:restriction base="xsd:string">
+            <!-- ob: atoi($_) unless $_ eq 'center'; -->
+            <!-- I think the regexp DTRT WRT atoi. -->
+            <xsd:pattern value="mouse|0|[1-9][0-9]*"/>
+        </xsd:restriction>
+    </xsd:simpleType>
     <xsd:simpleType name="contextname">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Desktop"/>
+            <xsd:enumeration value="Root"/>
             <xsd:enumeration value="Client"/>
             <xsd:enumeration value="Titlebar"/>
             <xsd:enumeration value="Frame"/>
@@ -342,6 +350,8 @@
             <xsd:enumeration value="BLCorner"/>
             <xsd:enumeration value="BRCorner"/>
             <xsd:enumeration value="Top"/>
+            <xsd:enumeration value="Left"/>
+            <xsd:enumeration value="Right"/>
             <xsd:enumeration value="Bottom"/>
             <xsd:enumeration value="Maximize"/>
             <xsd:enumeration value="AllDesktops"/>