diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-20 15:17:52 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-20 15:17:55 +1000 |
| commit | 560c58b53e4e60ebd26e0c66dd00399c438bd619 (patch) | |
| tree | cd861b7d04cbbc4d30b63935c4188349e459336f /Xi/extinit.c | |
| parent | 903449615b1a1188955c0287a552aec8ac5b3fbb (diff) | |
Xi: name-space and fix XI2 requests
All XI2 requests have XI prefixes.
Requests affected:
ChangeDeviceCursor
QueryDevicePointer
WarpDevicePointer
SetClientPointer
GetClientPointer
XIChangeDeviceHierarchy.
Diffstat (limited to 'Xi/extinit.c')
| -rw-r--r-- | Xi/extinit.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c index e083184a7..988ed0b9b 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -61,6 +61,7 @@ SOFTWARE. #include "extnsionst.h" /* extension entry */ #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> +#include <X11/extensions/XI2proto.h> #include <X11/extensions/geproto.h> #include "geext.h" /* extension interfaces for ge */ @@ -229,12 +230,12 @@ static int (*ProcIVector[])(ClientPtr) = { ProcXDeleteDeviceProperty, /* 38 */ ProcXGetDeviceProperty, /* 39 */ /* XI 2 */ - ProcXQueryDevicePointer, /* 40 */ - ProcXWarpDevicePointer, /* 41 */ - ProcXChangeDeviceCursor, /* 42 */ - ProcXChangeDeviceHierarchy, /* 43 */ - ProcXSetClientPointer, /* 44 */ - ProcXGetClientPointer, /* 45 */ + ProcXIQueryDevicePointer, /* 40 */ + ProcXIWarpDevicePointer, /* 41 */ + ProcXIChangeDeviceCursor, /* 42 */ + ProcXIChangeDeviceHierarchy, /* 43 */ + ProcXISetClientPointer, /* 44 */ + ProcXIGetClientPointer, /* 45 */ ProcXiSelectEvent, /* 46 */ ProcXIQueryVersion /* 47 */ }; @@ -281,12 +282,12 @@ static int (*SProcIVector[])(ClientPtr) = { SProcXChangeDeviceProperty, /* 37 */ SProcXDeleteDeviceProperty, /* 38 */ SProcXGetDeviceProperty, /* 39 */ - SProcXQueryDevicePointer, /* 40 */ - SProcXWarpDevicePointer, /* 41 */ - SProcXChangeDeviceCursor, /* 42 */ - SProcXChangeDeviceHierarchy, /* 43 */ - SProcXSetClientPointer, /* 44 */ - SProcXGetClientPointer, /* 45 */ + SProcXIQueryDevicePointer, /* 40 */ + SProcXIWarpDevicePointer, /* 41 */ + SProcXIChangeDeviceCursor, /* 42 */ + SProcXIChangeDeviceHierarchy, /* 43 */ + SProcXISetClientPointer, /* 44 */ + SProcXIGetClientPointer, /* 45 */ SProcXiSelectEvent, /* 46 */ SProcXIQueryVersion /* 47 */ }; @@ -474,11 +475,11 @@ 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_QueryDevicePointer) - SRepXQueryDevicePointer(client, len, - (xQueryDevicePointerReply *) rep); - else if (rep->RepType == X_GetClientPointer) - SRepXGetClientPointer(client, len, (xGetClientPointerReply*) rep); + else if (rep->RepType == X_XIQueryDevicePointer) + SRepXIQueryDevicePointer(client, len, + (xXIQueryDevicePointerReply *) rep); + else if (rep->RepType == X_XIGetClientPointer) + SRepXIGetClientPointer(client, len, (xXIGetClientPointerReply*) rep); else { FatalError("XINPUT confused sending swapped reply"); } |