X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Frc.xsd;h=79a3571fa961d7e8c51e4c4e796e119922c29265;hb=5e282dae08be3b900e0337efa0fae8f3ffa92cd7;hp=4da392a85e8d7ecbadba672d4515017aec424b97;hpb=4e590eba236c587caff22d8cfc3a8fc0332cb206;p=chaz%2Fopenbox

diff --git a/data/rc.xsd b/data/rc.xsd
index 4da392a8..79a3571f 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -1,63 +1,19 @@
 <?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 - mikachu(a)openbox.org
-         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.
-     Thu Apr 26 09:11:03 EDT 2007 - danakj(a)orodu.net
-         Add the place attribute for fonts
--->
+<!-- XML Schema for the Openbox window manager configuration file -->
+
+<!DOCTYPE schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN"
+				"http://www.w3.org/2001/XMLSchema.dtd" [
+<!ATTLIST schema xmlns:ob CDATA #IMPLIED>
+<!ENTITY % p "xsd:">
+<!ENTITY % s ":xsd">
+]>
+
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/"
-    xmlns:ob="http://openbox.org/"
-    elementFormDefault="qualified">
+    targetNamespace="http://openbox.org/4.0/rc"
+    xmlns:ob="http://openbox.org/4.0/rc"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified">
     <!--
          root node
       -->
@@ -66,17 +22,20 @@
             <xsd:documentation>all these elements are expected in a openbox config file</xsd:documentation>
         </xsd:annotation>
         <xsd:complexType>
-            <xsd:element name="resistance" type="ob:resistance"/>
-            <xsd:element name="focus" type="ob:focus"/>
-            <xsd:element name="placement" type="ob:placement"/>
-            <xsd:element name="theme" type="ob:theme"/>
-            <xsd:element name="desktops" type="ob:desktops"/>
-            <xsd:element name="resize" type="ob:resize"/>
-            <xsd:element name="dock" type="ob:dock"/>
-            <xsd:element name="keyboard" type="ob:keyboard"/>
-            <xsd:element name="mouse" type="ob:mouse"/>
-            <xsd:element name="menu" type="ob:menu"/>
-            <xsd:element name="applications" type="ob:applications"/>
+            <xsd:all>
+                <xsd:element name="resistance" type="ob:resistance"/>
+                <xsd:element name="focus" type="ob:focus"/>
+                <xsd:element name="placement" type="ob:placement"/>
+                <xsd:element name="theme" type="ob:theme"/>
+                <xsd:element name="desktops" type="ob:desktops"/>
+                <xsd:element name="resize" type="ob:resize"/>
+                <xsd:element minOccurs="0" name="margins" type="ob:margins"/>
+                <xsd:element name="dock" type="ob:dock"/>
+                <xsd:element name="keyboard" type="ob:keyboard"/>
+                <xsd:element name="mouse" type="ob:mouse"/>
+                <xsd:element name="menu" type="ob:menu"/>
+                <xsd:element name="applications" type="ob:applications"/>
+            </xsd:all>
         </xsd:complexType>
     </xsd:element>
     <!--
@@ -86,88 +45,137 @@
         <xsd:annotation>
             <xsd:documentation>defines behaviour of windows when close to each other or the screen edge</xsd:documentation>
         </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:all>
+            <xsd:element minOccurs="0" name="strength" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="screen_edge_strength" type="xsd:integer"/>
+        </xsd:all>
     </xsd:complexType>
     <xsd:complexType name="focus">
         <xsd:annotation>
             <xsd:documentation>defines aspects of window focus</xsd:documentation>
         </xsd:annotation>
-        <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="focusDelay" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="raiseOnFocus" type="ob:bool"/>
+        <xsd:all>
+            <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:element minOccurs="0" name="unfocusOnLeave" type="ob:bool"/>
+        </xsd:all>
     </xsd:complexType>
     <xsd:complexType name="placement">
         <xsd:annotation>
             <xsd:documentation>defines how new windows are placed</xsd:documentation>
         </xsd:annotation>
-        <xsd:element name="policy" type="ob:placementpolicy"/>
+        <xsd:sequence>
+            <xsd:element minOccurs="0" name="policy" type="ob:placementpolicy"/>
+            <xsd:element minOccurs="0" name="monitor" type="ob:placementmonitor"/>
+            <xsd:element minOccurs="0" name="primaryMonitor" type="ob:primarymonitor"/>
+        </xsd:sequence>
     </xsd:complexType>
+    <xsd:complexType name="margins">
+        <xsd:annotation>
+            <xsd:documentation>defines desktop margins</xsd:documentation>
+        </xsd:annotation>
+        <xsd:all>
+            <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:all>
+    </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="font" type="ob:font"/>
+        <xsd:sequence>
+            <xsd:element minOccurs="0" name="name" type="xsd:string"/>
+            <xsd:element minOccurs="0" name="titleLayout" type="xsd:string"/>
+            <xsd:element minOccurs="0" name="keepBorder" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="animateIconify" type="ob:bool"/>
+            <xsd:element minOccurs="0" maxOccurs="unbounded" name="font" type="ob:font"/>
+        </xsd:sequence>
     </xsd:complexType>
     <xsd:complexType name="font">
-        <xsd:element minOccurs="0" name="name" type="xsd:string"/>
-        <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:all>
+            <xsd:element minOccurs="0" name="name" type="xsd:string"/>
+            <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:all>
         <xsd:attribute name="place" type="ob:fontplace" use="required"/>
     </xsd:complexType>
     <xsd:complexType name="desktops">
         <xsd:annotation>
             <xsd:documentation>defines the number and names of desktops</xsd:documentation>
         </xsd:annotation>
-        <xsd:element minOccurs="0" name="number" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="firstdesk" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="names">
-            <xsd:complexType>
-                <xsd:element maxOccurs="unbounded" name="name" type="xsd:string"/>
-            </xsd:complexType>
-        </xsd:element>
+        <xsd:all>
+            <xsd:element minOccurs="0" name="number" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="firstdesk" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="names">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element minOccurs="0" maxOccurs="unbounded" name="name" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element minOccurs="0" name="popupTime" type="xsd:integer"/>
+        </xsd:all>
     </xsd:complexType>
     <xsd:complexType name="resize">
-        <xsd:element minOccurs="0" name="drawContents" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="popupShow" type="ob:popupshow"/>
-        <xsd:element minOccurs="0" name="popupPosition" type="ob:popupposition"/>
+        <xsd:all>
+            <xsd:element minOccurs="0" name="drawContents" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="popupShow" type="ob:popupshow"/>
+            <xsd:element minOccurs="0" name="popupPosition" type="ob:popupposition"/>
+            <xsd:element minOccurs="0" name="popupFixedPosition" type="ob:popupfixedposition"/>
+        </xsd:all>
+    </xsd:complexType>
+    <xsd:complexType name="popupfixedposition">
+        <xsd:all>
+            <xsd:element minOccurs="0" name="x" type="ob:center_or_int"/>
+            <xsd:element minOccurs="0" name="y" type="ob:center_or_int"/>
+        </xsd:all>
     </xsd:complexType>
     <xsd:complexType name="dock">
-        <xsd:element minOccurs="0" name="position" type="ob:dock_position"/>
-        <xsd:element minOccurs="0" name="floatingX" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="floatingY" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="noStrut" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="stacking" type="ob:layer"/>
-        <xsd:element minOccurs="0" name="direction" type="ob:direction"/>
-        <xsd:element minOccurs="0" name="autoHide" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="hideDelay" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="showDelay" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="moveButton" type="ob:button"/>
+        <xsd:all>
+            <xsd:element minOccurs="0" name="position" type="ob:dock_position"/>
+            <xsd:element minOccurs="0" name="floatingX" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="floatingY" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="noStrut" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="stacking" type="ob:layer"/>
+            <xsd:element minOccurs="0" name="direction" type="ob:direction"/>
+            <xsd:element minOccurs="0" name="autoHide" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="hideDelay" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="showDelay" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="moveButton" type="ob:button"/>
+        </xsd:all>
     </xsd:complexType>
     <xsd:complexType name="action">
-        <xsd:element minOccurs="0" name="execute" type="xsd:string"/>
-        <xsd:element minOccurs="0" name="menu" type="xsd:string"/>
-        <xsd:element minOccurs="0" name="delta" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="x" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="y" 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="up" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="down" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="desktop" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="wrap" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="follow" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="dialog" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="panels" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="here" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="linear" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="group" type="ob:bool"/>
+        <xsd:all>
+            <xsd:element minOccurs="0" name="execute" type="xsd:string"/>
+            <xsd:element minOccurs="0" name="startupnotify" type="ob:notify"/>
+            <xsd:element minOccurs="0" name="command" type="xsd:string"/>
+            <xsd:element minOccurs="0" name="allDesktops" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="menu" type="xsd:string"/>
+            <xsd:element minOccurs="0" name="delta" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="x" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="y" 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="up" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="down" type="xsd:integer"/>
+            <xsd:element minOccurs="0" name="desktop">
+                <xsd:simpleType>
+                    <xsd:union memberTypes="xsd:integer ob:bool"/>
+                </xsd:simpleType>
+            </xsd:element>
+            <xsd:element minOccurs="0" name="edge" type="xsd:string"/>
+            <xsd:element minOccurs="0" name="wrap" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="follow" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="dialog" type="ob:dialogtype"/>
+            <xsd:element minOccurs="0" name="panels" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="here" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="linear" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="group" type="ob:bool"/>
+        </xsd:all>
         <xsd:attribute name="name" type="ob:actionname" use="required"/>
     </xsd:complexType>
     <xsd:complexType name="keybind">
@@ -179,150 +187,192 @@
         <xsd:attribute name="key" type="ob:keyname" use="required"/>
     </xsd:complexType>
     <xsd:complexType name="keyboard">
-        <xsd:element minOccurs="0" name="chainQuitKey" type="ob:keyname"/>
-        <xsd:element maxOccurs="unbounded" name="keybind" type="ob:keybind"/>
+        <xsd:sequence>
+            <xsd:element minOccurs="0" name="chainQuitKey" type="ob:keyname"/>
+            <xsd:element maxOccurs="unbounded" name="keybind" type="ob:keybind"/>
+        </xsd:sequence>
     </xsd:complexType>
     <xsd:complexType name="mousebind">
-        <xsd:element maxOccurs="unbounded" name="action" type="ob:action"/>
+        <xsd:sequence>
+            <xsd:element maxOccurs="unbounded" name="action" type="ob:action"/>
+        </xsd:sequence>
         <xsd:attribute name="action" type="ob:mouseaction" use="required"/>
         <xsd:attribute name="button" type="ob:button" use="required"/>
     </xsd:complexType>
     <xsd:complexType name="context">
-        <xsd:element maxOccurs="unbounded" name="mousebind" type="ob:mousebind"/>
+        <xsd:sequence>
+            <xsd:element maxOccurs="unbounded" name="mousebind" type="ob:mousebind"/>
+        </xsd:sequence>
         <xsd:attribute name="name" type="ob:contextname" use="required"/>
     </xsd:complexType>
     <xsd:complexType name="mouse">
-        <xsd:element minOccurs="0" name="dragThreshold" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="doubleClickTime" type="xsd:integer"/>
-        <xsd:element maxOccurs="unbounded" name="context" type="ob:context"/>
+        <xsd:sequence>
+            <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 minOccurs="0" name="screenEdgeWarpMouse" type="ob:bool"/>
+            <xsd:element maxOccurs="unbounded" name="context" type="ob:context"/>
+        </xsd:sequence>
     </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:sequence>
+            <xsd:element maxOccurs="unbounded" name="file" type="xsd:string"/>
+            <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="showIcons" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="manageDesktops" type="ob:bool"/>
+        </xsd:sequence>
     </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:all>
+            <xsd:element name="x" type="ob:center_or_int"/>
+            <xsd:element name="y" type="ob:center_or_int"/>
+            <xsd:element minOccurs="0" name="monitor" type="ob:mouse_or_int"/>    
+            <xsd:element minOccurs="0" name="head" type="xsd:string"/>
+        </xsd:all>
+        <xsd:attribute name="force" type="ob:bool"/>
     </xsd:complexType>
     <xsd:complexType name="application">
-        <xsd:element minOccurs="0" name="decor" type="xsd:string"/>
-        <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"/>
-        <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:all>
+            <xsd:element minOccurs="0" name="decor" type="ob: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="layer" type="ob:layer"/>
+            <xsd:element minOccurs="0" name="iconic" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="skip_pager" type="ob:bool"/>
+            <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:all>
         <!-- at least one of these must be present -->
+        <xsd:attribute name="role" type="xsd:string"/>
+        <xsd:attribute name="title" type="xsd:string"/>
+        <xsd:attribute name="type" type="ob:clienttype"/>
         <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"/>
+        <xsd:sequence>
+            <xsd:element minOccurs="0" maxOccurs="unbounded" name="application" type="ob:application"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="notify">
+        <xsd:all>
+            <xsd:element minOccurs="0" name="enabled" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="name" type="xsd:string"/>
+            <xsd:element minOccurs="0" name="icon" type="xsd:string"/>
+        </xsd:all>
     </xsd:complexType>
     <!--
          simple types / restrictions
       -->
     <xsd:simpleType name="actionname">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="Activate"/>
-            <xsd:enumeration value="BreakChroot"/>
-            <xsd:enumeration value="Close"/>
-            <xsd:enumeration value="Desktop"/>
-            <xsd:enumeration value="DesktopDown"/>
-            <xsd:enumeration value="DesktopLast"/>
-            <xsd:enumeration value="DesktopLeft"/>
-            <xsd:enumeration value="DesktopNext"/>
-            <xsd:enumeration value="DesktopPrevious"/>
-            <xsd:enumeration value="DesktopRight"/>
-            <xsd:enumeration value="DesktopUp"/>
-            <xsd:enumeration value="DirectionalFocusEast"/>
-            <xsd:enumeration value="DirectionalFocusNorth"/>
-            <xsd:enumeration value="DirectionalFocusNortheast"/>
-            <xsd:enumeration value="DirectionalFocusNorthwest"/>
-            <xsd:enumeration value="DirectionalFocusSouth"/>
-            <xsd:enumeration value="DirectionalFocusSoutheast"/>
-            <xsd:enumeration value="DirectionalFocusSouthwest"/>
-            <xsd:enumeration value="DirectionalFocusWest"/>
-            <xsd:enumeration value="Execute"/>
-            <xsd:enumeration value="Exit"/>
-            <xsd:enumeration value="Focus"/>
-            <xsd:enumeration value="FocusToBottom"/>
-            <xsd:enumeration value="GrowToEdgeEast"/>
-            <xsd:enumeration value="GrowToEdgeNorth"/>
-            <xsd:enumeration value="GrowToEdgeSouth"/>
-            <xsd:enumeration value="GrowToEdgeWest"/>
-            <xsd:enumeration value="Iconify"/>
-            <xsd:enumeration value="Kill"/>
-            <xsd:enumeration value="Lower"/>
-            <xsd:enumeration value="MaximizeFull"/>
-            <xsd:enumeration value="MaximizeHorz"/>
-            <xsd:enumeration value="MaximizeVert"/>
-            <xsd:enumeration value="Move"/>
-            <xsd:enumeration value="MoveRelative"/>
-            <xsd:enumeration value="MoveRelativeHorz"/>
-            <xsd:enumeration value="MoveRelativeVert"/>
-            <xsd:enumeration value="MoveToCenter"/>
-            <xsd:enumeration value="MoveFromEdgeEast"/>
-            <xsd:enumeration value="MoveFromEdgeNorth"/>
-            <xsd:enumeration value="MoveFromEdgeSouth"/>
-            <xsd:enumeration value="MoveFromEdgeWest"/>
-            <xsd:enumeration value="MoveToEdgeEast"/>
-            <xsd:enumeration value="MoveToEdgeNorth"/>
-            <xsd:enumeration value="MoveToEdgeSouth"/>
-            <xsd:enumeration value="MoveToEdgeWest"/>
-            <xsd:enumeration value="NextWindow"/>
-            <xsd:enumeration value="PreviousWindow"/>
-            <xsd:enumeration value="Raise"/>
-            <xsd:enumeration value="RaiseLower"/>
-            <xsd:enumeration value="Reconfigure"/>
-            <xsd:enumeration value="Resize"/>
-            <xsd:enumeration value="ResizeRelative"/>
-            <xsd:enumeration value="ResizeRelativeHorz"/>
-            <xsd:enumeration value="ResizeRelativeVert"/>
-            <xsd:enumeration value="Restart"/>
-            <xsd:enumeration value="SendToBottomLayer"/>
-            <xsd:enumeration value="SendToDesktop"/>
-            <xsd:enumeration value="SendToDesktopDown"/>
-            <xsd:enumeration value="SendToDesktopLeft"/>
-            <xsd:enumeration value="SendToDesktopNext"/>
-            <xsd:enumeration value="SendToDesktopPrevious"/>
-            <xsd:enumeration value="SendToDesktopRight"/>
-            <xsd:enumeration value="SendToDesktopUp"/>
-            <xsd:enumeration value="SendToNormalLayer"/>
-            <xsd:enumeration value="SendToTopLayer"/>
-            <xsd:enumeration value="Shade"/>
-            <xsd:enumeration value="ShadeLower"/>
-            <xsd:enumeration value="ShowDesktop"/>
-            <xsd:enumeration value="ShowMenu"/>
-            <xsd:enumeration value="ToggleAlwaysOnBottom"/>
-            <xsd:enumeration value="ToggleAlwaysOnTop"/>
-            <xsd:enumeration value="ToggleDecorations"/>
-            <xsd:enumeration value="ToggleDockAutoHide"/>
-            <xsd:enumeration value="ToggleFullscreen"/>
-            <xsd:enumeration value="ToggleMaximizeFull"/>
-            <xsd:enumeration value="ToggleMaximizeHorz"/>
-            <xsd:enumeration value="ToggleMaximizeVert"/>
-            <xsd:enumeration value="ToggleOmnipresent"/>
-            <xsd:enumeration value="ToggleShade"/>
-            <xsd:enumeration value="ToggleShowDesktop"/>
-            <xsd:enumeration value="Unfocus"/>
-            <xsd:enumeration value="UnmaximizeFull"/>
-            <xsd:enumeration value="UnmaximizeHorz"/>
-            <xsd:enumeration value="UnmaximizeVert"/>
-            <xsd:enumeration value="Unshade"/>
-            <xsd:enumeration value="UnshadeRaise"/>
-            <xsd:enumeration value="UnShowDesktop"/>
+            <xsd:pattern value="[Ii][Ff]"/>
+            <xsd:pattern value="[Aa][Cc][Tt][Ii][Vv][Aa][Tt][Ee]"/>
+            <xsd:pattern value="[Bb][Rr][Ee][Aa][Kk][Cc][Hh][Rr][Oo][Oo][Tt]"/>
+            <xsd:pattern value="[Cc][Ll][Oo][Ss][Ee]"/>
+            <xsd:pattern value="[Dd][Ee][Ss][Kk][Tt][Oo][Pp]"/>
+            <xsd:pattern value="[Dd][Ee][Ss][Kk][Tt][Oo][Pp][Dd][Oo][Ww][Nn]"/>
+            <xsd:pattern value="[Dd][Ee][Ss][Kk][Tt][Oo][Pp][Ll][Aa][Ss][Tt]"/>
+            <xsd:pattern value="[Dd][Ee][Ss][Kk][Tt][Oo][Pp][Ll][Ee][Ff][Tt]"/>
+            <xsd:pattern value="[Dd][Ee][Ss][Kk][Tt][Oo][Pp][Nn][Ee][Xx][Tt]"/>
+            <xsd:pattern value="[Dd][Ee][Ss][Kk][Tt][Oo][Pp][Pp][Rr][Ee][Vv][Ii][Oo][Uu][Ss]"/>
+            <xsd:pattern value="[Dd][Ee][Ss][Kk][Tt][Oo][Pp][Rr][Ii][Gg][Hh][Tt]"/>
+            <xsd:pattern value="[Dd][Ee][Ss][Kk][Tt][Oo][Pp][Uu][Pp]"/>
+            <xsd:pattern value="[Dd][Ii][Rr][Ee][Cc][Tt][Ii][Oo][Nn][Aa][Ll][Ff][Oo][Cc][Uu][Ss][Ee][Aa][Ss][Tt]"/>
+            <xsd:pattern value="[Dd][Ii][Rr][Ee][Cc][Tt][Ii][Oo][Nn][Aa][Ll][Ff][Oo][Cc][Uu][Ss][Nn][Oo][Rr][Tt][Hh]"/>
+            <xsd:pattern value="[Dd][Ii][Rr][Ee][Cc][Tt][Ii][Oo][Nn][Aa][Ll][Ff][Oo][Cc][Uu][Ss][Nn][Oo][Rr][Tt][Hh][Ee][Aa][Ss][Tt]"/>
+            <xsd:pattern value="[Dd][Ii][Rr][Ee][Cc][Tt][Ii][Oo][Nn][Aa][Ll][Ff][Oo][Cc][Uu][Ss][Nn][Oo][Rr][Tt][Hh][Ww][Ee][Ss][Tt]"/>
+            <xsd:pattern value="[Dd][Ii][Rr][Ee][Cc][Tt][Ii][Oo][Nn][Aa][Ll][Ff][Oo][Cc][Uu][Ss][Ss][Oo][Uu][Tt][Hh]"/>
+            <xsd:pattern value="[Dd][Ii][Rr][Ee][Cc][Tt][Ii][Oo][Nn][Aa][Ll][Ff][Oo][Cc][Uu][Ss][Ss][Oo][Uu][Tt][Hh][Ee][Aa][Ss][Tt]"/>
+            <xsd:pattern value="[Dd][Ii][Rr][Ee][Cc][Tt][Ii][Oo][Nn][Aa][Ll][Ff][Oo][Cc][Uu][Ss][Ss][Oo][Uu][Tt][Hh][Ww][Ee][Ss][Tt]"/>
+            <xsd:pattern value="[Dd][Ii][Rr][Ee][Cc][Tt][Ii][Oo][Nn][Aa][Ll][Ff][Oo][Cc][Uu][Ss][Ww][Ee][Ss][Tt]"/>
+            <xsd:pattern value="[Ee][Xx][Ee][Cc][Uu][Tt][Ee]"/>
+            <xsd:pattern value="[Ee][Xx][Ii][Tt]"/>
+            <xsd:pattern value="[Ss][Ee][Ss][Ss][Ii][Oo][Nn][Ll][Oo][Gg][Oo][Uu][Tt]"/>
+            <xsd:pattern value="[Ff][Oo][Cc][Uu][Ss]"/>
+            <xsd:pattern value="[Ff][Oo][Cc][Uu][Ss][Tt][Oo][Bb][Oo][Tt][Tt][Oo][Mm]"/>
+            <xsd:pattern value="[Gg][Rr][Oo][Ww][Tt][Oo][Ee][Dd][Gg][Ee][Ee][Aa][Ss][Tt]"/>
+            <xsd:pattern value="[Gg][Rr][Oo][Ww][Tt][Oo][Ee][Dd][Gg][Ee][Nn][Oo][Rr][Tt][Hh]"/>
+            <xsd:pattern value="[Gg][Rr][Oo][Ww][Tt][Oo][Ee][Dd][Gg][Ee][Ss][Oo][Uu][Tt][Hh]"/>
+            <xsd:pattern value="[Gg][Rr][Oo][Ww][Tt][Oo][Ee][Dd][Gg][Ee][Ww][Ee][Ss][Tt]"/>
+            <xsd:pattern value="[Ii][Cc][Oo][Nn][Ii][Ff][Yy]"/>
+            <xsd:pattern value="[Kk][Ii][Ll][Ll]"/>
+            <xsd:pattern value="[Ll][Oo][Ww][Ee][Rr]"/>
+            <xsd:pattern value="[Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Ff][Uu][Ll][Ll]"/>
+            <xsd:pattern value="[Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Hh][Oo][Rr][Zz]"/>
+            <xsd:pattern value="[Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Vv][Ee][Rr][Tt]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Rr][Ee][Ll][Aa][Tt][Ii][Vv][Ee]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Rr][Ee][Ll][Aa][Tt][Ii][Vv][Ee][Hh][Oo][Rr][Zz]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Rr][Ee][Ll][Aa][Tt][Ii][Vv][Ee][Vv][Ee][Rr][Tt]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Tt][Oo][Cc][Ee][Nn][Tt][Ee][Rr]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Ff][Rr][Oo][Mm][Ee][Dd][Gg][Ee][Ee][Aa][Ss][Tt]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Ff][Rr][Oo][Mm][Ee][Dd][Gg][Ee][Nn][Oo][Rr][Tt][Hh]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Ff][Rr][Oo][Mm][Ee][Dd][Gg][Ee][Ss][Oo][Uu][Tt][Hh]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Ff][Rr][Oo][Mm][Ee][Dd][Gg][Ee][Ww][Ee][Ss][Tt]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Tt][Oo][Ee][Dd][Gg][Ee][Ee][Aa][Ss][Tt]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Tt][Oo][Ee][Dd][Gg][Ee][Nn][Oo][Rr][Tt][Hh]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Tt][Oo][Ee][Dd][Gg][Ee][Ss][Oo][Uu][Tt][Hh]"/>
+            <xsd:pattern value="[Mm][Oo][Vv][Ee][Tt][Oo][Ee][Dd][Gg][Ee][Ww][Ee][Ss][Tt]"/>
+            <xsd:pattern value="[Nn][Ee][Xx][Tt][Ww][Ii][Nn][Dd][Oo][Ww]"/>
+            <xsd:pattern value="[Pp][Rr][Ee][Vv][Ii][Oo][Uu][Ss][Ww][Ii][Nn][Dd][Oo][Ww]"/>
+            <xsd:pattern value="[Rr][Aa][Ii][Ss][Ee]"/>
+            <xsd:pattern value="[Rr][Aa][Ii][Ss][Ee][Ll][Oo][Ww][Ee][Rr]"/>
+            <xsd:pattern value="[Rr][Ee][Cc][Oo][Nn][Ff][Ii][Gg][Uu][Rr][Ee]"/>
+            <xsd:pattern value="[Rr][Ee][Ss][Ii][Zz][Ee]"/>
+            <xsd:pattern value="[Rr][Ee][Ss][Ii][Zz][Ee][Rr][Ee][Ll][Aa][Tt][Ii][Vv][Ee]"/>
+            <xsd:pattern value="[Rr][Ee][Ss][Ii][Zz][Ee][Rr][Ee][Ll][Aa][Tt][Ii][Vv][Ee][Hh][Oo][Rr][Zz]"/>
+            <xsd:pattern value="[Rr][Ee][Ss][Ii][Zz][Ee][Rr][Ee][Ll][Aa][Tt][Ii][Vv][Ee][Vv][Ee][Rr][Tt]"/>
+            <xsd:pattern value="[Rr][Ee][Ss][Tt][Aa][Rr][Tt]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Bb][Oo][Tt][Tt][Oo][Mm][Ll][Aa][Yy][Ee][Rr]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Dd][Ee][Ss][Kk][Tt][Oo][Pp]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Dd][Ee][Ss][Kk][Tt][Oo][Pp][Dd][Oo][Ww][Nn]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Dd][Ee][Ss][Kk][Tt][Oo][Pp][Ll][Ee][Ff][Tt]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Dd][Ee][Ss][Kk][Tt][Oo][Pp][Nn][Ee][Xx][Tt]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Dd][Ee][Ss][Kk][Tt][Oo][Pp][Pp][Rr][Ee][Vv][Ii][Oo][Uu][Ss]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Dd][Ee][Ss][Kk][Tt][Oo][Pp][Rr][Ii][Gg][Hh][Tt]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Dd][Ee][Ss][Kk][Tt][Oo][Pp][Uu][Pp]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Nn][Oo][Rr][Mm][Aa][Ll][Ll][Aa][Yy][Ee][Rr]"/>
+            <xsd:pattern value="[Ss][Ee][Nn][Dd][Tt][Oo][Tt][Oo][Pp][Ll][Aa][Yy][Ee][Rr]"/>
+            <xsd:pattern value="[Ss][Hh][Aa][Dd][Ee]"/>
+            <xsd:pattern value="[Ss][Hh][Aa][Dd][Ee][Ll][Oo][Ww][Ee][Rr]"/>
+            <xsd:pattern value="[Ss][Hh][Oo][Ww][Dd][Ee][Ss][Kk][Tt][Oo][Pp]"/>
+            <xsd:pattern value="[Ss][Hh][Oo][Ww][Mm][Ee][Nn][Uu]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Aa][Ll][Ww][Aa][Yy][Ss][Oo][Nn][Bb][Oo][Tt][Tt][Oo][Mm]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Aa][Ll][Ww][Aa][Yy][Ss][Oo][Nn][Tt][Oo][Pp]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Dd][Ee][Cc][Oo][Rr][Aa][Tt][Ii][Oo][Nn][Ss]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Dd][Oo][Cc][Kk][Aa][Uu][Tt][Oo][Hh][Ii][Dd][Ee]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Ff][Uu][Ll][Ll][Ss][Cc][Rr][Ee][Ee][Nn]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Ff][Uu][Ll][Ll]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Hh][Oo][Rr][Zz]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Vv][Ee][Rr][Tt]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Oo][Mm][Nn][Ii][Pp][Rr][Ee][Ss][Ee][Nn][Tt]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Ss][Hh][Aa][Dd][Ee]"/>
+            <xsd:pattern value="[Tt][Oo][Gg][Gg][Ll][Ee][Ss][Hh][Oo][Ww][Dd][Ee][Ss][Kk][Tt][Oo][Pp]"/>
+            <xsd:pattern value="[Uu][Nn][Ff][Oo][Cc][Uu][Ss]"/>
+            <xsd:pattern value="[Uu][Nn][Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Ff][Uu][Ll][Ll]"/>
+            <xsd:pattern value="[Uu][Nn][Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Hh][Oo][Rr][Zz]"/>
+            <xsd:pattern value="[Uu][Nn][Mm][Aa][Xx][Ii][Mm][Ii][Zz][Ee][Vv][Ee][Rr][Tt]"/>
+            <xsd:pattern value="[Uu][Nn][Ss][Hh][Aa][Dd][Ee]"/>
+            <xsd:pattern value="[Uu][Nn][Ss][Hh][Aa][Dd][Ee][Rr][Aa][Ii][Ss][Ee]"/>
+            <xsd:pattern value="[Uu][Nn][Ss][Hh][Oo][Ww][Dd][Ee][Ss][Kk][Tt][Oo][Pp]"/>
+        </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">
@@ -342,7 +392,8 @@
             <xsd:enumeration value="InactiveWindow"/>
             <xsd:enumeration value="MenuHeader"/>
             <xsd:enumeration value="MenuItem"/>
-            <xsd:enumeration value="OnScreenDisplay"/>
+            <xsd:enumeration value="ActiveOnScreenDisplay"/>
+            <xsd:enumeration value="InactiveOnScreenDisplay"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="fontweight">
@@ -360,42 +411,38 @@
     </xsd:simpleType>
     <xsd:simpleType name="button">
         <xsd:restriction base="xsd:string">
-            <!-- FIXME what??? -->
-            <xsd:enumeration value="Left"/>
-            <xsd:enumeration value="Middle"/>
-            <xsd:enumeration value="Right"/>
-            <xsd:enumeration value="Up"/>
-            <xsd:enumeration value="Down"/>
-            <xsd:enumeration value="A-Left"/>
-            <xsd:enumeration value="A-Middle"/>
-            <xsd:enumeration value="A-Right"/>
-            <xsd:enumeration value="A-Up"/>
-            <xsd:enumeration value="A-Down"/>
-            <xsd:enumeration value="C-A-Left"/>
-            <xsd:enumeration value="C-A-Middle"/>
-            <xsd:enumeration value="C-A-Right"/>
-            <xsd:enumeration value="C-A-Up"/>
-            <xsd:enumeration value="C-A-Down"/>
+            <xsd:pattern value="(([ACMSW]|Mod[1-5])-){,5}(Left|Middle|Right|Up|Down|Button[0-9]+)"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="center_or_int">
         <xsd:restriction base="xsd:string">
             <!-- ob: atoi($_) unless $_ eq 'center'; -->
             <!-- I think the regexp DTRT WRT atoi. -->
-            <xsd:pattern value="center|0|[1-9][0-9]*"/>
+            <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"/>
@@ -428,14 +475,14 @@
         <xsd:restriction base="xsd:string">
             <!-- FIXME: M, Mod2, Mod5 in addition to S, A, C -->
             <!-- how do we do all substrings and permutations? -->
-            <xsd:pattern value="(A-)?(S-)?(A-)?(C-)?(A-)?(S-)?(A-)?[a-zA-Z0-9]*"/>
+            <xsd:pattern value="(([ACMSW]|Mod[1-5])-){,5}[a-zA-Z0-9]*"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="layer">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="above"/>
-            <xsd:enumeration value="normal"/>
-            <xsd:enumeration value="below"/>
+            <xsd:pattern value="[Aa][Bb][Oo][Vv][Ee]"/>
+            <xsd:pattern value="[Nn][Oo][Rr][Mm][Aa][Ll]"/>
+            <xsd:pattern value="[Bb][Ee][Ll][Oo][Ww]"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="maximization">
@@ -466,6 +513,21 @@
             <xsd:enumeration value="UnderMouse"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="placementmonitor">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="Any"/>
+            <xsd:enumeration value="Mouse"/>
+            <xsd:enumeration value="Active"/>
+            <xsd:enumeration value="Primary"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="primarymonitor">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="Mouse"/>
+            <xsd:enumeration value="Active"/>
+            <xsd:pattern value="[0-9][0-9][0-9][0-9][0-9]"/>
+        </xsd:restriction>
+    </xsd:simpleType>
     <xsd:simpleType name="popupposition">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Top"/>
@@ -479,4 +541,11 @@
             <xsd:enumeration value="Nonpixel"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="dialogtype">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="None"/>
+            <xsd:enumeration value="Icons"/>
+            <xsd:enumeration value="List"/>
+        </xsd:restriction>
+    </xsd:simpleType>
 </xsd:schema>