summaryrefslogtreecommitdiff
path: root/xcbgen
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2009-10-21 18:22:06 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2009-10-21 18:22:06 -0400
commita03633320a28e07e561de86b32e75c8e4626ece7 (patch)
tree0079cd58d32b8ea56dfe7a934bde0cc5c342834c /xcbgen
parentae06ddd86a3c050f403eeee849b9a1357aac097d (diff)
Revert "made changes to support new value-mask-pad field of valueparam structures"
This change fixes a ConfigureWindow request padding issue, but has a bug that affects xpyb (#24507). This reverts commit 57934caa3fb207320c33312646d8e98290950f51.
Diffstat (limited to 'xcbgen')
-rw-r--r--xcbgen/xtypes.py28
1 files changed, 4 insertions, 24 deletions
diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py
index 30617b8..01d765e 100644
--- a/xcbgen/xtypes.py
+++ b/xcbgen/xtypes.py
@@ -235,15 +235,15 @@ class ExprType(Type):
def fixed_size(self):
return True
-class SizedPadType(Type):
+class PadType(Type):
'''
- Derived class which represents a padding field of given size.
+ Derived class which represents a padding field.
'''
- def __init__(self, size):
+ def __init__(self, elt):
Type.__init__(self, tcard8.name)
self.is_pad = True
self.size = 1
- self.nmemb = int(size)
+ self.nmemb = 1 if (elt == None) else int(elt.get('bytes'))
def resolve(self, module):
self.resolved = True
@@ -251,13 +251,6 @@ class SizedPadType(Type):
def fixed_size(self):
return True
-class PadType(SizedPadType):
- '''
- Derived class which represents a padding field of given type.
- '''
- def __init__(self, elt):
- self.nmemb = "1" if (elt == None) else elt.get('bytes')
- SizedPadType.__init__(self, self.nmemb)
class ComplexType(Type):
'''
@@ -281,7 +274,6 @@ class ComplexType(Type):
# Resolve all of our field datatypes.
for child in list(self.elt):
- value_mask_pad = None
if child.tag == 'pad':
field_name = 'pad' + str(pads)
fkey = 'CARD8'
@@ -308,7 +300,6 @@ class ComplexType(Type):
fkey = 'CARD32'
type = ListType(child, module.get_type(fkey), self)
visible = True
- value_mask_pad = child.get('value-mask-pad')
else:
# Hit this on Reply
continue
@@ -320,17 +311,6 @@ class ComplexType(Type):
# Recursively resolve the type (could be another structure, list)
type.resolve(module)
- # Add a value-mask-pad if necessary
- if value_mask_pad != None:
- vmp_field_name = 'pad' + str(pads)
- vmp_fkey = 'CARD8'
- vmp_type = SizedPadType(value_mask_pad)
- pads = pads + 1
- vmp_visible = False
- vmp_field_type = module.get_type_name(vmp_fkey)
- vmp_type.make_member_of(module, self, vmp_field_type, vmp_field_name, vmp_visible, True, False)
- vmp_type.resolve(module)
-
self.calc_size() # Figure out how big we are
self.resolved = True