aboutsummaryrefslogtreecommitdiff
path: root/libxcb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-08-22 21:57:21 +0200
committermarha <marha@users.sourceforge.net>2014-08-22 21:57:21 +0200
commit112d89481850102f28b6e7ff4f40b65c41e11f6c (patch)
tree9e22963aeda3f588d4aa3aa270fdba74922028c7 /libxcb
parentbcb354180f20f0c410a77bd32cbf2c1e799632d5 (diff)
parent6c0c95d6045d2d2b4e6a3a2f11457850031c57bc (diff)
downloadvcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.gz
vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.bz2
vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libxcb')
-rw-r--r--libxcb/xcb-proto/src/xinput.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml
index 86350dea0..cdb414db4 100644
--- a/libxcb/xcb-proto/src/xinput.xml
+++ b/libxcb/xcb-proto/src/xinput.xml
@@ -613,6 +613,7 @@ authorization from the authors.
<field type="CARD32" name="mask" />
<field type="CARD8" name="device_id" />
<field type="CARD8" name="feedback_id" />
+ <pad bytes="2" />
<field type="FeedbackCtl" name="feedback" />
</request>
@@ -671,7 +672,7 @@ authorization from the authors.
<request name="SetDeviceModifierMapping" opcode="27">
<field type="CARD8" name="device_id" />
<field type="CARD8" name="keycodes_per_modifier" />
- <pad bytes="1" />
+ <pad bytes="2" />
<list type="CARD8" name="keymaps">
<op op="*">
<fieldref>keycodes_per_modifier</fieldref>