diff options
Diffstat (limited to 'libxcb/src')
| -rw-r--r-- | libxcb/src/c_client.py | 12 | ||||
| -rw-r--r-- | libxcb/src/xcb.h | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py index 99fd307b0..45de54413 100644 --- a/libxcb/src/c_client.py +++ b/libxcb/src/c_client.py @@ -1762,7 +1762,7 @@ def c_simple(self, name): # Iterator _c_iterator(self, name) -def _c_complex(self): +def _c_complex(self, force_packed = False): ''' Helper function for handling all structure types. Called for all structs, requests, replies, events, errors. @@ -1817,7 +1817,7 @@ def _c_complex(self): if b.type.has_name: _h(' } %s;', b.c_field_name) - _h('} %s;', self.c_type) + _h('} %s%s;', 'XCB_PACKED ' if force_packed else '', self.c_type) def c_struct(self, name): ''' @@ -2902,6 +2902,7 @@ def c_event(self, name): # events while generating the structure for them. Otherwise we would read # garbage (the internal full_sequence) when accessing normal event fields # there. + force_packed = False if hasattr(self, 'is_ge_event') and self.is_ge_event and self.name == name: event_size = 0 for field in self.fields: @@ -2911,6 +2912,11 @@ def c_event(self, name): full_sequence = Field(tcard32, tcard32.name, 'full_sequence', False, True, True) idx = self.fields.index(field) self.fields.insert(idx + 1, full_sequence) + + # If the event contains any 64-bit extended fields, they need + # to remain aligned on a 64-bit boundary. Adding full_sequence + # would normally break that; force the struct to be packed. + force_packed = any(f.type.size == 8 and f.type.is_simple for f in self.fields[(idx+1):]) break _c_type_setup(self, name, ('event',)) @@ -2920,7 +2926,7 @@ def c_event(self, name): if self.name == name: # Structure definition - _c_complex(self) + _c_complex(self, force_packed) else: # Typedef _h('') diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h index e62c985d5..73c77a3a1 100644 --- a/libxcb/src/xcb.h +++ b/libxcb/src/xcb.h @@ -51,6 +51,8 @@ extern "C" { * @file xcb.h */ +#define XCB_PACKED __attribute__((__packed__)) + /** * @defgroup XCB_Core_API XCB Core API * @brief Core API of the XCB library. |