back xml themes out of trunk

5 files changed, 9 insertions, 205 deletions

diff --git a/data/menu.xml b/data/menu.xml
index d1bf4a6f..d460cbcd 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<openbox_menu xmlns="http://openbox.org/4.0/menu">
+<openbox_menu xmlns="http://openbox.org/3.4/menu">
 
 <menu id="games-menu" label="Games">
   <item label="Crack-Attack">
diff --git a/data/menu.xsd b/data/menu.xsd
index e20d1785..e3e1e17b 100644
--- a/data/menu.xsd
+++ b/data/menu.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- XML Schema for the Openbox windowm anager menu file -->
+<!-- XML Schema for the Openbox window manager menu file -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/4.0/menu"
-    xmlns:ob="http://openbox.org/4.0/menu"
+    targetNamespace="http://openbox.org/3.4/menu"
+    xmlns:ob="http://openbox.org/3.4/menu"
     elementFormDefault="qualified">
     <!--
          root node
diff --git a/data/rc.xml b/data/rc.xml
index 4e9b02a5..d16ae5a2 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -3,7 +3,7 @@
 <!-- Do not edit this file, it will be overwritten on install.
         Copy the file to $HOME/.config/openbox/ instead. -->
 
-<openbox_config xmlns="http://openbox.org/4.0/rc">
+<openbox_config xmlns="http://openbox.org/3.4/rc">
 
 <resistance>
   <strength>10</strength>
diff --git a/data/rc.xsd b/data/rc.xsd
index 3b7097ac..e256e448 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -3,8 +3,8 @@
 <!-- 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"
-    xmlns:ob="http://openbox.org/4.0/rc"
+    targetNamespace="http://openbox.org/3.4/rc"
+    xmlns:ob="http://openbox.org/3.4/rc"
     elementFormDefault="qualified">
     <!--
          root node
@@ -350,9 +350,10 @@
             <xsd:enumeration value="BLCorner"/>
             <xsd:enumeration value="BRCorner"/>
             <xsd:enumeration value="Top"/>
-            <xsd:enumeration value="Bottom"/>
             <xsd:enumeration value="Left"/>
             <xsd:enumeration value="Right"/>
+            <xsd:enumeration value="Bottom"/>
+            <xsd:enumeration value="Handle"/>
             <xsd:enumeration value="Maximize"/>
             <xsd:enumeration value="AllDesktops"/>
             <xsd:enumeration value="Shade"/>
diff --git a/data/themerc.xsd b/data/themerc.xsd
index 3a636b5d..e69de29b 100644
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -1,197 +0,0 @@
-<?xml version="1.0"?>
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/4.0/themerc"
-    xmlns:obt="http://openbox.org/4.0/themerc"
-    elementFormDefault="qualified"
-    version="1.0">
-
-  <xs:annotation>
-    <xs:documentation xml:lang="en">
-      Openbox theme definition
-      Version 1
-      Copyright 2007 Dana Jansens
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="openbox_theme" type="obt:theme">
-    <xs:annotation>
-      <xs:documentation xml:lang="en">
-        The root node
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:complexType name="color">
-    <xs:attribute name="r" type="xs:integer"/>
-    <xs:attribute name="g" type="xs:integer"/>
-    <xs:attribute name="b" type="xs:integer"/>
-    <xs:attribute name="a" type="xs:integer"/>
-  </xs:complexType>
-
-  <xs:complexType name="point">
-    <xs:attribute name="x" type="xs:integer"/>
-    <xs:attribute name="y" type="xs:integer"/>
-  </xs:complexType>
-
-  <xs:simpleType name="justify">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="left"/>
-      <xs:enumeration value="right"/>
-      <xs:enumeration value="center"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="shadow">
-    <xs:all>
-      <xs:element name="offset" type="obt:point" minOccurs="0"/>
-      <xs:element name="primary" type="obt:color" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="text">
-    <xs:all>
-      <xs:element name="primary" type="obt:color" minOccurs="0"/>
-      <xs:element name="shadow" type="obt:shadow" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="textarea">
-    <xs:all>
-      <xs:element name="style" type="xs:string" minOccurs="0"/>
-      <xs:element name="primary" type="obt:color" minOccurs="0"/>
-      <xs:element name="secondary" type="obt:color" minOccurs="0"/>
-      <xs:element name="interlace" type="obt:color" minOccurs="0"/>
-      <xs:element name="border" type="obt:color" minOccurs="0"/>
-      <xs:element name="text" type="obt:text" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="area">
-    <xs:all>
-      <xs:element name="style" type="xs:string" minOccurs="0"/>
-      <xs:element name="primary" type="obt:color" minOccurs="0"/>
-      <xs:element name="secondary" type="obt:color" minOccurs="0"/>
-      <xs:element name="interlace" type="obt:color" minOccurs="0"/>
-      <xs:element name="border" type="obt:color" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="buttonarea">
-    <xs:all>
-      <xs:element name="style" type="xs:string" minOccurs="0"/>
-      <xs:element name="primary" type="obt:color" minOccurs="0"/>
-      <xs:element name="secondary" type="obt:color" minOccurs="0"/>
-      <xs:element name="interlace" type="obt:color" minOccurs="0"/>
-      <xs:element name="border" type="obt:color" minOccurs="0"/> 
-      <xs:element name="image" type="obt:color" minOccurs="0"/>
-   </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="allmenus">
-    <xs:all>
-      <xs:element name="border" type="obt:color" minOccurs="0"/>
-      <xs:element name="overlap" type="xs:integer" minOccurs="0"/>
-      <xs:element name="justify" type="obt:justify" minOccurs="0"/>
-      <xs:element name="title" type="obt:textarea" minOccurs="0"/>
-      <xs:element name="entries" type="obt:area" minOccurs="0"/>
-      <xs:element name="inactive" type="obt:text" minOccurs="0"/>
-      <xs:element name="active" type="obt:textarea" minOccurs="0"/>
-      <xs:element name="disabled" type="obt:text" minOccurs="0"/>
-      <xs:element name="activedisabled" type="obt:textarea" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="allbuttons">
-    <xs:all>
-      <xs:element name="unpressed" type="obt:buttonarea" minOccurs="0"/>
-      <xs:element name="pressed" type="obt:buttonarea" minOccurs="0"/>
-      <xs:element name="hover" type="obt:buttonarea" minOccurs="0"/>
-      <xs:element name="disabled" type="obt:buttonarea" minOccurs="0"/>
-      <xs:element name="toggled-unpressed" type="obt:buttonarea" minOccurs="0"/>
-      <xs:element name="toggled-pressed" type="obt:buttonarea" minOccurs="0"/>
-      <xs:element name="toggled-hover" type="obt:buttonarea" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="window">
-    <xs:all>
-      <xs:element name="border" type="obt:color" minOccurs="0"/>
-      <xs:element name="titleseparator" type="obt:color" minOccurs="0"/>
-      <xs:element name="clientpadding" type="obt:color" minOccurs="0"/>
-      <xs:element name="titlebar" type="obt:area" minOccurs="0"/>
-      <xs:element name="label" type="obt:textarea" minOccurs="0"/>
-      <xs:element name="handle" type="obt:area" minOccurs="0"/>
-      <xs:element name="grip" type="obt:area" minOccurs="0"/>
-      <xs:element name="buttons" type="obt:allbuttons" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="allwindows">
-    <xs:all>
-      <xs:element name="justify" type="obt:justify" minOccurs="0"/>
-      <xs:element name="inactive" type="obt:window" minOccurs="0"/>
-      <xs:element name="active" type="obt:window" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="allosd">
-    <xs:all>
-      <xs:element name="border" type="obt:color" minOccurs="0"/>
-      <xs:element name="label" type="obt:textarea" minOccurs="0"/>
-      <xs:element name="background" type="obt:area" minOccurs="0"/>
-      <xs:element name="hilight" type="obt:area" minOccurs="0"/>
-      <xs:element name="unhilight" type="obt:area" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="windowDimensions">
-    <xs:all>
-      <xs:element name="border" type="xs:integer" minOccurs="0"/>
-      <xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="menuDimensions">
-    <xs:all>
-      <xs:element name="border" type="xs:integer" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="osdDimensions">
-    <xs:all>
-      <xs:element name="border" type="xs:integer" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="themeDimensions">
-    <xs:all>
-      <xs:element name="padding" type="obt:point" minOccurs="0"/>
-      <xs:element name="handle" type="xs:integer" minOccurs="0"/>
-      <xs:element name="window" type="obt:windowDimensions" minOccurs="0"/>
-      <xs:element name="menu" type="obt:menuDimensions" minOccurs="0"/>
-      <xs:element name="osd" type="obt:osdDimensions" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="about">
-    <xs:all>
-      <xs:element name="author" type="xs:string" minOccurs="0"/>
-      <xs:element name="email" type="xs:string" minOccurs="0"/>
-      <xs:element name="webpage" type="xs:string" minOccurs="0"/>
-      <xs:element name="comment" type="xs:string" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="theme">
-    <xs:all>
-      <xs:element name="about" type="obt:about" minOccurs="0"/>
-      <xs:element name="dimensions" type="obt:themeDimensions" minOccurs="0"/>
-      <xs:element name="osd" type="obt:allosd" minOccurs="0"/>
-      <xs:element name="menu" type="obt:allmenus" minOccurs="0"/>
-      <xs:element name="window" type="obt:allwindows" minOccurs="0"/>
-    </xs:all>
-    <xs:attribute name="version" type="xs:integer" use="required" fixed="1"/>
-    <xs:attribute name="engine" type="xs:string" use="required" fixed="box"/>
-  </xs:complexType>
-</xs:schema>