diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-01-10 08:49:17 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-01-11 10:30:08 +1000 |
| commit | e4c1dc1bc5008bee8195f7dc8b07e0a5d2592a2c (patch) | |
| tree | 88184b45083d588c04916c0ced40a16e5c2f9287 /src/wcmConfig.c | |
| parent | 9bca63fe9758649eb731661b20bde1d570b6c61f (diff) | |
| download | xf86-input-wacom-e4c1dc1bc5008bee8195f7dc8b07e0a5d2592a2c.tar.gz | |
Move the type properties to wacom-properties.h.
We're using them as type field, clients expect them, so let's export them
somewhere more visible.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <pinglinux@gmail.com>
Diffstat (limited to 'src/wcmConfig.c')
| -rw-r--r-- | src/wcmConfig.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c index b20174c..cd12531 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -26,6 +26,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> +#include <wacom-properties.h> /***************************************************************************** * wcmAllocate -- @@ -180,7 +181,7 @@ static int wcmSetType(InputInfoPtr pInfo, const char *type) if (xf86NameCmp(type, "stylus") == 0) { priv->flags = ABSOLUTE_FLAG|STYLUS_ID; - pInfo->type_name = XI_STYLUS; + pInfo->type_name = WACOM_PROP_XI_TYPE_STYLUS; } else if (xf86NameCmp(type, "touch") == 0) { int flags = TOUCH_ID; @@ -189,19 +190,19 @@ static int wcmSetType(InputInfoPtr pInfo, const char *type) flags |= ABSOLUTE_FLAG; priv->flags = flags; - pInfo->type_name = XI_TOUCH; + pInfo->type_name = WACOM_PROP_XI_TYPE_TOUCH; } else if (xf86NameCmp(type, "cursor") == 0) { priv->flags = CURSOR_ID; - pInfo->type_name = XI_CURSOR; + pInfo->type_name = WACOM_PROP_XI_TYPE_CURSOR; } else if (xf86NameCmp(type, "eraser") == 0) { priv->flags = ABSOLUTE_FLAG|ERASER_ID; - pInfo->type_name = XI_ERASER; + pInfo->type_name = WACOM_PROP_XI_TYPE_ERASER; } else if (xf86NameCmp(type, "pad") == 0) { priv->flags = ABSOLUTE_FLAG|PAD_ID; - pInfo->type_name = XI_PAD; + pInfo->type_name = WACOM_PROP_XI_TYPE_PAD; } /* Set the device id of the "last seen" device on this tool */ |