Adjust major / minor axes to scale

Adjust reported major/minor axis to better match visual size.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

2 files changed, 7 insertions, 5 deletions

diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 7674f6a..beb43ec 100644
--- a/usr/src/dkms_source_tree/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,5 @@
 NAME=hid-3m-pct
-VERSION=1.0.1
+VERSION=1.0.2
 PACKAGE_NAME="$NAME"
 PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}
diff --git a/usr/src/dkms_source_tree/hid-3m-pct.c b/usr/src/dkms_source_tree/hid-3m-pct.c
index 65441e0..cd4b125 100644
--- a/usr/src/dkms_source_tree/hid-3m-pct.c
+++ b/usr/src/dkms_source_tree/hid-3m-pct.c
@@ -162,16 +162,18 @@ static void mmm_filter_event(struct mmm_data *md, struct input_dev *input)
                 if (f->touch) {
                         /* this finger is on the screen */
                         int wide = (f->w > f->h);
+                        /* divided by two to match visual scale of touch */
+                        int major = max(f->w, f->h) >> 1;
+                        int minor = min(f->w, f->h) >> 1;
+
                         if (!f->prev_touch)
                                 f->id = md->id++;
                         input_event(input, EV_ABS, ABS_MT_TRACKING_ID, f->id);
                         input_event(input, EV_ABS, ABS_MT_POSITION_X, f->x);
                         input_event(input, EV_ABS, ABS_MT_POSITION_Y, f->y);
                         input_event(input, EV_ABS, ABS_MT_ORIENTATION, wide);
-                        input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR,
-                                                wide ? f->w : f->h);
-                        input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR,
-                                                wide ? f->h : f->w);
+                        input_event(input, EV_ABS, ABS_MT_TOUCH_MAJOR, major);
+                        input_event(input, EV_ABS, ABS_MT_TOUCH_MINOR, minor);
                         /* touchscreen emulation: pick the oldest contact */
                         if (!oldest || ((f->id - oldest->id) & (SHRT_MAX + 1)))
                                 oldest = f;