XISetClientPointer is an XI2.0 call and should be named accordingly. Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- src/Makefile.am | 2 +- src/XISetCPtr.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/XSetCPtr.c | 62 ------------------------------------------------------- 3 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 src/XISetCPtr.c delete mode 100644 src/XSetCPtr.c
diff --git a/src/Makefile.am b/src/Makefile.am index 76b10e2..c036ae7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,6 +9,7 @@ XI2_sources = XIAllowEvents.c \ XIPassiveGrab.c \ XIProperties.c \ XISelEv.c \ + XISetCPtr.c \ XIWarpPointer.c \ XIHierarchy.c \ XIDefineCursor.c \ @@ -48,7 +49,6 @@ libXi_la_SOURCES = \ XQueryDv.c \ XSelect.c \ XSetBMap.c \ - XSetCPtr.c \ XSetDVal.c \ XSetMMap.c \ XSetMode.c \ diff --git a/src/XISetCPtr.c b/src/XISetCPtr.c new file mode 100644 index 0000000..36efc30 --- /dev/null +++ b/src/XISetCPtr.c @@ -0,0 +1,62 @@ +/************************************************************ + +Copyright 2007 Peter Hutterer <pe...@cs.unisa.edu.au> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ + +/*********************************************************************** + * + * XISetClientPointer - Sets the default pointer for a client. This call is + * important for legacy applications that may send ambiguous requests to the + * server where the server has to randomly pick a device. + * Ideally, the window manager will always send a SetClientPointer request + * before the client interacts with an application. + */ + +#include <stdint.h> +#include <X11/extensions/XI2proto.h> +#include <X11/Xlibint.h> +#include <X11/extensions/XInput2.h> +#include <X11/extensions/extutil.h> +#include "XIint.h" + +Status +XISetClientPointer(Display* dpy, Window win, int deviceid) +{ + xXISetClientPointerReq* req; + XExtDisplayInfo *info = XInput_find_display(dpy); + + LockDisplay(dpy); + if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1) + return (NoSuchExtension); + + GetReq(XISetClientPointer, req); + req->reqType = info->codes->major_opcode; + req->ReqType = X_XISetClientPointer; + req->win = win; + req->deviceid = deviceid; + + UnlockDisplay(dpy); + SyncHandle(); + return Success; +} diff --git a/src/XSetCPtr.c b/src/XSetCPtr.c deleted file mode 100644 index 36efc30..0000000 --- a/src/XSetCPtr.c +++ /dev/null @@ -1,62 +0,0 @@ -/************************************************************ - -Copyright 2007 Peter Hutterer <pe...@cs.unisa.edu.au> - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ - -/*********************************************************************** - * - * XISetClientPointer - Sets the default pointer for a client. This call is - * important for legacy applications that may send ambiguous requests to the - * server where the server has to randomly pick a device. - * Ideally, the window manager will always send a SetClientPointer request - * before the client interacts with an application. - */ - -#include <stdint.h> -#include <X11/extensions/XI2proto.h> -#include <X11/Xlibint.h> -#include <X11/extensions/XInput2.h> -#include <X11/extensions/extutil.h> -#include "XIint.h" - -Status -XISetClientPointer(Display* dpy, Window win, int deviceid) -{ - xXISetClientPointerReq* req; - XExtDisplayInfo *info = XInput_find_display(dpy); - - LockDisplay(dpy); - if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1) - return (NoSuchExtension); - - GetReq(XISetClientPointer, req); - req->reqType = info->codes->major_opcode; - req->ReqType = X_XISetClientPointer; - req->win = win; - req->deviceid = deviceid; - - UnlockDisplay(dpy); - SyncHandle(); - return Success; -} -- 1.7.2.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel