summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Thum <simon.thum@gmx.de>2008-11-19 16:01:21 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-01-15 09:28:55 +1000
commit19275ea8e9dd93d5e61906943706dfe49003dd9c (patch)
tree8157bf0c685332564de719e816b52844ce6f48c0 /include
parentd645721170b1196e5064b397cfbffd1da8c79bb1 (diff)
dix: add property support for pointer acceleration.
Note: properties don't need to be cleaned up, the DIX does it for us anyway. Data that is stored in properties is cleaned up by the property system. Handlers, etc. don't need to be unregistered while cleaning up, as they get deleted when the device is removed anyway. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Signed-off-by: Simon Thum <simon.thum@gmx.de>
Diffstat (limited to 'include')
-rw-r--r--include/ptrveloc.h4
-rw-r--r--include/xserver-properties.h10
2 files changed, 14 insertions, 0 deletions
diff --git a/include/ptrveloc.h b/include/ptrveloc.h
index e491051e4..096dea847 100644
--- a/include/ptrveloc.h
+++ b/include/ptrveloc.h
@@ -43,6 +43,7 @@
#define AccelProfilePower 5
#define AccelProfileLinear 6
#define AccelProfileReserved 7
+#define AccelProfileLAST AccelProfileReserved
/* fwd */
struct _DeviceVelocityRec;
@@ -103,6 +104,9 @@ typedef struct _DeviceVelocityRec {
extern _X_EXPORT void
InitVelocityData(DeviceVelocityPtr s);
+extern _X_EXPORT BOOL
+InitializePredictableAccelerationProperties(DeviceIntPtr pDev);
+
extern _X_EXPORT void
InitFilterChain(DeviceVelocityPtr s, float rdecay, float degression,
int lutsize, int stages);
diff --git a/include/xserver-properties.h b/include/xserver-properties.h
index f8aeab65d..1327e5998 100644
--- a/include/xserver-properties.h
+++ b/include/xserver-properties.h
@@ -33,4 +33,14 @@
/* BOOL. 0 - device disabled, 1 - device enabled */
#define XI_PROP_ENABLED "Device Enabled"
+/* Pointer acceleration properties */
+/* INTEGER of any format */
+#define ACCEL_PROP_PROFILE_NUMBER "Device Accel Profile"
+/* FLOAT, format 32 */
+#define ACCEL_PROP_CONSTANT_DECELERATION "Device Accel Constant Deceleration"
+/* FLOAT, format 32 */
+#define ACCEL_PROP_ADAPTIVE_DECELERATION "Device Accel Adaptive Deceleration"
+/* FLOAT, format 32 */
+#define ACCEL_PROP_VELOCITY_SCALING "Device Accel Velocity Scaling"
+
#endif