summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-02-26 15:45:46 +1030
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-02-26 15:45:46 +1030
commit5ca4f620883c63e57edd409b139d82092679010a (patch)
tree53c8e763b144106de4e17596563b09cbce1225ad
parent2b25e823d3c0820b135fb42584be462dba342aa7 (diff)
Remove XExtendedUngrabDevice. XUngrabDevice does the same.
-rw-r--r--src/Makefile.am1
-rw-r--r--src/XExtGrabDev.c1
-rw-r--r--src/XExtUngrDev.c64
3 files changed, 0 insertions, 66 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ef7609d..eac6caa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,6 @@ libXi_la_SOURCES = \
XDevBell.c \
XExtGrabDev.c \
XExtToWire.c \
- XExtUngrDev.c \
XGetBMap.c \
XGetCPtr.c \
XGetDCtl.c \
diff --git a/src/XExtGrabDev.c b/src/XExtGrabDev.c
index 50d35e6..7d4017d 100644
--- a/src/XExtGrabDev.c
+++ b/src/XExtGrabDev.c
@@ -64,7 +64,6 @@ XExtendedGrabDevice(Display* dpy,
req->ReqType = X_ExtendedGrabDevice;
req->deviceid = dev->device_id;
req->grab_window = grab_window;
- req->ungrab = False;
req->device_mode = device_mode;
req->owner_events = ownerEvents;
req->confine_to = confineTo;
diff --git a/src/XExtUngrDev.c b/src/XExtUngrDev.c
deleted file mode 100644
index 00b30df..0000000
--- a/src/XExtUngrDev.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/************************************************************
-
-Copyright 2007 Peter Hutterer <peter@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
-AUTHOR 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 author 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 author.
-
-*/
-
-/***********************************************************************
- *
- * XExtendedGrabDevice - grab an input device.
- *
- */
-
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
-#include <X11/Xlibint.h>
-#include <X11/extensions/XInput.h>
-#include <X11/extensions/extutil.h>
-#include "XIint.h"
-
-int
-XExtendedUngrabDevice(Display* dpy,
- XDevice* dev)
-{
- xExtendedGrabDeviceReply rep;
- xExtendedGrabDeviceReq *req;
- XExtDisplayInfo *info = XInput_find_display(dpy);
-
- LockDisplay(dpy);
- if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return (NoSuchExtension);
-
- GetReq(ExtendedGrabDevice, req);
- req->reqType = info->codes->major_opcode;
- req->ReqType = X_ExtendedGrabDevice;
- req->deviceid = dev->device_id;
- req->ungrab = True;
-
- if (_XReply(dpy, (xReply *) & rep, 0, xTrue) == 0)
- rep.status = GrabSuccess;
- UnlockDisplay(dpy);
- SyncHandle();
- return (rep.status);
-}
-