|
 |
7ef2687 |
From d42d791806f8917f32e869f01e0895400bfb2688 Mon Sep 17 00:00:00 2001
|
|
|
7ef2687 |
From: Daniel Stone <daniel@fooishbar.org>
|
|
|
7ef2687 |
Date: Thu, 21 Jun 2012 11:40:02 +0000
|
|
|
7ef2687 |
Subject: XKB: Fix broken events
|
|
|
7ef2687 |
|
|
|
7ef2687 |
XKB events all have exactly the same event number - 0 (from the XKB
|
|
|
7ef2687 |
event base). Within this, they're all multiplexed by the xkbType field,
|
|
|
7ef2687 |
which comes immediately after the event type field, before the sequence
|
|
|
7ef2687 |
number. Without this field, the events are pretty much useless, so add
|
|
|
7ef2687 |
it manually.
|
|
|
7ef2687 |
|
|
|
7ef2687 |
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
|
|
|
7ef2687 |
Reviewed-by: Uli Schlachter <psychon@znc.in>
|
|
|
7ef2687 |
Signed-off-by: Julien Danjou <julien@danjou.info>
|
|
|
7ef2687 |
---
|
|
|
7ef2687 |
diff --git a/src/xkb.xml b/src/xkb.xml
|
|
|
7ef2687 |
index e8f4c02..a6ef374 100644
|
|
|
7ef2687 |
--- a/src/xkb.xml
|
|
|
7ef2687 |
+++ b/src/xkb.xml
|
|
|
7ef2687 |
@@ -2593,7 +2593,9 @@ authorization from the authors.
|
|
|
7ef2687 |
|
|
|
7ef2687 |
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="NewKeyboardNotify" number="0">
|
|
|
7ef2687 |
+ <event name="NewKeyboardNotify" number="0" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<field name="oldDeviceID" type="CARD8" />
|
|
|
7ef2687 |
@@ -2607,7 +2609,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="14" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="MapNotify" number="1">
|
|
|
7ef2687 |
+ <event name="MapNotify" number="1" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<field name="ptrBtnActions" type="CARD8" />
|
|
|
7ef2687 |
@@ -2632,7 +2636,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="2" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="StateNotify" number="2">
|
|
|
7ef2687 |
+ <event name="StateNotify" number="2" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<field name="mods" type="CARD8" mask="ModMask" />
|
|
|
7ef2687 |
@@ -2656,7 +2662,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<field name="requestMinor" type="CARD8" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="ControlsNotify" number="3">
|
|
|
7ef2687 |
+ <event name="ControlsNotify" number="3" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<field name="numGroups" type="CARD8" />
|
|
|
7ef2687 |
@@ -2671,7 +2679,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="4" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="IndicatorStateNotify" number="4">
|
|
|
7ef2687 |
+ <event name="IndicatorStateNotify" number="4" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<pad bytes="3" />
|
|
|
7ef2687 |
@@ -2680,7 +2690,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="12" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="IndicatorMapNotify" number="5">
|
|
|
7ef2687 |
+ <event name="IndicatorMapNotify" number="5" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<pad bytes="3" />
|
|
|
7ef2687 |
@@ -2689,7 +2701,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="12" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="NamesNotify" number="6">
|
|
|
7ef2687 |
+ <event name="NamesNotify" number="6" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<pad bytes="1" />
|
|
|
7ef2687 |
@@ -2709,7 +2723,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="4" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="CompatMapNotify" number="7">
|
|
|
7ef2687 |
+ <event name="CompatMapNotify" number="7" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<field name="changedGroups" type="CARD8" mask="SetOfGroup" />
|
|
|
7ef2687 |
@@ -2719,7 +2735,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="16" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="BellNotify" number="8">
|
|
|
7ef2687 |
+ <event name="BellNotify" number="8" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<field name="bellClass" type="CARD8" enum="BellClassResult" />
|
|
|
7ef2687 |
@@ -2733,7 +2751,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="7" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="ActionMessage" number="9">
|
|
|
7ef2687 |
+ <event name="ActionMessage" number="9" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<field name="keycode" type="KEYCODE" />
|
|
|
7ef2687 |
@@ -2747,7 +2767,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="10" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="AccessXNotify" number="10">
|
|
|
7ef2687 |
+ <event name="AccessXNotify" number="10" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<field name="keycode" type="KEYCODE" />
|
|
|
7ef2687 |
@@ -2757,7 +2779,9 @@ authorization from the authors.
|
|
|
7ef2687 |
<pad bytes="16" />
|
|
|
7ef2687 |
</event>
|
|
|
7ef2687 |
|
|
|
7ef2687 |
- <event name="ExtensionDeviceNotify" number="11">
|
|
|
7ef2687 |
+ <event name="ExtensionDeviceNotify" number="11" no-sequence-number="true">
|
|
|
7ef2687 |
+ <field name="xkbType" type="CARD8" />
|
|
|
7ef2687 |
+ <field name="sequence" type="CARD16" />
|
|
|
7ef2687 |
<field name="time" type="TIMESTAMP" />
|
|
|
7ef2687 |
<field name="deviceID" type="CARD8" />
|
|
|
7ef2687 |
<pad bytes="1" />
|
|
|
7ef2687 |
--
|
|
|
7ef2687 |
cgit v0.9.0.2-2-gbebe
|