diff --git a/Xi/Makefile.am b/Xi/Makefile.am index 9c5658d2d..040663814 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -56,8 +56,6 @@ libXi_la_SOURCES = \ getselev.h \ getvers.c \ getvers.h \ - grabacc.c \ - grabacc.h \ grabdev.c \ grabdev.h \ grabdevb.c \ diff --git a/Xi/extinit.c b/Xi/extinit.c index 6aa1ece29..9c42a5d15 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -100,7 +100,6 @@ SOFTWARE. #include "getselev.h" #include "getvers.h" #include "getvers.h" -#include "grabacc.h" #include "grabdev.h" #include "grabdevb.h" #include "grabdevk.h" @@ -330,8 +329,6 @@ ProcIDispatch(ClientPtr client) return (ProcXChangeDeviceHierarchy(client)); else if (stuff->data == X_XiSelectEvent) return (ProcXiSelectEvent(client)); - else if (stuff->data == X_GrabAccessControl) - return (ProcXGrabAccessControl(client)); else if (stuff->data == X_ChangeWindowAccess) return (ProcXChangeWindowAccess(client)); else if (stuff->data == X_QueryWindowAccess) @@ -445,8 +442,6 @@ SProcIDispatch(ClientPtr client) return (SProcXChangeDeviceHierarchy(client)); else if (stuff->data == X_XiSelectEvent) return (SProcXiSelectEvent(client)); - else if (stuff->data == X_GrabAccessControl) - return (SProcXGrabAccessControl(client)); else if (stuff->data == X_ChangeWindowAccess) return (SProcXChangeWindowAccess(client)); else if (stuff->data == X_QueryWindowAccess) diff --git a/Xi/grabacc.c b/Xi/grabacc.c deleted file mode 100644 index 83b8736b5..000000000 --- a/Xi/grabacc.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - -Copyright 2007 Peter Hutterer - -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. - -*/ - -#define NEED_EVENTS -#define NEED_REPLIES -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include /* for inputstr.h */ -#include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ -#include "scrnintstr.h" /* screen structure */ -#include -#include -#include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ -#include "exevents.h" -#include "exglobals.h" - -#include "grabacc.h" - -/*********************************************************************** - * - * This procedure allows a client to register as the global client to control - * any window access. - * - */ -int -SProcXGrabAccessControl(ClientPtr client) -{ - char n; - REQUEST(xGrabAccessControlReq); - - swaps(&stuff->length, n); - return ProcXGrabAccessControl(client); -} - -int -ProcXGrabAccessControl(ClientPtr client) -{ - xGrabAccessControlReply rep; - REQUEST(xGrabAccessControlReq); - REQUEST_SIZE_MATCH(xGrabAccessControlReq); - - if (stuff->ungrab) - ACUnregisterClient(client); - - rep.repType = X_Reply; - rep.RepType = X_GrabAccessControl; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.success = stuff->ungrab || ACRegisterClient(client); - - WriteReplyToClient(client, sizeof(xGrabAccessControlReply), &rep); - return Success; -} - -/*********************************************************************** - * - * This procedure writes the reply for the XGrabAccessControl function, - * if the client and server have a different byte ordering. - * - */ - -void -SRepXGrabAccessControl(ClientPtr client, int size, - xGrabAccessControlReply* rep) -{ - char n; - - swaps(&rep->sequenceNumber, n); - swapl(&rep->length, n); - WriteToClient(client, size, (char *)rep); -} - diff --git a/Xi/grabacc.h b/Xi/grabacc.h deleted file mode 100644 index 6dcbcad33..000000000 --- a/Xi/grabacc.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - -Copyright 2007 Peter Hutterer - -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. - -*/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef GRABACC_H -#define GRABACC_H 1 - -int SProcXGrabAccessControl(ClientPtr /* client */); - -int ProcXGrabAccessControl(ClientPtr /* client */); -void SRepXGrabAccessControl(ClientPtr client, int size, - xGrabAccessControlReply* rep); -#endif /* GRABACC_H */