From 6be974ec5597ef37fbd3a6057d52a38356f544e0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 25 Feb 2009 15:53:29 +1000
Subject: Fix the already existing XI2 calls to the new XI2 protocol. FIXME

FIXME: not bisectable due to XiSelectInput.

This includes namespacing them with an XI2 prefix.

Affected calls:
    XIGetClientPointer
    XISetClientPointer
    XIDefineDeviceCursor
    XIUndefineDeviceCursor
    XIWarpDevicePointer
    XIQueryDevicePointer
    XIChangeDeviceHierarchy (+ event)
---
 src/XGetCPtr.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/XGetCPtr.c')

diff --git a/src/XGetCPtr.c b/src/XGetCPtr.c
index 180d0c6..7d96284 100644
--- a/src/XGetCPtr.c
+++ b/src/XGetCPtr.c
@@ -26,31 +26,32 @@ in this Software without prior written authorization from The Open Group.
 
 /***********************************************************************
  *
- * XGetClientPointer - Get the clientPointer setting for a client.
+ * XIGetClientPointer - Get the clientPointer setting for a client.
  *
  */
 
+#include <stdint.h>
 #include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
+#include <X11/extensions/XI2proto.h>
 #include <X11/Xlibint.h>
-#include <X11/extensions/XInput.h>
+#include <X11/extensions/XInput2.h>
 #include <X11/extensions/extutil.h>
 #include "XIint.h"
 
 Bool
-XGetClientPointer(Display* dpy, Window win, XID* deviceid)
+XIGetClientPointer(Display* dpy, Window win, XID* deviceid)
 {
-    xGetClientPointerReq *req;
-    xGetClientPointerReply rep;
+    xXIGetClientPointerReq *req;
+    xXIGetClientPointerReply rep;
     XExtDisplayInfo *info = XInput_find_display(dpy);
 
     LockDisplay(dpy);
     if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
 	return (NoSuchExtension);
 
-    GetReq(GetClientPointer, req);
+    GetReq(XIGetClientPointer, req);
     req->reqType = info->codes->major_opcode;
-    req->ReqType = X_GetClientPointer;
+    req->ReqType = X_XIGetClientPointer;
     req->win = win;
 
     if (!_XReply(dpy, (xReply*) &rep, 0, xFalse)) {
-- 
cgit v1.2.3