diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-05 17:14:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-05 17:14:35 +0100 |
| commit | 1b37f71714e2ca4af60bd050adbbb7969534dfd6 (patch) | |
| tree | fddb228ad86cd15742a6a05d3de3995e460f4bac /libxcb | |
| parent | f93b0a79de9ea56bea3e24797cc72625d9dcee3c (diff) | |
| download | vcxsrv-1b37f71714e2ca4af60bd050adbbb7969534dfd6.tar.gz vcxsrv-1b37f71714e2ca4af60bd050adbbb7969534dfd6.tar.bz2 vcxsrv-1b37f71714e2ca4af60bd050adbbb7969534dfd6.zip | |
randrproto libXau libxcb mesa mkfontscale pixman git update 5 Jan 2014
xserver commit 2ea973e12f5d954211e1d10085a4c74581b43aca
libxcb commit 3b72a2c9d1d656c74c691a45689e1d637f669e3a
libxcb/xcb-proto commit 0d8f09b6469c45be08dae3665d352269ffcc7df2
xkeyboard-config commit 8f49a59f8cd118564ec1554d428177d681bc8b7f
libX11 commit 3d69b0a83e62f8f6fbdd952fc49cdbdf8825e1e6
libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854
libXext commit bb24f2970f2e425f4df90c9b73d078ad15a73fbb
libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a
libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909
libXau commit 1e4635be11154dd8262f37b379511bd627defa2a
xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943
pixman commit 82d094654a46bd97d47f1f132a01ae0a74b986f3
xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7
randrproto commit 19fc4c5a72eb9919d720ad66734029d9f8e313b1
glproto commit f84853d97d5749308992412a215fa518b6536eb3
mkfontscale commit eac564e0fc9052a39981ea47b271f7f3d2821944
xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13
libXft commit 4acfdaf95adb0a05c2a25550bdde036c865902f4
libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63
libxtrans commit 2c0a7840a28ae696e80e73157856d7a049fdf6c7
fontconfig commit 5c725f2f5829238d16116f782d00d8bb0defaf08
mesa commit a61ae2aa01c9b1976ba4107c1564e0c3f94aea4d
Diffstat (limited to 'libxcb')
| -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. |