all repos — openbox @ 45087efbcdeec8a4cc985125a656a4bd6e9f3b3e

openbox fork - make it a bit more like ryudo 

point and padding became redundant.. do remove padding type from xsd and use point type. also fix bug in theme parser where it was looking for wrong one.
Dana Jansens danakj@orodu.net
commit

45087efbcdeec8a4cc985125a656a4bd6e9f3b3e

parent

88204502a800f57b582e829d25cfeb899d444802

3 files changed, 8 insertions(+), 13 deletions(-)

jump to
M data/themerc.xsd → data/themerc.xsd 
@@ -22,11 +22,6 @@ </xs:documentation>
     </xs:annotation>
   </xs:element>
 
-  <xs:complexType name="padding">
-    <xs:attribute name="horizontal" type="xs:integer"/>
-    <xs:attribute name="vertical" type="xs:integer"/>
-  </xs:complexType>
-
   <xs:complexType name="color">
     <xs:attribute name="r" type="xs:integer"/>
     <xs:attribute name="g" type="xs:integer"/>

@@ -136,7 +131,7 @@ </xs:complexType>
 
   <xs:complexType name="allwindows">
     <xs:all>
-      <xs:element name="clientpadding" type="obt:padding" minOccurs="0"/>
+      <xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
       <xs:element name="justify" type="obt:justify" minOccurs="0"/>
       <xs:element name="border" type="obt:border" minOccurs="0"/>
       <xs:element name="inactive" type="obt:window" minOccurs="0"/>

@@ -152,7 +147,7 @@ </xs:complexType>
 
   <xs:complexType name="themeDimensions">
     <xs:all>
-      <xs:element name="padding" type="obt:padding" minOccurs="0"/>
+      <xs:element name="padding" type="obt:point" minOccurs="0"/>
       <xs:element name="handle" type="xs:integer" minOccurs="0"/>
     </xs:all>
   </xs:complexType>
M render/theme.c → render/theme.c 
@@ -1307,8 +1307,8 @@ gint lowx, gint upx, gint lowy, gint upy)
 {
     if ((n = find_node(n, names))) {
         gint a, b;
-        if (parse_attr_int("horizontal", n, &a) &&
-            parse_attr_int("vertical", n, &b) &&
+        if (parse_attr_int("x", n, &a) &&
+            parse_attr_int("y", n, &b) &&
             a >= lowx && a <= upx && b >= lowy && b <= upy)
         {
             *x = a; *y = b;
M tools/themetoxml/themetoxml.c → tools/themetoxml/themetoxml.c 
@@ -321,8 +321,8 @@ if (read_int(db, "window.handle.width", &i))
         CONT2("dimensions", "handle", NUM(i));
 
     if (read_int(db, "padding.width", &i)) {
-        ATTR2("dimensions", "padding", "horizontal", NUM(i));
-        ATTR2("dimensions", "padding", "vertical", NUM(i));
+        ATTR2("dimensions", "padding", "x", NUM(i));
+        ATTR2("dimensions", "padding", "y", NUM(i));
     }
     
     if (read_int(db, "borderWidth", &i)) {

@@ -339,8 +339,8 @@ COLOR3("menu", "border", "primary", i, j, k, 255);
     }
 
     if (read_int(db, "window.client.padding.width", &i)) {
-        ATTR2("window", "clientpadding", "horizontal", NUM(i));
-        ATTR2("window", "clientpadding", "vertical", NUM(i));
+        ATTR2("window", "clientpadding", "x", NUM(i));
+        ATTR2("window", "clientpadding", "y", NUM(i));
     }
 
     if (read_string(db, "window.label.text.justify", &s)) {