summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-13 11:34:20 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-13 11:35:37 +1000
commit386283e4a6653eef5e92bad8867b64a3e10a5138 (patch)
treeb07dddc63b2761330f50780d85cbe514e45e453e
parentd02c85fbd2a204a78a9d515960d817ed37e3d492 (diff)
Reshuffle deviceid + sourceid in XI2 events to allow for common typecasting.
Except for two events, all events include a deviceid. Place it at the same position in the struct for these events to allow quick checking with common typecasts. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--include/X11/extensions/XInput2.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h
index 00ecf40..72405f1 100644
--- a/include/X11/extensions/XInput2.h
+++ b/include/X11/extensions/XInput2.h
@@ -216,12 +216,12 @@ typedef struct {
int extension; /* XI extension offset */
int evtype;
Time time;
+ int deviceid;
+ int sourceid;
int detail;
Window root;
Window event;
Window child;
- int deviceid;
- int sourceid;
double root_x;
double root_y;
double event_x;
@@ -240,9 +240,9 @@ typedef struct {
int extension; /* XI extension offset */
int evtype; /* XI_RawEvent */
Time time;
- int detail;
int deviceid;
int sourceid;
+ int detail;
int eventtype;
XIValuatorState valuators;
double *raw_values;
@@ -256,12 +256,12 @@ typedef struct {
int extension; /* XI extension offset */
int evtype;
Time time;
+ int deviceid;
+ int sourceid;
int detail;
Window root;
Window event;
Window child;
- int deviceid;
- int sourceid;
double root_x;
double root_y;
double event_x;