diff options
| -rw-r--r-- | dix/devices.c | 8 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/dix/devices.c b/dix/devices.c index ac5806a28..2e65a041d 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -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); } } diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 76d2d0041..bd77fe663 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -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)); |