Add the fixes & tests for nested structures.

mwm · mwm · commit fb03ae71b687 · 2013-02-07T13:35:46.000Z
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -515,6 +515,8 @@ def parse_binary_value(self, data, display, length, format):
     def pack_value(self, val):
         # Single-char values, we'll assume that means integer lists.
         if self.type.structcode and len(self.type.structcode) == 1:
+            if self.type.check_value is not None:
+                val = [self.type.check_value(v) for v in val]
             data = array(struct_to_array_codes[self.type.structcode],
                                val).tostring()
         else:
@@ -568,9 +570,13 @@ def check_value(self, val):
             for f in self.type.fields:
                 if f.name:
                     if f.check_value is None:
-                        vals.append(val[i])
+                        v = val[i]
                     else:
-                        vals.append(f.check_value(val[i]))
+                        v = f.check_value(val[i])
+                    if f.structvalues == 1:
+                        vals.append(v)
+                    else:
+                        vals.extend(v)
                     i = i + 1
             return vals
 
@@ -585,9 +591,13 @@ def check_value(self, val):
         for f in self.type.fields:
             if f.name:
                 if f.check_value is None:
-                    vals.append(data[f.name])
+                    v = data[f.name]
+                else:
+                    v = f.check_value(data[f.name])
+                if f.structvalues == 1:
+                    vals.append(v)
                 else:
-                    vals.append(f.check_value(data[f.name]))
+                    vals.extend(v)
 
         return vals
 
@@ -821,6 +831,7 @@ def __init__(self, code):
         self.structcode = code
         self.structvalues = 1
         self.parse_value = None
+        self.check_value = None
 
 Card8Obj  = ScalarObj('B')
 Card16Obj = ScalarObj('H')
@@ -832,6 +843,7 @@ class ResourceObj:
 
     def __init__(self, class_name):
         self.class_name = class_name
+        self.check_value = None
 
     def parse_value(self, value, display):
         # if not display:
diff --git a/test/test_manual.py b/test/test_manual.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+
+import sys, os
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+
+import unittest
+from Xlib.protocol import rq
+
+class Custom(rq.Card32):
+    def check_value(self, value):
+        return int(value)
+    def parse_value(self, value, display):
+        return str(value)
+
+CustomObj = Custom(None)
+
+
+class TestNestedStruct(unittest.TestCase):
+    def setUp(self):
+        self.s1 = rq.Struct(rq.Card32('a1'), rq.Card32('a2'))
+        self.s2 = rq.Struct(rq.Object('b1', self.s1), rq.Object('b2', self.s1))
+        self.s3 = rq.Struct(rq.Object('c1', self.s2), rq.Object('c2', self.s2))
+
+    def testToBinary1(self):
+        self.s1.to_binary(1, 2)
+
+    def testToBinary2(self):
+        self.s2.to_binary((1, 2), (3, 4))
+
+    def testToBinary3(self):
+        self.s3.to_binary(((1, 2), (3, 4)), ((5, 6), (7, 8)))
+
+class TestNestedStructWithFancyValue(unittest.TestCase):
+    def setUp(self):
+        self.s1 = rq.Struct(Custom('a1'), Custom('a2'))
+        self.s2 = rq.Struct(rq.Object('b1', self.s1), rq.Object('b2', self.s1))
+        self.s3 = rq.Struct(rq.Object('c1', self.s2), rq.Object('c2', self.s2))
+
+    def testToBinary1(self):
+        self.s1.to_binary('1', '2')
+
+    def testToBinary2(self):
+        self.s2.to_binary(('1', '2'), ('3', '4'))
+
+    def testToBinary3(self):
+        self.s3.to_binary((('1', '2'), ('3', '4')), (('5', '6'), ('7', '8')))
+
+class TestListWithFancyValue(unittest.TestCase):
+    def setUp(self):
+        self.s1 = rq.Struct(rq.LengthOf('l', 4), rq.List('l', CustomObj))
+
+    def testToBinary1(self):
+        self.s1.to_binary(['1', '2', '3'])
+
+if __name__ == '__main__':
+    unittest.main()
