diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-11-03 13:13:51 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-04 12:15:44 +1000 |
| commit | 671040d14faaeffbf8d1ce5e5b45e2dc521cd0cf (patch) | |
| tree | 7f934af32c2daae4c80e014c806eeccf47965d16 | |
| parent | 1ad9cdd245f27a2e2f44eb5d535d638015dfee47 (diff) | |
vmmouse: Make the driver work with pre ABI12 serversinput-api
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
| -rw-r--r-- | src/vmmouse.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/vmmouse.c b/src/vmmouse.c index 9cec4d7..762b2c9 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -341,7 +341,6 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) return NULL; } - pInfo->name = dev->identifier; #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 pInfo->motion_history_proc = xf86GetMotionEvents; @@ -354,18 +353,16 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) pInfo->private_flags = 0; pInfo->always_core_feedback = 0; pInfo->conf_idev = dev; + pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; /* Collect the options, and process the common options. */ xf86CollectInputOptions(pInfo, NULL, NULL); xf86ProcessCommonOptions(pInfo, pInfo->options); if (NewVMMousePreInit(drv, pInfo, flags) == Success) - { - pInfo->flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS; - return pInfo; - } + pInfo->flags |= XI86_CONFIGURED; - return NULL; + return pInfo; } static int |