[PATCH] Improve the ButtonInfo description.
It failed to mention it is followed by a bit-mask and then the atoms.
Signed-off-by: Roman Kapl
---
include/X11/extensions/XI2proto.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/X11/extensions/XI2proto.h
b/include/X11/extensions/XI2proto.h
index 4cdaa0d..28a9062 100644
--- a/include/X11/extensions/XI2proto.h
+++ b/include/X11/extensions/XI2proto.h
@@ -149,8 +149,9 @@ typedef struct {
/**
* Denotes button capability on a device.
- * Struct is followed by num_buttons * Atom that names the buttons in the
- * device-native setup (i.e. ignoring button mappings).
+ * Struct is followed by a button bit-mask (padded to four byte chunks) and
+ * then num_buttons * Atom that names the buttons in the device-native setup
+ * (i.e. ignoring button mappings).
*/
typedef struct {
uint16_ttype; /**< Always ButtonClass */
--
2.17.1
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xserver 1/2] Xi: fix byte-swapping of button labels
The byte-swapping code forgot that the xXIButtonInfo is followed by a
button mask, not directly by the button labels. This resulted in client
crashes in cross-endian setups, for example in `xinput list --long`,
since the client got an invalid atom.
A new function was introduced to get the right positions for the label
and mask data.
Signed-off-by: Roman Kapl
---
Xi/xiquerydevice.c | 26 --
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index cf909..5f5a5f82f 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -237,6 +237,18 @@ SizeDeviceClasses(DeviceIntPtr dev)
return len;
}
+/**
+ * Get pointers to button information areas holding button mask and labels.
+ */
+static void
+ButtonInfoData(xXIButtonInfo *info, int *mask_words, unsigned char **mask,
+ Atom **atoms)
+{
+*mask_words = bytes_to_int32(bits_to_bytes(info->num_buttons));
+*mask = (unsigned char*) &info[1];
+*atoms = (Atom*) ((*mask) + (*mask_words) * 4);
+}
+
/**
* Write button information into info.
* @return Number of bytes written into info.
@@ -245,21 +257,20 @@ int
ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo * info, Bool reportState)
{
unsigned char *bits;
+Atom *labels;
int mask_len;
int i;
if (!dev || !dev->button)
return 0;
-mask_len = bytes_to_int32(bits_to_bytes(dev->button->numButtons));
-
info->type = ButtonClass;
info->num_buttons = dev->button->numButtons;
+ButtonInfoData(info, &mask_len, &bits, &labels);
info->length = bytes_to_int32(sizeof(xXIButtonInfo)) +
info->num_buttons + mask_len;
info->sourceid = dev->button->sourceid;
-bits = (unsigned char *) &info[1];
memset(bits, 0, mask_len * 4);
if (reportState)
@@ -267,8 +278,7 @@ ListButtonInfo(DeviceIntPtr dev, xXIButtonInfo * info, Bool
reportState)
if (BitIsOn(dev->button->down, i))
SetBit(bits, i);
-bits += mask_len * 4;
-memcpy(bits, dev->button->labels, dev->button->numButtons * sizeof(Atom));
+memcpy(labels, dev->button->labels, dev->button->numButtons *
sizeof(Atom));
return info->length * 4;
}
@@ -277,13 +287,17 @@ static void
SwapButtonInfo(DeviceIntPtr dev, xXIButtonInfo * info)
{
Atom *btn;
+int mask_len;
+unsigned char *mask;
+
int i;
+ButtonInfoData(info, &mask_len, &mask, &btn);
swaps(&info->type);
swaps(&info->length);
swaps(&info->sourceid);
-for (i = 0, btn = (Atom *) &info[1]; i < info->num_buttons; i++, btn++)
+for (i = 0 ; i < info->num_buttons; i++, btn++)
swapl(btn);
swaps(&info->num_buttons);
--
2.17.1
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xserver 0/2] Cross-endianess fixes in XInput
Two smallish patches to fix some XInput bits on cross-endianess clients. It adds or moves around swap(x) as needed. There is also a documentation fix in XProto, this will be sent separately. Roman Kapl (2): Xi: fix byte-swapping of button labels Xi: add forgotten byte-swaps for Valuator fields Xi/xiquerydevice.c | 29 +++-- 1 file changed, 23 insertions(+), 6 deletions(-) -- 2.17.1 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xserver 2/2] Xi: add forgotten byte-swaps for Valuator fields
This has caused nonsensical values in xinput output. Signed-off-by: Roman Kapl --- Xi/xiquerydevice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index 5f5a5f82f..fbb51fe81 100644 --- a/Xi/xiquerydevice.c +++ b/Xi/xiquerydevice.c @@ -383,6 +383,9 @@ SwapValuatorInfo(DeviceIntPtr dev, xXIValuatorInfo * info) swapl(&info->min.frac); swapl(&info->max.integral); swapl(&info->max.frac); +swapl(&info->value.integral); +swapl(&info->value.frac); +swapl(&info->resolution); swaps(&info->number); swaps(&info->sourceid); } -- 2.17.1 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
[PATCH v2] Improve the ButtonInfo description.
It failed to mention it is followed by a bit-mask and then the atoms.
Signed-off-by: Roman Kapl
---
The previous patch was done incorrectly against xorgproto, I guess that's the
old repo.
XI2proto.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/XI2proto.h b/XI2proto.h
index 4cdaa0d..28a9062 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -149,8 +149,9 @@ typedef struct {
/**
* Denotes button capability on a device.
- * Struct is followed by num_buttons * Atom that names the buttons in the
- * device-native setup (i.e. ignoring button mappings).
+ * Struct is followed by a button bit-mask (padded to four byte chunks) and
+ * then num_buttons * Atom that names the buttons in the device-native setup
+ * (i.e. ignoring button mappings).
*/
typedef struct {
uint16_ttype; /**< Always ButtonClass */
--
2.17.1
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
