From: Mikael Magnusson <mikachu@comhem.se>
Date: Fri, 25 Mar 2005 20:17:45 +0000 (+0000)
Subject: add noStrut option to dock and fix up rc.xsd, some options were in the wrong section... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=498ae4cc20b15c6c264a3fd7458ec2cd8777eb79;p=chaz%2Fopenbox

add noStrut option to dock and fix up rc.xsd, some options were in the wrong section due to hideDelay being in both dock and menu
---

diff --git a/data/rc.xsd b/data/rc.xsd
index 7d8119e2..7cdc5900 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -132,8 +132,8 @@
             <xs:element name="floatingY" type="xs:integer"/>
             <xs:element name="autoHide" type="ob:yesorno"/>
             <xs:element name="hideDelay" type="xs:integer"/>
-            <xs:element name="disktopMenuIcons" type="ob:yesorno"/>
             <xs:element name="moveButton" type="ob:button"/>
+            <xs:element name="noStrut" type="ob:yesorno"/>
         </xs:sequence>
     </xs:complexType>
     <xs:complexType name="action">
@@ -184,6 +184,8 @@
             <xs:element maxOccurs="unbounded" name="file" type="xs:string"/>
             <xs:element name="warpPointer" type="ob:yesorno"/>
             <xs:element name="xorStyle" type="ob:yesorno"/>
+            <xs:element name="hideDelay" type="xs:integer"/>
+            <xs:element name="desktopMenuIcons" type="ob:yesorno"/>
         </xs:sequence>
     </xs:complexType>
     <!--
diff --git a/openbox/config.c b/openbox/config.c
index ad1ea8c6..f086a1a3 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -361,6 +361,9 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_dock_x = parse_int(doc, n);
         if ((n = parse_find_node("floatingY", node)))
             config_dock_y = parse_int(doc, n);
+    } else {
+        if ((n = parse_find_node("noStrut", node)))
+            config_dock_floating = parse_bool(doc, n);
     }
     if ((n = parse_find_node("stacking", node))) {
         if (parse_contains("top", doc, n))