summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2008-11-07 02:08:09 +0100
committerHenrik Rydberg <rydberg@euromail.se>2008-11-07 02:08:09 +0100
commit79e375ff801bfe6caa27524c001a6ce8b27cec6f (patch)
tree557ee2792b1885186262a7a18c37bf5b09157c66 /src
parent2cd550cb34ea0304761c0ddc8c278e02c4a4dfcf (diff)
and now it works!
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src')
-rw-r--r--src/multitouch.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/multitouch.c b/src/multitouch.c
index 7ea1f92..7102b1c 100644
--- a/src/multitouch.c
+++ b/src/multitouch.c
@@ -29,6 +29,14 @@ static void pointer_control(DeviceIntPtr dev, PtrCtrl *ctrl)
29{ 29{
30} 30}
31 31
32static int pointer_property(DeviceIntPtr dev,
33 Atom property,
34 XIPropertyValuePtr prop,
35 BOOL checkonly)
36{
37 return Success;
38}
39
32//////////////////////////////////////////////////////////////////////////// 40////////////////////////////////////////////////////////////////////////////
33 41
34static int device_init(DeviceIntPtr dev, LocalDevicePtr local) 42static int device_init(DeviceIntPtr dev, LocalDevicePtr local)
@@ -61,15 +69,15 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local)
61 mt->caps.abs_position_x.minimum, 69 mt->caps.abs_position_x.minimum,
62 mt->caps.abs_position_x.maximum, 70 mt->caps.abs_position_x.maximum,
63 1, 0, 1); 71 1, 0, 1);
64 xf86InitValuatorDefaults(dev, 0);
65 xf86InitValuatorAxisStruct(dev, 1, 72 xf86InitValuatorAxisStruct(dev, 1,
66 mt->caps.abs_position_y.minimum, 73 mt->caps.abs_position_y.minimum,
67 mt->caps.abs_position_y.maximum, 74 mt->caps.abs_position_y.maximum,
68 1, 0, 1); 75 1, 0, 1);
76 xf86InitValuatorDefaults(dev, 0);
69 xf86InitValuatorDefaults(dev, 1); 77 xf86InitValuatorDefaults(dev, 1);
70 78
71 //InitDeviceProperties(local); 79 InitDeviceProperties(local);
72 //XIRegisterPropertyHandler(dev, SetProperty, NULL, NULL); 80 XIRegisterPropertyHandler(dev, pointer_property, NULL, NULL);
73 81
74 return 0; 82 return 0;
75} 83}