X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Frc.xsd;h=debac5bb6ff64a3f636638235ba418c808e6f10a;hb=35b87d6d3848ae6f22801e3a3050a70519a48a16;hp=fdb98e7d50393a2ea23ba0cb869ccff1f1de98a5;hpb=853a5b6b042cad94aa9c81290ed3bed34a6ae90d;p=chaz%2Fopenbox

diff --git a/data/rc.xsd b/data/rc.xsd
index fdb98e7d..debac5bb 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -1,60 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?> <!-- -*- nxml -*- -->
-<!--
-     xml Schema for the openbox windowmanager configuration file
 
-     Changes:
-     Son Aug 10 15:49:10 CEST 2003 - pch(a)myzel.net
-         restrictions added, up to current format
-     Don Aug 14 21:10:27 CEST 2003 - pch(a)myzel.net
-         up to current (from action.c,config.c)
-     Don Aug 21 23:07:30 CEST 2003 - pch(a)myzel.net
-         new element - follow
-     Mon Sep  1 00:57:55 CEST 2003 - pch(a)myzel.net
-         up to alpha7
-     Mit Sep  3 12:40:10 CEST 2003 - pch(a)myzel.net
-         up to alpha8, a little documentation
-     Mon Sep  8 11:52:07 CEST 2003 - pch(a)myzel.net
-         up to cvs 1.12
-     Mon Sep 15 14:27:42 CEST 2003 - pch(a)myzel.net
-         up to cvs 1.14
-     Die Sep 16 20:56:37 CEST 2003 - pch(a)myzel.net
-         use a namespace
-     Fri Sep 19 14:36:33 EDT 2003 - xor(a)orodu.net
-         use openbox.org for namespace
-     Mon Sep 22 02:34:53 EDT 2003 - xor(a)orodu.net
-         add the focusLast and raiseOnFocus options
-         fix some capitalization
-     Mon Sep 22 14:08:16 EDT 2003 - xor(a)orodu.net
-         update hideTimeout to hideDelay
-     Thu Apr 22 12:33:11 UTC 2004 - mikachu(a)openbox.org
-         add diffs between 3.1 and 3.2
-     Sun Oct 31 10:08:34 UTC 2004 - mikachu(a)openbox.org
-         we haven't remembered to update this changelog in a while,
-         adding desktopMenuIcons.
-     Thu Nov  4 12:07:08 UTC 2004 - mikachu(a)openbox.org
-         Add fourCorners to resize context.
-     Sat Feb 12 01:57:16 UTC 2005 - mikachu(a)openbox.org
-         Add the group option to raise/lower stuff.
-     Sun Sep 25 14:44:21 UTC 2005 - mikachu(a)openbox.org
-         Add showDelay for the dock
-     Tue Jul 18 23:43:15 CEST 2006 - jonaskoelker(a)gnu.org
-         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
-     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
-         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.
--->
+<!-- XML Schema for the Openbox window manager configuration file -->
+
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/"
-    xmlns:ob="http://openbox.org/"
+    targetNamespace="http://openbox.org/4.0/rc"
+    xmlns:ob="http://openbox.org/4.0/rc"
     elementFormDefault="qualified">
     <!--
          root node
@@ -86,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>
@@ -95,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>
@@ -103,13 +53,22 @@
             <xsd:documentation>defines how new windows are placed</xsd:documentation>
         </xsd:annotation>
         <xsd:element name="policy" type="ob:placementpolicy"/>
+        <xsd:element name="center" type="ob:bool"/>
     </xsd:complexType>
+    <xsd:complexType name="margins">
+        <xsd:annotation>
+            <xsd:documentation>defines desktop margins</xsd:documentation>
+        </xsd:annotation>
+        <xsd:element minOccurs="0" name="top" type="xsd:integer"/>
+        <xsd:element minOccurs="0" name="left" type="xsd:integer"/>
+        <xsd:element minOccurs="0" name="right" type="xsd:integer"/>
+        <xsd:element minOccurs="0" name="bottom" type="xsd:integer"/>
+    </xsd:complexType>              
     <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="hideDisabled" type="ob:bool"/>
+        <xsd:element minOccurs="0" name="animateIconify" type="ob:bool"/>
         <xsd:element minOccurs="0" name="font" type="ob:font"/>
     </xsd:complexType>
     <xsd:complexType name="font">
@@ -117,6 +76,7 @@
         <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>
@@ -191,28 +151,28 @@
     <xsd:complexType name="mouse">
         <xsd:element minOccurs="0" name="dragThreshold" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="doubleClickTime" type="xsd:integer"/>
+        <xsd:element minOccurs="0" name="screenEdgeWarpTime" type="xsd:integer"/>
         <xsd:element maxOccurs="unbounded" name="context" type="ob:context"/>
     </xsd:complexType>
     <xsd:complexType name="menu">
         <xsd:element maxOccurs="unbounded" name="file" type="xsd:string"/>
-        <xsd:element minOccurs="0" name="warpPointer" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="xorStyle" type="ob:bool"/>
         <xsd:element minOccurs="0" name="hideDelay" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="middle" type="ob:bool"/>
         <xsd:element minOccurs="0" name="submenuShowDelay" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="desktopMenuIcons" type="ob:bool"/>
+        <xsd:element minOccurs="0" name="applicationIcons" type="ob:bool"/>
     </xsd:complexType>
     <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">
-        <xsd:element minOccurs="0" name="decor" type="xsd:string"/>
+        <xsd:element minOccurs="0" name="decor" type="xsd:bool"/>
         <xsd:element minOccurs="0" name="shade" type="ob:bool"/>
         <xsd:element minOccurs="0" name="position" type="ob:window_position"/>
         <xsd:element minOccurs="0" name="focus" type="xsd:string"/>
         <xsd:element minOccurs="0" name="desktop" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="head" type="xsd:string"/>
         <xsd:element minOccurs="0" name="layer" type="ob:layer"/>
         <xsd:element minOccurs="0" name="iconic" type="ob:bool"/>
         <xsd:element minOccurs="0" name="skip_pager" type="ob:bool"/>
@@ -333,6 +293,15 @@
             <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">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="normal"/>
@@ -373,17 +342,28 @@
             <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="Handle"/>
             <xsd:enumeration value="Frame"/>
             <xsd:enumeration value="TLCorner"/>
             <xsd:enumeration value="TRCorner"/>
             <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"/>
             <xsd:enumeration value="Shade"/>
@@ -421,9 +401,9 @@
     </xsd:simpleType>
     <xsd:simpleType name="layer">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="above"/>
-            <xsd:enumeration value="normal"/>
-            <xsd:enumeration value="below"/>
+            <xsd:enumeration value="Above"/>
+            <xsd:enumeration value="Normal"/>
+            <xsd:enumeration value="Below"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="maximization">