summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-25 22:49:54 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-25 22:49:54 +0930
commit0877de13ac6ddfb55108aa3456d47f970c6c442c (patch)
tree6e28eef360b45c19031e73bb6eb101f729464391 /include
parent00b4339168c10dd4ce026deb8e04bfb63dfd11dc (diff)
Remove GetMotionProc from ValuatorClassRec.
With the MD/SD device hierarchy we need control over the generation of the motion history as well as the conversion later before posting it to the client. So let's not let the drivers change it. No x.org driver currently uses it anyway, linuxwacom doesn't either so dumping it seems safe enough.
Diffstat (limited to 'include')
-rw-r--r--include/input.h9
-rw-r--r--include/inputstr.h3
2 files changed, 1 insertions, 11 deletions
diff --git a/include/input.h b/include/input.h
index 9b92ea33d..70f3de64f 100644
--- a/include/input.h
+++ b/include/input.h
@@ -274,17 +274,9 @@ extern Bool InitButtonClassDeviceStruct(
int /*numButtons*/,
CARD8* /*map*/);
-typedef int (*ValuatorMotionProcPtr)(
- DeviceIntPtr /*pdevice*/,
- xTimecoord * /*coords*/,
- unsigned long /*start*/,
- unsigned long /*stop*/,
- ScreenPtr /*pScreen*/);
-
extern Bool InitValuatorClassDeviceStruct(
DeviceIntPtr /*device*/,
int /*numAxes*/,
- ValuatorMotionProcPtr /* motionProc */,
int /*numMotionEvents*/,
int /*mode*/);
@@ -358,7 +350,6 @@ extern Bool InitPointerDeviceStruct(
DevicePtr /*device*/,
CARD8* /*map*/,
int /*numButtons*/,
- ValuatorMotionProcPtr /*motionProc*/,
PtrCtrlProcPtr /*controlProc*/,
int /*numMotionEvents*/,
int /*numAxes*/);
diff --git a/include/inputstr.h b/include/inputstr.h
index d26eb1377..86b166721 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -164,11 +164,10 @@ typedef struct _AxisInfo {
} AxisInfo, *AxisInfoPtr;
typedef struct _ValuatorClassRec {
- ValuatorMotionProcPtr GetMotionProc;
int numMotionEvents;
int first_motion;
int last_motion;
- void *motion;
+ void *motion; /* motion history buffer */
WindowPtr motionHintWindow;