diff options
| -rw-r--r-- | include/X11/extensions/XInput2.h | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/XIQueryVersion.c | 62 | ||||
| -rw-r--r-- | src/XIint.h | 1 |
4 files changed, 71 insertions, 1 deletions
diff --git a/include/X11/extensions/XInput2.h b/include/X11/extensions/XInput2.h index 2c2b437..f6de35e 100644 --- a/include/X11/extensions/XInput2.h +++ b/include/X11/extensions/XInput2.h @@ -141,6 +141,12 @@ extern int XISelectEvent( int /* nmasks */ ); +extern Status XIQueryVersion( + Display* /* dpy */, + int* /* major_version_return */, + int* /* minor_version_return*/ +); + _XFUNCPROTOEND /* diff --git a/src/Makefile.am b/src/Makefile.am index 93907fc..61f21cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,8 @@ libXi_la_SOURCES = \ XWarpDvPtr.c \ XExtInt.c \ XISelEv.c \ - XIint.h + XIint.h \ + XIQueryVersion.c libXi_la_LIBADD = $(XI_LIBS) diff --git a/src/XIQueryVersion.c b/src/XIQueryVersion.c new file mode 100644 index 0000000..e4c632e --- /dev/null +++ b/src/XIQueryVersion.c @@ -0,0 +1,62 @@ +/* + * Copyright © 2009 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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. + * + */ + +#include <stdint.h> +#include <X11/Xlibint.h> +#include <X11/extensions/XI2proto.h> +#include <X11/extensions/XInput2.h> +#include <X11/extensions/extutil.h> +#include "XIint.h" + +Status +XIQueryVersion(Display *dpy, int *major_return, int *minor_return) +{ + XExtDisplayInfo *info = XInput_find_display(dpy); + + LockDisplay(dpy); + return _xiQueryVersion(dpy, major_return, minor_return, info); +} + +_X_HIDDEN Status +_xiQueryVersion(Display * dpy, int *major, int *minor, XExtDisplayInfo *info) +{ + xXIQueryVersionReq *req; + xXIQueryVersionReply rep; + + if (_XiCheckExtInit(dpy, Dont_Check, info) == -1) + return BadRequest; + + GetReq(XIQueryVersion, req); + req->reqType = info->codes->major_opcode; + req->ReqType = X_XIQueryVersion; + req->major_version = *major; + req->minor_version = *minor; + + if (!_XReply(dpy, (xReply*)&rep, 0, xTrue)) { + return BadImplementation; + } + *major = rep.major_version; + *minor = rep.minor_version; + return Success; +} diff --git a/src/XIint.h b/src/XIint.h index 6ef150f..3b9a624 100644 --- a/src/XIint.h +++ b/src/XIint.h @@ -14,6 +14,7 @@ extern XExtDisplayInfo *XInput_find_display(Display *); extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *); extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *); +extern Status _xiQueryVersion(Display *dpy, int*, int*, XExtDisplayInfo *); extern Status _XiEventToWire( register Display * /* dpy */, |