andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop checking or calling PtrCtrlProcs

Browse Source 
None of them do anything useful now that pointer acceleration is
entirely handled in the server.   (Does not completely nuke yet,
since that would be an API/ABI break.)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Alan Coopersmith 2010-08-12 00:09:01 -07:00 committed by Peter Hutterer
parent bce12f2956
commit b5cf9c5090
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/devices.c
View File

@ -2111,9 +2111,6 @@ ProcChangePointerControl(ClientPtr client)
REQUEST(xChangePointerControlReq);
REQUEST_SIZE_MATCH(xChangePointerControlReq);
if (!mouse->ptrfeed->CtrlProc)
return BadDevice;
ctrl = mouse->ptrfeed->ctrl;
if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse)) {
client->errorValue = stuff->doAccel;
@ -2161,7 +2158,7 @@ ProcChangePointerControl(ClientPtr client)
for (dev = inputInfo.devices; dev; dev = dev->next) {
if ((dev == mouse || (!IsMaster(dev) && dev->u.master == mouse)) &&
dev->ptrfeed && dev->ptrfeed->CtrlProc) {
dev->ptrfeed) {
rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);
if (rc != Success)
return rc;
@ -2170,9 +2167,8 @@ ProcChangePointerControl(ClientPtr client)
for (dev = inputInfo.devices; dev; dev = dev->next) {
if ((dev == mouse || (!IsMaster(dev) && dev->u.master == mouse)) &&
dev->ptrfeed && dev->ptrfeed->CtrlProc) {
dev->ptrfeed) {
dev->ptrfeed->ctrl = ctrl;
(*dev->ptrfeed->CtrlProc)(dev, &mouse->ptrfeed->ctrl);
}
}

3
hw/xfree86/common/xf86Xinput.c
View File

@ -264,9 +264,6 @@ ApplyAccelerationSettings(DeviceIntPtr dev){
if (i >= 0)
dev->ptrfeed->ctrl.threshold = i;
/* mostly a no-op anyway */
(*dev->ptrfeed->CtrlProc)(dev, &dev->ptrfeed->ctrl);
xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",
local->name, ((float)dev->ptrfeed->ctrl.num)/
((float)dev->ptrfeed->ctrl.den));