diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-25 15:53:29 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-11 14:26:04 +1000 |
| commit | 6be974ec5597ef37fbd3a6057d52a38356f544e0 (patch) | |
| tree | 5db0f6322dde1b6f9bc7e4f806b8f89c1a8ec33d /src/XGetCPtr.c | |
| parent | 60b2d114d06617ca60c2905373829299dc051c7f (diff) | |
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)
Diffstat (limited to 'src/XGetCPtr.c')
| -rw-r--r-- | src/XGetCPtr.c | 17 |
1 files changed, 9 insertions, 8 deletions
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)) { |