summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-05-12 21:33:54 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-05-16 12:20:58 +1000
commit8ff1bff8f462b15e05fc298704e1e40cb244587f (patch)
tree597332ece4d47659363f41ef4f0f8906f69ec3fd
parentbbf266cca3de726e3eb932d66dd5b8981ef40fa8 (diff)
Update to new XI2 names
-rw-r--r--Xi/chdevcur.c14
-rw-r--r--Xi/chdevcur.h4
-rw-r--r--Xi/chdevhier.c22
-rw-r--r--Xi/chdevhier.h4
-rw-r--r--Xi/extinit.c36
-rw-r--r--Xi/querydp.c26
-rw-r--r--Xi/querydp.h10
-rw-r--r--Xi/warpdevp.c12
-rw-r--r--Xi/warpdevp.h4
-rw-r--r--Xi/xiselectev.c16
-rw-r--r--Xi/xisetdevfocus.c30
-rw-r--r--Xi/xisetdevfocus.h8
-rw-r--r--dix/eventconvert.c6
-rw-r--r--test/input.c10
14 files changed, 100 insertions, 102 deletions
diff --git a/Xi/chdevcur.c b/Xi/chdevcur.c
index ed1570bc8..0315edba5 100644
--- a/Xi/chdevcur.c
+++ b/Xi/chdevcur.c
@@ -54,25 +54,25 @@
*/
int
-SProcXIChangeDeviceCursor(ClientPtr client)
+SProcXIChangeCursor(ClientPtr client)
{
char n;
- REQUEST(xXIChangeDeviceCursorReq);
+ REQUEST(xXIChangeCursorReq);
swaps(&stuff->length, n);
- REQUEST_SIZE_MATCH(xXIChangeDeviceCursorReq);
- return (ProcXIChangeDeviceCursor(client));
+ REQUEST_SIZE_MATCH(xXIChangeCursorReq);
+ return (ProcXIChangeCursor(client));
}
-int ProcXIChangeDeviceCursor(ClientPtr client)
+int ProcXIChangeCursor(ClientPtr client)
{
int rc;
WindowPtr pWin = NULL;
DeviceIntPtr pDev = NULL;
CursorPtr pCursor = NULL;
- REQUEST(xXIChangeDeviceCursorReq);
- REQUEST_SIZE_MATCH(xXIChangeDeviceCursorReq);
+ REQUEST(xXIChangeCursorReq);
+ REQUEST_SIZE_MATCH(xXIChangeCursorReq);
rc = dixLookupDevice(&pDev, stuff->deviceid, client, DixSetAttrAccess);
if (rc != Success)
diff --git a/Xi/chdevcur.h b/Xi/chdevcur.h
index 4f7f44b98..dc6ccb1af 100644
--- a/Xi/chdevcur.h
+++ b/Xi/chdevcur.h
@@ -30,7 +30,7 @@
#ifndef CHDEVCUR_H
#define CHDEVCUR_H 1
-int SProcXIChangeDeviceCursor(ClientPtr /* client */);
-int ProcXIChangeDeviceCursor(ClientPtr /* client */);
+int SProcXIChangeCursor(ClientPtr /* client */);
+int ProcXIChangeCursor(ClientPtr /* client */);
#endif /* CHDEVCUR_H */
diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c
index ae5377dbd..e59bfab32 100644
--- a/Xi/chdevhier.c
+++ b/Xi/chdevhier.c
@@ -61,7 +61,7 @@ extern DevPrivateKey XTstDevicePrivateKey;
*/
void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
{
- xXIDeviceHierarchyEvent *ev;
+ xXIHierarchyEvent *ev;
xXIHierarchyInfo *info;
DeviceIntRec dummyDev;
DeviceIntPtr dev;
@@ -70,7 +70,7 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
if (!flags)
return;
- ev = xcalloc(1, sizeof(xXIDeviceHierarchyEvent) +
+ ev = xcalloc(1, sizeof(xXIHierarchyEvent) +
MAXDEVICES * sizeof(xXIHierarchyInfo));
ev->type = GenericEvent;
ev->extension = IReqCode;
@@ -128,29 +128,29 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
*
*/
-int SProcXIChangeDeviceHierarchy(ClientPtr client)
+int SProcXIChangeHierarchy(ClientPtr client)
{
char n;
- REQUEST(xXIChangeDeviceHierarchyReq);
+ REQUEST(xXIChangeHierarchyReq);
swaps(&stuff->length, n);
- return (ProcXIChangeDeviceHierarchy(client));
+ return (ProcXIChangeHierarchy(client));
}
#define SWAPIF(cmd) if (client->swapped) { cmd; }
int
-ProcXIChangeDeviceHierarchy(ClientPtr client)
+ProcXIChangeHierarchy(ClientPtr client)
{
DeviceIntPtr ptr, keybd, xtstptr, xtstkeybd;
xXIAnyHierarchyChangeInfo *any;
- int required_len = sizeof(xXIChangeDeviceHierarchyReq);
+ int required_len = sizeof(xXIChangeHierarchyReq);
char n;
int rc = Success;
int flags[MAXDEVICES] = {0};
- REQUEST(xXIChangeDeviceHierarchyReq);
- REQUEST_AT_LEAST_SIZE(xXIChangeDeviceHierarchyReq);
+ REQUEST(xXIChangeHierarchyReq);
+ REQUEST_AT_LEAST_SIZE(xXIChangeHierarchyReq);
if (!stuff->num_changes)
return rc;
@@ -167,7 +167,7 @@ ProcXIChangeDeviceHierarchy(ClientPtr client)
switch(any->type)
{
- case XICreateMasterDevice:
+ case XICreateMaster:
{
xXICreateMasterInfo* c = (xXICreateMasterInfo*)any;
char* name;
@@ -229,7 +229,7 @@ ProcXIChangeDeviceHierarchy(ClientPtr client)
xfree(name);
}
break;
- case XIRemoveMasterDevice:
+ case XIRemoveMaster:
{
xXIRemoveMasterInfo* r = (xXIRemoveMasterInfo*)any;
DeviceIntPtr xtstdevice;
diff --git a/Xi/chdevhier.h b/Xi/chdevhier.h
index d4ce517c1..b46cfb4e2 100644
--- a/Xi/chdevhier.h
+++ b/Xi/chdevhier.h
@@ -36,8 +36,8 @@
#ifndef CHDEVHIER_H
#define CHDEVHIER_H 1
-int SProcXIChangeDeviceHierarchy(ClientPtr /* client */);
-int ProcXIChangeDeviceHierarchy(ClientPtr /* client */);
+int SProcXIChangeHierarchy(ClientPtr /* client */);
+int ProcXIChangeHierarchy(ClientPtr /* client */);
void XISendDeviceHierarchyEvent(int flags[]);
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 4b82f622f..b8280106a 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -235,17 +235,17 @@ static int (*ProcIVector[])(ClientPtr) = {
ProcXDeleteDeviceProperty, /* 38 */
ProcXGetDeviceProperty, /* 39 */
/* XI 2 */
- ProcXIQueryDevicePointer, /* 40 */
- ProcXIWarpDevicePointer, /* 41 */
- ProcXIChangeDeviceCursor, /* 42 */
- ProcXIChangeDeviceHierarchy, /* 43 */
+ ProcXIQueryPointer, /* 40 */
+ ProcXIWarpPointer, /* 41 */
+ ProcXIChangeCursor, /* 42 */
+ ProcXIChangeHierarchy, /* 43 */
ProcXISetClientPointer, /* 44 */
ProcXIGetClientPointer, /* 45 */
ProcXISelectEvent, /* 46 */
ProcXIQueryVersion, /* 47 */
ProcXIQueryDevice, /* 48 */
- ProcXISetDeviceFocus, /* 49 */
- ProcXIGetDeviceFocus, /* 50 */
+ ProcXISetFocus, /* 49 */
+ ProcXIGetFocus, /* 50 */
ProcXIGrabDevice, /* 51 */
ProcXIUngrabDevice, /* 52 */
ProcXIAllowEvents, /* 53 */
@@ -299,17 +299,17 @@ static int (*SProcIVector[])(ClientPtr) = {
SProcXChangeDeviceProperty, /* 37 */
SProcXDeleteDeviceProperty, /* 38 */
SProcXGetDeviceProperty, /* 39 */
- SProcXIQueryDevicePointer, /* 40 */
- SProcXIWarpDevicePointer, /* 41 */
- SProcXIChangeDeviceCursor, /* 42 */
- SProcXIChangeDeviceHierarchy, /* 43 */
+ SProcXIQueryPointer, /* 40 */
+ SProcXIWarpPointer, /* 41 */
+ SProcXIChangeCursor, /* 42 */
+ SProcXIChangeHierarchy, /* 43 */
SProcXISetClientPointer, /* 44 */
SProcXIGetClientPointer, /* 45 */
SProcXISelectEvent, /* 46 */
SProcXIQueryVersion, /* 47 */
SProcXIQueryDevice, /* 48 */
- SProcXISetDeviceFocus, /* 49 */
- SProcXIGetDeviceFocus, /* 50 */
+ SProcXISetFocus, /* 49 */
+ SProcXIGetFocus, /* 50 */
SProcXIGrabDevice, /* 51 */
SProcXIUngrabDevice, /* 52 */
SProcXIAllowEvents, /* 53 */
@@ -502,9 +502,8 @@ SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep)
SRepXListDeviceProperties(client, len, (xListDevicePropertiesReply*)rep);
else if (rep->RepType == X_GetDeviceProperty)
SRepXGetDeviceProperty(client, len, (xGetDevicePropertyReply *) rep);
- else if (rep->RepType == X_XIQueryDevicePointer)
- SRepXIQueryDevicePointer(client, len,
- (xXIQueryDevicePointerReply *) rep);
+ else if (rep->RepType == X_XIQueryPointer)
+ SRepXIQueryPointer(client, len, (xXIQueryPointerReply *) rep);
else if (rep->RepType == X_XIGetClientPointer)
SRepXIGetClientPointer(client, len, (xXIGetClientPointerReply*) rep);
else if (rep->RepType == X_XIQueryDevice)
@@ -763,8 +762,8 @@ static void SDeviceEvent(xXIDeviceEvent *from, xXIDeviceEvent *to)
}
}
-static void SDeviceHierarchyEvent(xXIDeviceHierarchyEvent *from,
- xXIDeviceHierarchyEvent *to)
+static void SDeviceHierarchyEvent(xXIHierarchyEvent *from,
+ xXIHierarchyEvent *to)
{
int i;
char n;
@@ -816,8 +815,7 @@ XI2EventSwap(xGenericEvent *from, xGenericEvent *to)
(xXIDeviceChangedEvent*)to);
break;
case XI_HierarchyChanged:
- SDeviceHierarchyEvent((xXIDeviceHierarchyEvent*)from,
- (xXIDeviceHierarchyEvent*)to);
+ SDeviceHierarchyEvent((xXIHierarchyEvent*)from, (xXIHierarchyEvent*)to);
break;
case XI_PropertyEvent:
SXIPropertyEvent((xXIPropertyEvent*)from,
diff --git a/Xi/querydp.c b/Xi/querydp.c
index 1b45ae2b2..dee00fe39 100644
--- a/Xi/querydp.c
+++ b/Xi/querydp.c
@@ -58,26 +58,26 @@
*/
int
-SProcXIQueryDevicePointer(ClientPtr client)
+SProcXIQueryPointer(ClientPtr client)
{
char n;
- REQUEST(xXIQueryDevicePointerReq);
+ REQUEST(xXIQueryPointerReq);
swaps(&stuff->length, n);
- return (ProcXIQueryDevicePointer(client));
+ return (ProcXIQueryPointer(client));
}
int
-ProcXIQueryDevicePointer(ClientPtr client)
+ProcXIQueryPointer(ClientPtr client)
{
int rc;
- xXIQueryDevicePointerReply rep;
+ xXIQueryPointerReply rep;
DeviceIntPtr pDev, kbd;
WindowPtr pWin, t;
SpritePtr pSprite;
- REQUEST(xXIQueryDevicePointerReq);
- REQUEST_SIZE_MATCH(xXIQueryDevicePointerReq);
+ REQUEST(xXIQueryPointerReq);
+ REQUEST_SIZE_MATCH(xXIQueryPointerReq);
rc = dixLookupDevice(&pDev, stuff->deviceid, client, DixReadAccess);
if (rc != Success)
@@ -92,7 +92,7 @@ ProcXIQueryDevicePointer(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->win, client, DixReadAccess);
if (rc != Success)
{
- SendErrorToClient(client, IReqCode, X_XIQueryDevicePointer,
+ SendErrorToClient(client, IReqCode, X_XIQueryPointer,
stuff->win, rc);
return Success;
}
@@ -104,7 +104,7 @@ ProcXIQueryDevicePointer(ClientPtr client)
pSprite = pDev->spriteInfo->sprite;
rep.repType = X_Reply;
- rep.RepType = X_XIQueryDevicePointer;
+ rep.RepType = X_XIQueryPointer;
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.mask = pDev->button->state;
@@ -146,20 +146,20 @@ ProcXIQueryDevicePointer(ClientPtr client)
}
#endif
- WriteReplyToClient(client, sizeof(xXIQueryDevicePointerReply), &rep);
+ WriteReplyToClient(client, sizeof(xXIQueryPointerReply), &rep);
return Success;
}
/***********************************************************************
*
- * This procedure writes the reply for the XIQueryDevicePointer function,
+ * This procedure writes the reply for the XIQueryPointer function,
* if the client and server have a different byte ordering.
*
*/
void
-SRepXIQueryDevicePointer(ClientPtr client, int size,
- xXIQueryDevicePointerReply * rep)
+SRepXIQueryPointer(ClientPtr client, int size,
+ xXIQueryPointerReply * rep)
{
char n;
diff --git a/Xi/querydp.h b/Xi/querydp.h
index 48b621717..ea22376a6 100644
--- a/Xi/querydp.h
+++ b/Xi/querydp.h
@@ -30,10 +30,10 @@
#ifndef QUERYDP_H
#define QUERYDP_H 1
-int SProcXIQueryDevicePointer(ClientPtr /* client */);
-int ProcXIQueryDevicePointer(ClientPtr /* client */);
-void SRepXIQueryDevicePointer(ClientPtr /* client */ ,
- int /* size */ ,
- xXIQueryDevicePointerReply * /* rep */);
+int SProcXIQueryPointer(ClientPtr /* client */);
+int ProcXIQueryPointer(ClientPtr /* client */);
+void SRepXIQueryPointer(ClientPtr /* client */ ,
+ int /* size */ ,
+ xXIQueryPointerReply * /* rep */);
#endif /* QUERYDP_H */
diff --git a/Xi/warpdevp.c b/Xi/warpdevp.c
index 2317c8690..025a4cef7 100644
--- a/Xi/warpdevp.c
+++ b/Xi/warpdevp.c
@@ -54,17 +54,17 @@
*/
int
-SProcXIWarpDevicePointer(ClientPtr client)
+SProcXIWarpPointer(ClientPtr client)
{
char n;
- REQUEST(xXIWarpDevicePointerReq);
+ REQUEST(xXIWarpPointerReq);
swaps(&stuff->length, n);
- return (ProcXIWarpDevicePointer(client));
+ return (ProcXIWarpPointer(client));
}
int
-ProcXIWarpDevicePointer(ClientPtr client)
+ProcXIWarpPointer(ClientPtr client)
{
int rc;
int x, y;
@@ -73,8 +73,8 @@ ProcXIWarpDevicePointer(ClientPtr client)
SpritePtr pSprite;
ScreenPtr newScreen;
- REQUEST(xXIWarpDevicePointerReq);
- REQUEST_SIZE_MATCH(xXIWarpDevicePointerReq);
+ REQUEST(xXIWarpPointerReq);
+ REQUEST_SIZE_MATCH(xXIWarpPointerReq);
/* FIXME: panoramix stuff is missing, look at ProcWarpPointer */
diff --git a/Xi/warpdevp.h b/Xi/warpdevp.h
index edf95c054..aafc73904 100644
--- a/Xi/warpdevp.h
+++ b/Xi/warpdevp.h
@@ -30,7 +30,7 @@
#ifndef WARPDEVP_H
#define WARPDEVP_H 1
-int SProcXIWarpDevicePointer(ClientPtr /* client */);
-int ProcXIWarpDevicePointer(ClientPtr /* client */);
+int SProcXIWarpPointer(ClientPtr /* client */);
+int ProcXIWarpPointer(ClientPtr /* client */);
#endif /* WARPDEVP_H */
diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
index 601dec3f9..73097736e 100644
--- a/Xi/xiselectev.c
+++ b/Xi/xiselectev.c
@@ -41,7 +41,7 @@ SProcXISelectEvent(ClientPtr client)
{
char n;
int i;
- xXIDeviceEventMask* evmask;
+ xXIEventMask* evmask;
REQUEST(xXISelectEventsReq);
swaps(&stuff->length, n);
@@ -49,12 +49,12 @@ SProcXISelectEvent(ClientPtr client)
swapl(&stuff->window, n);
swaps(&stuff->num_masks, n);
- evmask = (xXIDeviceEventMask*)&stuff[1];
+ evmask = (xXIEventMask*)&stuff[1];
for (i = 0; i < stuff->num_masks; i++)
{
swaps(&evmask->deviceid, n);
swaps(&evmask->mask_len, n);
- evmask = (xXIDeviceEventMask*)(((char*)evmask) + evmask->mask_len * 4);
+ evmask = (xXIEventMask*)(((char*)evmask) + evmask->mask_len * 4);
}
return (ProcXISelectEvent(client));
@@ -67,7 +67,7 @@ ProcXISelectEvent(ClientPtr client)
WindowPtr win;
DeviceIntPtr dev;
DeviceIntRec dummy;
- xXIDeviceEventMask *evmask;
+ xXIEventMask *evmask;
int *types = NULL;
REQUEST(xXISelectEventsReq);
@@ -78,7 +78,7 @@ ProcXISelectEvent(ClientPtr client)
return rc;
/* check request validity */
- evmask = (xXIDeviceEventMask*)&stuff[1];
+ evmask = (xXIEventMask*)&stuff[1];
num_masks = stuff->num_masks;
while(num_masks--)
{
@@ -102,11 +102,11 @@ ProcXISelectEvent(ClientPtr client)
}
}
- evmask = (xXIDeviceEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4);
+ evmask = (xXIEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4);
}
/* Set masks on window */
- evmask = (xXIDeviceEventMask*)&stuff[1];
+ evmask = (xXIEventMask*)&stuff[1];
num_masks = stuff->num_masks;
while(num_masks--)
{
@@ -118,7 +118,7 @@ ProcXISelectEvent(ClientPtr client)
} else
dixLookupDevice(&dev, evmask->deviceid, client, DixReadAccess);
XISetEventMask(dev, win, client, evmask->mask_len * 4, (unsigned char*)&evmask[1]);
- evmask = (xXIDeviceEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4);
+ evmask = (xXIEventMask*)(((unsigned char*)evmask) + evmask->mask_len * 4);
}
RecalculateDeliverableEvents(win);
diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c
index 7201e65cd..32f7e597b 100644
--- a/Xi/xisetdevfocus.c
+++ b/Xi/xisetdevfocus.c
@@ -41,39 +41,39 @@
#include "xisetdevfocus.h"
int
-SProcXISetDeviceFocus(ClientPtr client)
+SProcXISetFocus(ClientPtr client)
{
char n;
- REQUEST(xXISetDeviceFocusReq);
+ REQUEST(xXISetFocusReq);
swaps(&stuff->length, n);
swaps(&stuff->deviceid, n);
swapl(&stuff->focus, n);
swapl(&stuff->time, n);
- return ProcXISetDeviceFocus(client);
+ return ProcXISetFocus(client);
}
int
-SProcXIGetDeviceFocus(ClientPtr client)
+SProcXIGetFocus(ClientPtr client)
{
char n;
- REQUEST(xXIGetDeviceFocusReq);
+ REQUEST(xXIGetFocusReq);
swaps(&stuff->length, n);
swaps(&stuff->deviceid, n);
- return ProcXIGetDeviceFocus(client);
+ return ProcXIGetFocus(client);
}
int
-ProcXISetDeviceFocus(ClientPtr client)
+ProcXISetFocus(ClientPtr client)
{
DeviceIntPtr dev;
int ret;
- REQUEST(xXISetDeviceFocusReq);
- REQUEST_AT_LEAST_SIZE(xXISetDeviceFocusReq);
+ REQUEST(xXISetFocusReq);
+ REQUEST_AT_LEAST_SIZE(xXISetFocusReq);
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetFocusAccess);
if (ret != Success)
@@ -86,14 +86,14 @@ ProcXISetDeviceFocus(ClientPtr client)
}
int
-ProcXIGetDeviceFocus(ClientPtr client)
+ProcXIGetFocus(ClientPtr client)
{
- xXIGetDeviceFocusReply rep;
+ xXIGetFocusReply rep;
DeviceIntPtr dev;
int ret;
- REQUEST(xXIGetDeviceFocusReq);
- REQUEST_AT_LEAST_SIZE(xXIGetDeviceFocusReq);
+ REQUEST(xXIGetFocusReq);
+ REQUEST_AT_LEAST_SIZE(xXIGetFocusReq);
ret = dixLookupDevice(&dev, stuff->deviceid, client, DixGetFocusAccess);
if (ret != Success)
@@ -102,7 +102,7 @@ ProcXIGetDeviceFocus(ClientPtr client)
return BadDevice;
rep.repType = X_Reply;
- rep.RepType = X_XIGetDeviceFocus;
+ rep.RepType = X_XIGetFocus;
rep.length = 0;
rep.sequenceNumber = client->sequence;
@@ -115,6 +115,6 @@ ProcXIGetDeviceFocus(ClientPtr client)
else
rep.focus = dev->focus->win->drawable.id;
- WriteReplyToClient(client, sizeof(xXIGetDeviceFocusReply), &rep);
+ WriteReplyToClient(client, sizeof(xXIGetFocusReply), &rep);
return Success;
}
diff --git a/Xi/xisetdevfocus.h b/Xi/xisetdevfocus.h
index 9bdeb7781..5ec1fa2cf 100644
--- a/Xi/xisetdevfocus.h
+++ b/Xi/xisetdevfocus.h
@@ -26,10 +26,10 @@
#ifndef XISETDEVFOCUS_H
#define XISETDEVFOCUS_H 1
-int SProcXISetDeviceFocus(ClientPtr client);
-int ProcXISetDeviceFocus(ClientPtr client);
+int SProcXISetFocus(ClientPtr client);
+int ProcXISetFocus(ClientPtr client);
-int SProcXIGetDeviceFocus(ClientPtr client);
-int ProcXIGetDeviceFocus(ClientPtr client);
+int SProcXIGetFocus(ClientPtr client);
+int ProcXIGetFocus(ClientPtr client);
#endif /* XISETDEVFOCUS_H */
diff --git a/dix/eventconvert.c b/dix/eventconvert.c
index 58fd6d2c2..97fc2add3 100644
--- a/dix/eventconvert.c
+++ b/dix/eventconvert.c
@@ -422,9 +422,9 @@ eventToDeviceEvent(DeviceEvent *ev, xEvent **xi)
static int
eventToRawEvent(RawDeviceEvent *ev, xEvent **xi)
{
- xXIRawDeviceEvent* raw;
+ xXIRawEvent* raw;
int vallen, nvals;
- int i, len = sizeof(xXIRawDeviceEvent);
+ int i, len = sizeof(xXIRawEvent);
char *ptr;
FP3232 *axisval;
@@ -435,7 +435,7 @@ eventToRawEvent(RawDeviceEvent *ev, xEvent **xi)
len += vallen * 4; /* valuators mask */
*xi = xcalloc(1, len);
- raw = (xXIRawDeviceEvent*)*xi;
+ raw = (xXIRawEvent*)*xi;
raw->type = GenericEvent;
raw->extension = IReqCode;
raw->evtype = GetXI2Type((InternalEvent*)ev);
diff --git a/test/input.c b/test/input.c
index 238cad339..cca1291c2 100644
--- a/test/input.c
+++ b/test/input.c
@@ -284,16 +284,16 @@ static void xi2_struct_sizes(void)
g_assert(sizeof(req) == sz_##req);
compare(xXIQueryVersionReq);
- compare(xXIWarpDevicePointerReq);
- compare(xXIChangeDeviceCursorReq);
- compare(xXIChangeDeviceHierarchyReq);
+ compare(xXIWarpPointerReq);
+ compare(xXIChangeCursorReq);
+ compare(xXIChangeHierarchyReq);
compare(xXISetClientPointerReq);
compare(xXIGetClientPointerReq);
compare(xXISelectEventsReq);
compare(xXIQueryVersionReq);
compare(xXIQueryDeviceReq);
- compare(xXISetDeviceFocusReq);
- compare(xXIGetDeviceFocusReq);
+ compare(xXISetFocusReq);
+ compare(xXIGetFocusReq);
compare(xXIGrabDeviceReq);
compare(xXIUngrabDeviceReq);
compare(xXIAllowEventsReq);