From b885588756450e2fa25fdd191e300e1c5dd37ec3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 14 Feb 2008 09:47:31 +1030 Subject: [PATCH] Xi: remove FakeDeviceData calls. And one leftover from GrabAccessControl. FakeDeviceData needs more thoughtful integration. --- Xi/Makefile.am | 2 - Xi/extinit.c | 8 --- Xi/fakedevdata.c | 123 ----------------------------------------------- Xi/fakedevdata.h | 42 ---------------- 4 files changed, 175 deletions(-) delete mode 100644 Xi/fakedevdata.c delete mode 100644 Xi/fakedevdata.h diff --git a/Xi/Makefile.am b/Xi/Makefile.am index 040663814..7804c51c6 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -32,8 +32,6 @@ libXi_la_SOURCES = \ extgrbdev.c \ extgrbdev.h \ extinit.c \ - fakedevdata.c \ - fakedevdata.h \ getbmap.c \ getbmap.h \ getcptr.c \ diff --git a/Xi/extinit.c b/Xi/extinit.c index f8c992798..0cf429f98 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -86,7 +86,6 @@ SOFTWARE. #include "closedev.h" #include "extgrbdev.h" #include "devbell.h" -#include "fakedevdata.h" #include "getbmap.h" #include "getbmap.h" #include "getcptr.h" @@ -338,8 +337,6 @@ ProcIDispatch(ClientPtr client) return ProcXGetClientPointer(client); else if (stuff->data == X_GetPairedPointer) return ProcXGetPairedPointer(client); - else if (stuff->data == X_FakeDeviceData) - return ProcXFakeDeviceData(client); else if (stuff->data == X_ExtendedGrabDevice) return ProcXExtendedGrabDevice(client); else { @@ -451,8 +448,6 @@ SProcIDispatch(ClientPtr client) return SProcXGetClientPointer(client); else if (stuff->data == X_GetPairedPointer) return SProcXGetPairedPointer(client); - else if (stuff->data == X_FakeDeviceData) - return SProcXFakeDeviceData(client); else if (stuff->data == X_ExtendedGrabDevice) return SProcXExtendedGrabDevice(client); else { @@ -530,9 +525,6 @@ SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep) else if (rep->RepType == X_QueryDevicePointer) SRepXQueryDevicePointer(client, len, (xQueryDevicePointerReply *) rep); - else if (rep->RepType == X_GrabAccessControl) - SRepXGrabAccessControl(client, len, - (xGrabAccessControlReply*) rep); else if (rep->RepType == X_QueryWindowAccess) SRepXQueryWindowAccess(client, len, (xQueryWindowAccessReply*) rep); diff --git a/Xi/fakedevdata.c b/Xi/fakedevdata.c deleted file mode 100644 index 92ee8ee09..000000000 --- a/Xi/fakedevdata.c +++ /dev/null @@ -1,123 +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 fake data for a given device. - * - */ - -#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 "exevents.h" -#include "exglobals.h" -#include "mi.h" - -#include "fakedevdata.h" - -static EventListPtr fake_events = NULL; - -int -SProcXFakeDeviceData(ClientPtr client) -{ - char n; - int i; - ValuatorData* p; - - REQUEST(xFakeDeviceDataReq); - - swaps(&stuff->length, n); - REQUEST_AT_LEAST_SIZE(xFakeDeviceDataReq); - - p = (ValuatorData*)&stuff[1]; - for (i = 0; i < stuff->num_valuators; i++, p++) - swapl(p, n); - - return ProcXFakeDeviceData(client);; -} - -int -ProcXFakeDeviceData(ClientPtr client) -{ - DeviceIntPtr dev; - int nevents, i; - int* valuators = NULL; - int rc; - - REQUEST(xFakeDeviceDataReq); - REQUEST_AT_LEAST_SIZE(xFakeDeviceDataReq); - - if (stuff->length != (sizeof(xFakeDeviceDataReq) >> 2) + stuff->num_valuators) - { - return BadLength; - } - - rc = dixLookupDevice(&dev, stuff->deviceid, client, DixWriteAccess); - if (rc != Success) - return rc; - - if (!fake_events && !(fake_events = InitEventList(GetMaximumEventsNum()))) - { - return BadAlloc; - } - if (stuff->num_valuators) - { - CARD32* valptr = (CARD32*)&stuff[1]; - - valuators = xcalloc(stuff->num_valuators, sizeof(int)); - if (!valuators) - { - return BadAlloc; - } - for (i = 0; i < stuff->num_valuators; i++, valptr++) - valuators[i] = (int)(*valptr); - } - - nevents = GetPointerEvents(fake_events, dev, stuff->type, stuff->buttons, - POINTER_RELATIVE, stuff->first_valuator, stuff->num_valuators, - valuators); - - OsBlockSignals(); - for (i = 0; i < nevents; i++) - mieqEnqueue(dev, (fake_events+ i)->event); - OsReleaseSignals(); - xfree(valuators); - return Success; -} diff --git a/Xi/fakedevdata.h b/Xi/fakedevdata.h deleted file mode 100644 index 28dd72985..000000000 --- a/Xi/fakedevdata.h +++ /dev/null @@ -1,42 +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 FAKEDEVDATA_H -#define FAKEDEVDATA_H 1 - -int SProcXFakeDeviceData(ClientPtr /* client */ - ); - -int ProcXFakeDeviceData(ClientPtr /* client */ - ); - -#endif /* FAKEDEVDATA_H */