[Xcb] [PATCH 2/3] xkb: Pad structs CommonDoodad and SALockDeviceBtn

Daniel Martin consume.noise at gmail.com
Mon Aug 19 14:00:21 PDT 2013


* CommonDoodad is xkbAnyDoodadWireDesc in XKBproto.h. There it has a
  size of 20 like all Doodads:
    #define sz_xkbAnyDoodadWireDesc 20
  Add the necessary 8 bytes of padding.

* SALockDeviceBtn is an Action. All Actions are handled by the server
  and libX11 with sizeof(xkbActionWireDesc) or
  SIZEOF(xkbActionWireDesc). Which results in a size of 8:
    #define sz_xkbActionWireDesc 8 /* in XKBproto.h */
  Add the necessary 3 bytes of padding.

Signed-off-by: Daniel Martin <consume.noise at gmail.com>
---
 src/xkb.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/xkb.xml b/src/xkb.xml
index b702cad..df5d614 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -648,6 +648,7 @@ <struct name="CommonDoodad">
 		<field name="top" type="INT16" />
 		<field name="left" type="INT16" />
 		<field name="angle" type="INT16" />
+		<pad bytes="8" />
 	</struct>
 
 	<struct name="ShapeDoodad">
@@ -1002,6 +1003,7 @@ <struct name="SALockDeviceBtn">
 		<pad bytes="1" />
 		<field name="button" type="CARD8" />
 		<field name="device" type="CARD8" />
+		<pad bytes="3" />
 	</struct>
 
 	<enum name="SAValWhat">
-- 
1.8.3.3



More information about the Xcb mailing list