diff options
| author | Simon Thum <simon.thum@gmx.de> | 2011-02-23 02:29:34 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-03-02 14:54:03 +1000 |
| commit | a4b85261859b17dba9ad8f7f1ce650133f0235d4 (patch) | |
| tree | 797f0fb6e0a9bfd68479a0fae53ad18d93e10966 /include | |
| parent | 8128846e16b406c7d459ae7556f7cd09bdc24c91 (diff) | |
dix: update pointer acceleration code to use ValuatorMask
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 10 | ||||
| -rw-r--r-- | include/ptrveloc.h | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/include/input.h b/include/input.h index 643866f98..165992a23 100644 --- a/include/input.h +++ b/include/input.h @@ -106,6 +106,8 @@ typedef struct _ClassesRec *ClassesPtr; typedef struct _SpriteRec *SpritePtr; typedef union _GrabMask GrabMask; +typedef struct _ValuatorMask ValuatorMask; + typedef struct _EventList { xEvent* event; int evlen; /* length of allocated memory for event in bytes. This is not @@ -141,10 +143,8 @@ typedef void (*DeviceUnwrapProc)( /* pointer acceleration handling */ typedef void (*PointerAccelSchemeProc)( - DeviceIntPtr /*pDev*/, - int /*first_valuator*/, - int /*num_valuators*/, - int* /*valuators*/, + DeviceIntPtr /*device*/, + ValuatorMask* /*valuators*/, int /*evtime*/); typedef void (*DeviceCallbackProc)( @@ -163,8 +163,6 @@ typedef struct _DeviceRec { Bool on; /* used by DDX to keep state */ } DeviceRec, *DevicePtr; -typedef struct _ValuatorMask ValuatorMask; - typedef struct { int click, bell, bell_pitch, bell_duration; Bool autoRepeat; diff --git a/include/ptrveloc.h b/include/ptrveloc.h index 5c57d42e7..a1165b156 100644 --- a/include/ptrveloc.h +++ b/include/ptrveloc.h @@ -1,6 +1,6 @@ /* * - * Copyright © 2006-2009 Simon Thum simon dot thum at gmx dot de + * Copyright © 2006-2011 Simon Thum simon dot thum at gmx dot de * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -25,7 +25,7 @@ #ifndef POINTERVELOCITY_H #define POINTERVELOCITY_H -#include <input.h> /* DeviceIntPtr */ +#include <input.h> /* constants for acceleration profiles */ @@ -134,11 +134,9 @@ InitPredictableAccelerationScheme(DeviceIntPtr dev, struct _ValuatorAccelerationRec* protoScheme); extern _X_INTERNAL void -acceleratePointerPredictable(DeviceIntPtr dev, int first_valuator, - int num_valuators, int *valuators, int evtime); +acceleratePointerPredictable(DeviceIntPtr dev, ValuatorMask* val, int evtime); extern _X_INTERNAL void -acceleratePointerLightweight(DeviceIntPtr dev, int first_valuator, - int num_valuators, int *valuators, int ignored); +acceleratePointerLightweight(DeviceIntPtr dev, ValuatorMask* val, int evtime); #endif /* POINTERVELOCITY_H */ |