X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=data%2Frc.xsd;h=47eeed12958d87a1e9580765dc399866c9417c89;hb=a3babc4a995d31e44a626448e28d607be3c33197;hp=2d4059f052d9648e1f2d0a603c2035499b531993;hpb=811fa21940629236eb15345b4034bcc278bf7ba9;p=chaz%2Fopenbox

diff --git a/data/rc.xsd b/data/rc.xsd
index 2d4059f0..47eeed12 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"
@@ -44,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>
@@ -52,11 +53,21 @@
             <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:element name="monitor" type="ob:placementmonitor"/>
     </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="animateIconify" type="ob:bool"/>
         <xsd:element minOccurs="0" name="font" type="ob:font"/>
@@ -79,11 +90,17 @@
                 <xsd:element maxOccurs="unbounded" name="name" type="xsd:string"/>
             </xsd:complexType>
         </xsd:element>
+        <xsd:element minOccurs="0" name="popupTime" type="xsd:integer"/>
     </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:element minOccurs="0" name="popupPosition" type="ob:popupfixedposition"/>
+    </xsd:complexType>
+    <xsd:complexType name="popupfixedposition">
+        <xsd:element minOccurs="0" name="x" type="ob:center_or_int"/>
+        <xsd:element minOccurs="0" name="y" type="ob:center_or_int"/>
     </xsd:complexType>
     <xsd:complexType name="dock">
         <xsd:element minOccurs="0" name="position" type="ob:dock_position"/>
@@ -99,6 +116,7 @@
     </xsd:complexType>
     <xsd:complexType name="action">
         <xsd:element minOccurs="0" name="execute" type="xsd:string"/>
+        <xsd:element minOccurs="0" name="command" 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"/>
@@ -141,6 +159,7 @@
     <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">
@@ -149,11 +168,14 @@
         <xsd:element minOccurs="0" name="middle" type="ob:bool"/>
         <xsd:element minOccurs="0" name="submenuShowDelay" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="applicationIcons" type="ob:bool"/>
+        <xsd:element minOccurs="0" name="manageDesktops" 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:attribute name="force" type="ob:bool"/>
     </xsd:complexType>
     <xsd:complexType name="application">
         <xsd:element minOccurs="0" name="decor" type="xsd:bool"/>
@@ -180,94 +202,54 @@
       -->
     <xsd:simpleType name="actionname">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="Activate"/>
+            <xsd:enumeration value="AddDesktop"/>
             <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="Debug"/>
+            <xsd:enumeration value="Decorate"/>
+            <xsd:enumeration value="DirectionalCycleWindows"/>
+            <xsd:enumeration value="DirectionalTargetWindow"/>
             <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="GoToDesktop"/>
+            <xsd:enumeration value="GrowToEdge"/>
             <xsd:enumeration value="Iconify"/>
+            <xsd:enumeration value="If"/>
             <xsd:enumeration value="Kill"/>
             <xsd:enumeration value="Lower"/>
-            <xsd:enumeration value="MaximizeFull"/>
-            <xsd:enumeration value="MaximizeHorz"/>
-            <xsd:enumeration value="MaximizeVert"/>
+            <xsd:enumeration value="Maximize"/>
             <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="MoveResizeTo"/>
+            <xsd:enumeration value="MoveToEdge"/>
             <xsd:enumeration value="NextWindow"/>
             <xsd:enumeration value="PreviousWindow"/>
             <xsd:enumeration value="Raise"/>
             <xsd:enumeration value="RaiseLower"/>
             <xsd:enumeration value="Reconfigure"/>
+            <xsd:enumeration value="RemoveDesktop"/>
             <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="SendToLayer"/>
             <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="ToggleMaximize"/>
             <xsd:enumeration value="ToggleOmnipresent"/>
             <xsd:enumeration value="ToggleShade"/>
             <xsd:enumeration value="ToggleShowDesktop"/>
+            <xsd:enumeration value="Undecorate"/>
             <xsd:enumeration value="Unfocus"/>
-            <xsd:enumeration value="UnmaximizeFull"/>
-            <xsd:enumeration value="UnmaximizeHorz"/>
-            <xsd:enumeration value="UnmaximizeVert"/>
+            <xsd:enumeration value="Unmaximize"/>
             <xsd:enumeration value="Unshade"/>
-            <xsd:enumeration value="UnshadeRaise"/>
-            <xsd:enumeration value="UnShowDesktop"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="bool">
@@ -330,9 +312,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"/>
@@ -341,6 +331,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"/>
@@ -412,6 +404,13 @@
             <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:restriction>
+    </xsd:simpleType>
     <xsd:simpleType name="popupposition">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Top"/>