diff --git a/Xi/Makefile.am b/Xi/Makefile.am index 407928df1..9c5658d2d 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -76,8 +76,6 @@ libXi_la_SOURCES = \ queryst.h \ qryacces.c \ qryacces.h \ - regpair.c \ - regpair.h \ selectev.c \ selectev.h \ sendexev.c \ diff --git a/Xi/extinit.c b/Xi/extinit.c index aed008326..07ef2666d 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -109,7 +109,6 @@ SOFTWARE. #include "qryacces.c" #include "querydp.h" #include "queryst.h" -#include "regpair.h" #include "selectev.h" #include "sendexev.h" #include "chgkmap.h" @@ -329,8 +328,6 @@ ProcIDispatch(ClientPtr client) return (ProcXChangeDeviceHierarchy(client)); else if (stuff->data == X_XiSelectEvent) return (ProcXiSelectEvent(client)); - else if (stuff->data == X_RegisterPairingClient) - return (ProcXRegisterPairingClient(client)); else if (stuff->data == X_GrabAccessControl) return (ProcXGrabAccessControl(client)); else if (stuff->data == X_ChangeWindowAccess) @@ -446,8 +443,6 @@ SProcIDispatch(ClientPtr client) return (SProcXChangeDeviceHierarchy(client)); else if (stuff->data == X_XiSelectEvent) return (SProcXiSelectEvent(client)); - else if (stuff->data == X_RegisterPairingClient) - return (SProcXRegisterPairingClient(client)); else if (stuff->data == X_GrabAccessControl) return (SProcXGrabAccessControl(client)); else if (stuff->data == X_ChangeWindowAccess) @@ -539,9 +534,6 @@ SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep) else if (rep->RepType == X_QueryDevicePointer) SRepXQueryDevicePointer(client, len, (xQueryDevicePointerReply *) rep); - else if (rep->RepType == X_RegisterPairingClient) - SRepXRegisterPairingClient(client, len, - (xRegisterPairingClientReply *) rep); else if (rep->RepType == X_GrabAccessControl) SRepXGrabAccessControl(client, len, (xGrabAccessControlReply*) rep); diff --git a/Xi/regpair.c b/Xi/regpair.c deleted file mode 100644 index 3fe459150..000000000 --- a/Xi/regpair.c +++ /dev/null @@ -1,108 +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. - -*/ - -/*********************************************************************** - * - * Request to authenticate as pairing client - * - */ - -#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 -#include -#include "extnsionst.h" -#include "exevents.h" -#include "exglobals.h" - -#include "regpair.h" - -/*********************************************************************** - * - * This procedure allows a client to register the pairing of a pointer - * with a keyboard. - * - */ - -int -SProcXRegisterPairingClient(ClientPtr client) -{ - char n; - REQUEST(xRegisterPairingClientReq); - swaps(&stuff->length, n); - return ProcXRegisterPairingClient(client); -} - -int -ProcXRegisterPairingClient(ClientPtr client) -{ - xRegisterPairingClientReply rep; - - REQUEST(xRegisterPairingClientReq); - REQUEST_SIZE_MATCH(xRegisterPairingClientReq); - - if (stuff->disable) - UnregisterPairingClient(client); - - rep.repType = X_Reply; - rep.RepType = X_RegisterPairingClient; - rep.length = 0; - rep.sequenceNumber = client->sequence; - rep.success = stuff->disable || RegisterPairingClient(client); - - WriteReplyToClient(client, sizeof(xRegisterPairingClientReply), &rep); - return Success; -} - -/*********************************************************************** - * - * This procedure writes the reply for the XRegisterPairingClient function, - * if the client and server have a different byte ordering. - * - */ - -void -SRepXRegisterPairingClient(ClientPtr client, int size, - xRegisterPairingClientReply* rep) -{ - register char n; - - swaps(&rep->sequenceNumber, n); - swapl(&rep->length, n); - WriteToClient(client, size, (char *)rep); -} - diff --git a/Xi/regpair.h b/Xi/regpair.h deleted file mode 100644 index b2bfaff3e..000000000 --- a/Xi/regpair.h +++ /dev/null @@ -1,43 +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 REGPAIR_H -#define REGPAIR_H 1 - -int SProcXRegisterPairingClient(ClientPtr /* client */); -int ProcXRegisterPairingClient(ClientPtr /* client */); - -void SRepXRegisterPairingClient(ClientPtr /* client */, - int /* size */, - xRegisterPairingClientReply* /* rep */); - -#endif /* REGPAIR_H */