diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-08-02 12:40:24 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-05-20 15:04:00 +1000 |
| commit | bb1ffccf8c35afb2322fed964d8d97bd19fc4f7f (patch) | |
| tree | 30f017bd6ba1137318eafa7f35ef92feb8855a1a | |
| parent | 53515d62f86fcdc27d8525ecbf2d6472256c79e5 (diff) | |
| download | xf86-input-wacom-bb1ffccf8c35afb2322fed964d8d97bd19fc4f7f.tar.gz | |
Remove usage of XI86_CORE_POINTER and XI86_POINTER_CAPABLE..
This flag has been write-only since server 1.4.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <pinglinux@gmail.com>
(cherry picked from commit 74645df081575eaff7e2ce2c8325df9d47261dfb)
| -rw-r--r-- | src/wcmCommon.c | 2 | ||||
| -rw-r--r-- | src/wcmConfig.c | 2 | ||||
| -rw-r--r-- | src/wcmValidateDevice.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/wcmCommon.c b/src/wcmCommon.c index 48a042d..ef6fe92 100644 --- a/src/wcmCommon.c +++ b/src/wcmCommon.c @@ -106,7 +106,7 @@ static void wcmSetScreen(LocalDevicePtr local, int v0, int v1) priv->screen_no = -1; } - if (!(local->flags & (XI86_ALWAYS_CORE | XI86_CORE_POINTER))) return; + if (!(local->flags & (XI86_ALWAYS_CORE ))) return; if (priv->twinview != TV_NONE && priv->screen_no == -1 && (priv->flags & ABSOLUTE_FLAG)) { diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 4494f7b..5120d78 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -411,7 +411,7 @@ static LocalDevicePtr wcmPreInit(InputDriverPtr drv, IDevPtr dev, int flags) goto SetupProc_fail; /* mark the device configured */ - local->flags |= XI86_POINTER_CAPABLE | XI86_CONFIGURED; + local->flags |= XI86_CONFIGURED; if (need_hotplug) { diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c index c9f5c4c..e2eef30 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -346,7 +346,7 @@ int wcmParseOptions(LocalDevicePtr local) } /* Store original local Core flag so it can be changed later */ - if (local->flags & (XI86_ALWAYS_CORE | XI86_CORE_POINTER)) + if (local->flags & (XI86_ALWAYS_CORE)) priv->flags |= COREEVENT_FLAG; s = xf86SetStrOption(local->options, "Rotate", NULL); |