fdo-mirrors/xorg-xcbproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xcbproto.git synced 2026-05-07 06:08:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

XKB: Fix broken events

Browse source 
XKB events all have exactly the same event number - 0 (from the XKB
event base).  Within this, they're all multiplexed by the xkbType field,
which comes immediately after the event type field, before the sequence
number.  Without this field, the events are pretty much useless, so add
it manually.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Uli Schlachter <psychon@znc.in>
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Daniel Stone 2012-06-21 12:40:02 +01:00 • committed by Julien Danjou
parent 5a4e42f37a
commit d42d791806
1 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/xkb.xml
View file

@ -2593,7 +2593,9 @@ authorization from the authors.
<!-- Events --> <!-- Events -->
<event name="NewKeyboardNotify" number="0"> <event name="NewKeyboardNotify" number="0" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<field name="oldDeviceID" type="CARD8" /> <field name="oldDeviceID" type="CARD8" />
@ -2607,7 +2609,9 @@ authorization from the authors.
<pad bytes="14" /> <pad bytes="14" />
</event> </event>
<event name="MapNotify" number="1"> <event name="MapNotify" number="1" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<field name="ptrBtnActions" type="CARD8" /> <field name="ptrBtnActions" type="CARD8" />
@ -2632,7 +2636,9 @@ authorization from the authors.
<pad bytes="2" /> <pad bytes="2" />
</event> </event>
<event name="StateNotify" number="2"> <event name="StateNotify" number="2" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<field name="mods" type="CARD8" mask="ModMask" /> <field name="mods" type="CARD8" mask="ModMask" />
@ -2656,7 +2662,9 @@ authorization from the authors.
<field name="requestMinor" type="CARD8" /> <field name="requestMinor" type="CARD8" />
</event> </event>
<event name="ControlsNotify" number="3"> <event name="ControlsNotify" number="3" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<field name="numGroups" type="CARD8" /> <field name="numGroups" type="CARD8" />
@ -2671,7 +2679,9 @@ authorization from the authors.
<pad bytes="4" /> <pad bytes="4" />
</event> </event>
<event name="IndicatorStateNotify" number="4"> <event name="IndicatorStateNotify" number="4" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<pad bytes="3" /> <pad bytes="3" />
@ -2680,7 +2690,9 @@ authorization from the authors.
<pad bytes="12" /> <pad bytes="12" />
</event> </event>
<event name="IndicatorMapNotify" number="5"> <event name="IndicatorMapNotify" number="5" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<pad bytes="3" /> <pad bytes="3" />
@ -2689,7 +2701,9 @@ authorization from the authors.
<pad bytes="12" /> <pad bytes="12" />
</event> </event>
<event name="NamesNotify" number="6"> <event name="NamesNotify" number="6" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<pad bytes="1" /> <pad bytes="1" />
@ -2709,7 +2723,9 @@ authorization from the authors.
<pad bytes="4" /> <pad bytes="4" />
</event> </event>
<event name="CompatMapNotify" number="7"> <event name="CompatMapNotify" number="7" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<field name="changedGroups" type="CARD8" mask="SetOfGroup" /> <field name="changedGroups" type="CARD8" mask="SetOfGroup" />
@ -2719,7 +2735,9 @@ authorization from the authors.
<pad bytes="16" /> <pad bytes="16" />
</event> </event>
<event name="BellNotify" number="8"> <event name="BellNotify" number="8" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<field name="bellClass" type="CARD8" enum="BellClassResult" /> <field name="bellClass" type="CARD8" enum="BellClassResult" />
@ -2733,7 +2751,9 @@ authorization from the authors.
<pad bytes="7" /> <pad bytes="7" />
</event> </event>
<event name="ActionMessage" number="9"> <event name="ActionMessage" number="9" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<field name="keycode" type="KEYCODE" /> <field name="keycode" type="KEYCODE" />
@ -2747,7 +2767,9 @@ authorization from the authors.
<pad bytes="10" /> <pad bytes="10" />
</event> </event>
<event name="AccessXNotify" number="10"> <event name="AccessXNotify" number="10" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<field name="keycode" type="KEYCODE" /> <field name="keycode" type="KEYCODE" />
@ -2757,7 +2779,9 @@ authorization from the authors.
<pad bytes="16" /> <pad bytes="16" />
</event> </event>
<event name="ExtensionDeviceNotify" number="11"> <event name="ExtensionDeviceNotify" number="11" no-sequence-number="true">
<field name="xkbType" type="CARD8" />
<field name="sequence" type="CARD16" />
<field name="time" type="TIMESTAMP" /> <field name="time" type="TIMESTAMP" />
<field name="deviceID" type="CARD8" /> <field name="deviceID" type="CARD8" />
<pad bytes="1" /> <pad bytes="1" />