summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-10-31 17:53:39 +1030
committerPeter Hutterer <peter.hutterer@redhat.com>2008-11-17 10:08:54 +1000
commitd81ca85c4bcdcab208e4731a5d0f7d9bffbfab67 (patch)
treed6d3e69426c5daaabfbbc6bb592fb92fae85a89e
parente22b0ace88447a87c0b19d062a678880529b1b3b (diff)
PropertyNotify, move deviceid back to last byte.
This way, it can be type-cast to deviceKeyButtonPointer to extract the deviceid, which is (aside from time) the only thing it has in common with those anyway. (cherry picked from commit f8064629496c6061bedb7a99b788fb9d3a170f11)
-rw-r--r--XIproto.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/XIproto.h b/XIproto.h
index 55a2d3b..67c4755 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -1783,18 +1783,18 @@ typedef struct
typedef struct
{
- BYTE type; /* always GenericEvent */
+ BYTE type;
BYTE state; /* NewValue or Deleted */
CARD16 sequenceNumber B16;
CARD32 time B32;
Atom atom B32; /* affected property */
- CARD8 deviceid; /* id of device */
- CARD8 pad0;
- CARD16 pad1 B16;
+ CARD32 pad0 B32;
+ CARD32 pad1 B32;
CARD32 pad2 B32;
CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
+ CARD16 pad5 B16;
+ CARD8 pad4;
+ CARD8 deviceid; /* id of device */
} devicePropertyNotify;