summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-01-30 10:54:11 +1000
committerJakob Bornecrantz <add>2013-10-21 10:38:13 +0200
commit3d5b85d62c11a9f816dbcc041cb2ac2150af666d (patch)
treef2c4d952eb1447b49e015fcd9198ed378ed71d11
parenteb23b149c176d1c735b4c658b33ce6686e47618b (diff)
Handle DEVICE_ABORT on ABI 19.1
Called on server abort, so let's just do the absolute minimum. Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
-rw-r--r--src/vmmouse.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/vmmouse.c b/src/vmmouse.c
index cac8306..fb053c2 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -1017,6 +1017,15 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
usleep(300000);
break;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901
+ case DEVICE_ABORT:
+ if (pInfo->fd != -1) {
+ VMMousePrivPtr mPriv = (VMMousePrivPtr)pMse->mousePriv;
+ if( mPriv->vmmouseAvailable )
+ VMMouseClient_Disable();
+ break;
+ }
+#endif
}
return Success;