1 files changed, 12 insertions, 10 deletions

diff --git a/src/frame-mtdev.c b/src/frame-mtdev.c
index 9192510..caf90ae 100644
--- a/src/frame-mtdev.c
+++ b/src/frame-mtdev.c
@@ -104,12 +104,12 @@ int utouch_frame_init_mtdev(utouch_frame_handle fh,
         }
 
         s->max_pressure = evemu_get_abs_maximum(dev, ABS_MT_PRESSURE);
-        if (s->use_pressure && s->max_pressure == 0)
+        if (s->max_pressure == 0)
                 s->max_pressure = 256;
 
-        fh->max_orient = evemu_get_abs_maximum(dev, ABS_MT_ORIENTATION);
-        if (s->use_orientation && fh->max_orient == 0)
-                fh->max_orient = 1;
+        s->max_orient = evemu_get_abs_maximum(dev, ABS_MT_ORIENTATION);
+        if (s->max_orient == 0)
+                s->max_orient = 1;
 
         tmp = evemu_get_abs_resolution(dev, ABS_MT_POSITION_X);
         if (tmp > 0)
@@ -133,12 +133,14 @@ int utouch_frame_init_mtdev(utouch_frame_handle fh,
         else
                 s->phys_pressure = 10;
 
-        return 0;
-}
+        /* defaults expected by initial frame version */
+        s->mapped_min_x = s->min_x;
+        s->mapped_min_y = s->min_y;
+        s->mapped_max_x = s->max_x;
+        s->mapped_max_y = s->max_y;
+        s->mapped_max_pressure = s->max_pressure;
 
-static float touch_angle(utouch_frame_handle fh, int orient)
-{
-        return orient / fh->max_orient * M_PI_2;
+        return 0;
 }
 
 static int handle_abs_event(utouch_frame_handle fh,
@@ -169,7 +171,7 @@ static int handle_abs_event(utouch_frame_handle fh,
                 t->width_minor = ev->value;
                 return 1;
         case ABS_MT_ORIENTATION:
-                t->orientation = touch_angle(fh, ev->value);
+                t->orientation = ev->value;
                 return 1;
         case ABS_MT_PRESSURE:
                 t->pressure = ev->value;