aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/Xi')
-rw-r--r--xorg-server/Xi/exevents.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 33a280d3f..5b50fd58e 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -1471,7 +1471,7 @@ static void
DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
InternalEvent *ev)
{
- InternalEvent motion;
+ DeviceEvent motion;
if (ti->num_listeners) {
ClientPtr client;
@@ -1483,11 +1483,11 @@ DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
ti->listeners[0].type != LISTENER_POINTER_GRAB)
return;
- motion = *ev;
- motion.any.type = ET_TouchUpdate;
- motion.device_event.detail.button = 0;
+ motion = ev->device_event;
+ motion.type = ET_TouchUpdate;
+ motion.detail.button = 0;
- if (!RetrieveTouchDeliveryData(dev, ti, &motion,
+ if (!RetrieveTouchDeliveryData(dev, ti, (InternalEvent*)&motion,
&ti->listeners[0], &client, &win, &grab,
&mask))
return;
@@ -1502,18 +1502,18 @@ DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
}
}
- DeliverTouchEmulatedEvent(dev, ti, &motion, &ti->listeners[0], client,
+ DeliverTouchEmulatedEvent(dev, ti, (InternalEvent*)&motion, &ti->listeners[0], client,
win, grab, mask);
}
else {
InternalEvent button;
int converted;
- converted = TouchConvertToPointerEvent(ev, &motion, &button);
+ converted = TouchConvertToPointerEvent(ev, (InternalEvent*)&motion, &button);
BUG_WARN(converted == 0);
if (converted)
- ProcessOtherEvent(&motion, dev);
+ ProcessOtherEvent((InternalEvent*)&motion, dev);
}
}