summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorThomas Jaeger <ThJaeger@gmail.com>2012-10-13 22:39:27 -0400
committerPeter Hutterer <peter.hutterer@who-t.net>2012-11-19 12:12:28 +1000
commitaa9da5eae109154edf740a5c1eee4bf98e8fbd4f (patch)
treeda07e091cf72c95a026452e6757f24746012cc8c /dix
parent710065da37b68a9ec7a0c9dc995247f39e3d01e9 (diff)
remove init_event
The function is identical to init_device_event from inpututils.c with the first two arguments swapped. Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/getevents.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/dix/getevents.c b/dix/getevents.c
index 8b4379d1c..2a686e877 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -164,17 +164,6 @@ key_autorepeats(DeviceIntPtr pDev, int key_code)
}
static void
-init_event(DeviceIntPtr dev, DeviceEvent *event, Time ms)
-{
- memset(event, 0, sizeof(DeviceEvent));
- event->header = ET_Internal;
- event->length = sizeof(DeviceEvent);
- event->time = ms;
- event->deviceid = dev->id;
- event->sourceid = dev->id;
-}
-
-static void
init_touch_ownership(DeviceIntPtr dev, TouchOwnershipEvent *event, Time ms)
{
memset(event, 0, sizeof(TouchOwnershipEvent));
@@ -1915,7 +1904,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
event = &events->device_event;
num_events++;
- init_event(dev, event, ms);
+ init_device_event(event, dev, ms);
/* if submitted for master device, get the sourceid from there */
if (flags & TOUCH_CLIENT_ID) {
event->sourceid = touchpoint.dix_ti->sourceid;