diff --git a/Xi/Makefile.am b/Xi/Makefile.am index 7804c51c6..2af1940eb 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -46,8 +46,6 @@ libXi_la_SOURCES = \ getkmap.h \ getmmap.c \ getmmap.h \ - getpairp.c \ - getpairp.h \ getprop.c \ getprop.h \ getselev.c \ diff --git a/Xi/extinit.c b/Xi/extinit.c index 0cf429f98..f1c282493 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -94,7 +94,6 @@ SOFTWARE. #include "getfocus.h" #include "getkmap.h" #include "getmmap.h" -#include "getpairp.h" #include "getprop.h" #include "getselev.h" #include "getvers.h" @@ -335,8 +334,6 @@ ProcIDispatch(ClientPtr client) return ProcXSetClientPointer(client); else if (stuff->data == X_GetClientPointer) return ProcXGetClientPointer(client); - else if (stuff->data == X_GetPairedPointer) - return ProcXGetPairedPointer(client); else if (stuff->data == X_ExtendedGrabDevice) return ProcXExtendedGrabDevice(client); else { @@ -446,8 +443,6 @@ SProcIDispatch(ClientPtr client) return SProcXSetClientPointer(client); else if (stuff->data == X_GetClientPointer) return SProcXGetClientPointer(client); - else if (stuff->data == X_GetPairedPointer) - return SProcXGetPairedPointer(client); else if (stuff->data == X_ExtendedGrabDevice) return SProcXExtendedGrabDevice(client); else { @@ -530,8 +525,6 @@ SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep) (xQueryWindowAccessReply*) rep); else if (rep->RepType == X_GetClientPointer) SRepXGetClientPointer(client, len, (xGetClientPointerReply*) rep); - else if (rep->RepType == X_GetPairedPointer) - SRepXGetPairedPointer(client, len, (xGetPairedPointerReply*) rep); else if (rep->RepType == X_ExtendedGrabDevice) SRepXExtendedGrabDevice(client, len, (xExtendedGrabDeviceReply*) rep); else { diff --git a/Xi/getpairp.c b/Xi/getpairp.c deleted file mode 100644 index 59ed18909..000000000 --- a/Xi/getpairp.c +++ /dev/null @@ -1,104 +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 - -#include /* for inputstr.h */ -#include /* Request macro */ -#include "inputstr.h" /* DeviceIntPtr */ -#include "windowstr.h" /* window structure */ -#include -#include -#include "extnsionst.h" -#include "exevents.h" -#include "exglobals.h" - -#ifdef PANORAMIX -#include "panoramiXsrv.h" -#endif - -#include "getpairp.h" - -/*********************************************************************** - * - * This procedure allows a client to query the paired pointer for a keyboard - * device. - * - */ - -int -SProcXGetPairedPointer(ClientPtr client) -{ - char n; - REQUEST(xGetPairedPointerReq); - swaps(&stuff->length, n); - return (ProcXGetPairedPointer(client)); -} - -int -ProcXGetPairedPointer(ClientPtr client) -{ - xGetPairedPointerReply rep; - DeviceIntPtr kbd, ptr; - int rc; - - REQUEST(xGetPairedPointerReq); - REQUEST_SIZE_MATCH(xGetPairedPointerReq); - - rc = dixLookupDevice(&kbd, stuff->deviceid, client, DixReadAccess); - if (rc != Success) - return rc; - else if (!kbd->key || !kbd->isMaster) { - client->errorValue = stuff->deviceid; - return BadDevice; - } - - ptr = GetPairedDevice(kbd); - - rep.repType = X_Reply; - rep.RepType = X_GetPairedPointer; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.paired = TRUE; - rep.deviceid = ptr->id; - WriteReplyToClient(client, sizeof(xGetPairedPointerReply), &rep); - return Success; -} - -void -SRepXGetPairedPointer(ClientPtr client, int size, - xGetPairedPointerReply* rep) -{ - char n; - - swaps(&rep->sequenceNumber, n); - swapl(&rep->length, n); - WriteToClient(client, size, (char *)rep); -} diff --git a/Xi/getpairp.h b/Xi/getpairp.h deleted file mode 100644 index 9b4759e71..000000000 --- a/Xi/getpairp.h +++ /dev/null @@ -1,45 +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 GETPAIRP_H -#define GETPAIRP_H 1 - -int SProcXGetPairedPointer(ClientPtr /* client */ - ); -int ProcXGetPairedPointer(ClientPtr /* client */ - ); -void SRepXGetPairedPointer(ClientPtr /* client */, - int /* size */, - xGetPairedPointerReply* /* rep */ - ); - -#endif /* GETPAIRP_H */