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/XWarpDvPtr.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/XWarpDvPtr.c')
| -rw-r--r-- | src/XWarpDvPtr.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/XWarpDvPtr.c b/src/XWarpDvPtr.c index b006be9..6a9c45d 100644 --- a/src/XWarpDvPtr.c +++ b/src/XWarpDvPtr.c @@ -26,19 +26,20 @@ in this Software without prior written authorization from The Open Group. /*********************************************************************** * - * XWarpDevicePointer - Warp the pointer of an extension input device. + * XIWarpDevicePointer - Warp the pointer of an extension input device. * */ +#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" int -XWarpDevicePointer(Display *dpy, +XIWarpDevicePointer(Display *dpy, XDevice *dev, Window src_win, Window dst_win, @@ -49,7 +50,7 @@ XWarpDevicePointer(Display *dpy, int dst_x, int dst_y) { - register xWarpDevicePointerReq *req; + xXIWarpDevicePointerReq *req; XExtDisplayInfo *info = XInput_find_display(dpy); @@ -57,9 +58,9 @@ XWarpDevicePointer(Display *dpy, if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1) return (NoSuchExtension); - GetReq(WarpDevicePointer, req); + GetReq(XIWarpDevicePointer, req); req->reqType = info->codes->major_opcode; - req->ReqType = X_WarpDevicePointer; + req->ReqType = X_XIWarpDevicePointer; req->deviceid = dev->device_id; req->src_win = src_win; req->dst_win = dst_win; |