protocol/rq: add Bytes field (for binary strings)

benoit-pierre · benoit-pierre · commit 1316a7ac9e31 · 2016-06-27T13:25:24.000+02:00
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -391,6 +391,39 @@ def __init__(self, name, size):
         self.structcode = '{0}s'.format(size)
 
 
+class Bytes(ValueField):
+    structcode = None
+
+    def __init__(self, name, pad = 1):
+        ValueField.__init__(self, name)
+        self.pad = pad
+
+    def pack_value(self, val):
+        if isinstance(val, bytes):
+            val_bytes = val
+        else:
+            val_bytes = val.encode()
+        slen = len(val_bytes)
+
+        if self.pad:
+            return val_bytes + b'\0' * ((4 - slen % 4) % 4), slen, None
+        else:
+            return val_bytes, slen, None
+
+    def parse_binary_value(self, data, display, length, format):
+        if length is None:
+            return data, b''
+
+        if self.pad:
+            slen = length + ((4 - length % 4) % 4)
+        else:
+            slen = length
+
+        data_bytes = data[:length]
+
+        return data_bytes, data[slen:]
+
+
 class String8(ValueField):
     structcode = None
 
