summaryrefslogtreecommitdiff
path: root/src/XExtInt.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-05-12 19:25:15 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-05-12 19:25:15 +1000
commitb4d74eebcec3080fa4ac33c74835246457b00de3 (patch)
treeda1f61fc2e1156d85a4ac23ddda473a3279e8a39 /src/XExtInt.c
parenteebdca00c416924b0423879a62498df8afed633e (diff)
Adust to new device names (less "Device" in function names)
Diffstat (limited to 'src/XExtInt.c')
-rw-r--r--src/XExtInt.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/XExtInt.c b/src/XExtInt.c
index beb8127..a0cc3b0 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -130,9 +130,9 @@ wireToDeviceEvent(xXIDeviceEvent *in, XIDeviceEvent* out);
static int
wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XIDeviceChangedEvent* out);
static int
-wireToHierarchyChangedEvent(xXIDeviceHierarchyEvent *in, XIDeviceHierarchyEvent* out);
+wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XIHierarchyEvent* out);
static int
-wireToRawEvent(xXIRawDeviceEvent *in, XIRawDeviceEvent *out);
+wireToRawEvent(xXIRawEvent *in, XIRawEvent *out);
static int
wireToEnterLeave(xXIEnterEvent *in, XIEnterEvent *out);
static int
@@ -818,8 +818,8 @@ XInputWireToEvent(
return ENQUEUE_EVENT;
case XI_HierarchyChanged:
*re = *save;
- if (!wireToHierarchyChangedEvent((xXIDeviceHierarchyEvent*)event,
- (XIDeviceHierarchyEvent*)re))
+ if (!wireToHierarchyChangedEvent((xXIHierarchyEvent*)event,
+ (XIHierarchyEvent*)re))
{
printf("XInputWireToEvent: CONVERSION FAILURE! evtype=%d\n",
ge->evtype);
@@ -829,7 +829,7 @@ XInputWireToEvent(
case XI_RawEvent:
*re = *save;
- if (!wireToRawEvent((xXIRawDeviceEvent*)event, (XIRawDeviceEvent*)re))
+ if (!wireToRawEvent((xXIRawEvent*)event, (XIRawEvent*)re))
{
printf("XInputWireToEvent: CONVERSION FAILURE! evtype=%d\n",
ge->evtype);
@@ -971,7 +971,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XIDeviceChangedEvent* out)
}
static int
-wireToHierarchyChangedEvent(xXIDeviceHierarchyEvent *in, XIDeviceHierarchyEvent* out)
+wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XIHierarchyEvent* out)
{
int i;
XIHierarchyInfo *info_out;
@@ -1001,7 +1001,7 @@ wireToHierarchyChangedEvent(xXIDeviceHierarchyEvent *in, XIDeviceHierarchyEvent*
}
static int
-wireToRawEvent(xXIRawDeviceEvent *in, XIRawDeviceEvent *out)
+wireToRawEvent(xXIRawEvent *in, XIRawEvent *out)
{
int len, i;
FP3232 *values;