4 files changed, 36 insertions, 21 deletions

diff --git a/CHANGES b/CHANGES
index 8544468..f56506d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+bcm5974 (0.61) unstable; urgency=low
+
+  * Smoother motion in mouse interface
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Mon, 01 Sep 2008 21:01:24 +0200
+
 bcm5974 (0.60) unstable; urgency=low
 
   * New default mouse driver mode
diff --git a/bcm5974-dkms-mkdeb/debian/changelog b/bcm5974-dkms-mkdeb/debian/changelog
index aff6ab4..1ab2521 100644
--- a/bcm5974-dkms-mkdeb/debian/changelog
+++ b/bcm5974-dkms-mkdeb/debian/changelog
@@ -1,6 +1,5 @@
 MODULE_NAME-dkms (MODULE_VERSION) unstable; urgency=low
 
-  * New default mouse driver mode
-  * Mouse configuration parameters
+  * Smoother motion in mouse interface
 
  -- Henrik Rydberg <rydberg@euromail.se>  DATE_STAMP
diff --git a/bcm5974.c b/bcm5974.c
index 9aca008..9b67b2a 100644
--- a/bcm5974.c
+++ b/bcm5974.c
@@ -172,8 +172,10 @@ struct bcm5974_config {
 /* mouse driver state */
 struct bcm5974_mouse_state {
         int fingers;                    /* number of fingers on trackpad */
-        int wheel;                      /* vertical wheel counter */
-        int hwheel;                     /* horizontal wheel counter */
+        int rel_x;                      /* horizontal relative counter */
+        int rel_y;                      /* vertical relative counter */
+        int wheel_x;                    /* horizontal wheel counter */
+        int wheel_y;                    /* vertical wheel counter */
 };
 
 /* logical device structure */
@@ -276,8 +278,8 @@ static void setup_events_to_report(struct input_dev *input_dev,
                 __set_bit(EV_REL, input_dev->evbit);
                 __set_bit(REL_X, input_dev->relbit);
                 __set_bit(REL_Y, input_dev->relbit);
-                __set_bit(REL_WHEEL, input_dev->relbit);
                 __set_bit(REL_HWHEEL, input_dev->relbit);
+                __set_bit(REL_WHEEL, input_dev->relbit);
                 __set_bit(BTN_MIDDLE, input_dev->keybit);
                 __set_bit(BTN_RIGHT, input_dev->keybit);
                 break;
@@ -363,7 +365,7 @@ static void update_tp_mouse_state(struct input_dev *dev,
                                 const struct tp_finger *f,
                                 int p, int n)
 {
-        int dx = 0, dy = 0, sx = 0, sy = 0, sw = 0, shw = 0;
+        int dx = 0, dy = 0, sx = 0, sy = 0, swx = 0, swy = 0;
 
         if (f) {
                 dx = raw2int(f->rel_x);
@@ -376,30 +378,38 @@ static void update_tp_mouse_state(struct input_dev *dev,
 
         if (n >= 3) {
                 /* swipe */
-                ms->wheel = 0;
-                ms->hwheel += int2scale(&c->x, dx);
-                shw = ms->hwheel / mouse_hwheel_damping;
-                ms->hwheel -= shw * mouse_hwheel_damping;
+                ms->rel_x = 0;
+                ms->rel_y = 0;
+                ms->wheel_x += int2scale(&c->x, dx);
+                ms->wheel_y = 0;
+                swx = ms->wheel_x / mouse_hwheel_damping;
+                ms->wheel_x -= swx * mouse_hwheel_damping;
         } else if (n == 2) {
                 /* scroll */
-                ms->wheel += int2scale(&c->y, dy);
-                ms->hwheel = 0;
-                sw = ms->wheel / mouse_wheel_damping;
-                ms->wheel -= sw * mouse_wheel_damping;
+                ms->rel_x = 0;
+                ms->rel_y = 0;
+                ms->wheel_x = 0;
+                ms->wheel_y += int2scale(&c->y, dy);
+                swy = ms->wheel_y / mouse_wheel_damping;
+                ms->wheel_y -= swy * mouse_wheel_damping;
         } else {
                 /* pointer */
-                ms->wheel = 0;
-                ms->hwheel = 0;
-                sx = int2scale(&c->x, dx) / mouse_motion_damping;
-                sy = int2scale(&c->y, -dy) / mouse_motion_damping;
+                ms->rel_x += int2scale(&c->x, dx);
+                ms->rel_y += int2scale(&c->y, -dy);
+                ms->wheel_x = 0;
+                ms->wheel_y = 0;
+                sx = ms->rel_x / mouse_motion_damping;
+                sy = ms->rel_y / mouse_motion_damping;
+                ms->rel_x -= sx * mouse_motion_damping;
+                ms->rel_y -= sy * mouse_motion_damping;
         }
 
         ms->fingers = n;
 
         input_report_rel(dev, REL_X, sx);
         input_report_rel(dev, REL_Y, sy);
-        input_report_rel(dev, REL_WHEEL, sw);
-        input_report_rel(dev, REL_HWHEEL, shw);
+        input_report_rel(dev, REL_HWHEEL, swx);
+        input_report_rel(dev, REL_WHEEL, swy);
 }
 
 /* update logical touchpad state */
diff --git a/dkms.conf b/dkms.conf
index fa3d9e5..07c7af3 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="bcm5974"
-PACKAGE_VERSION="0.60"
+PACKAGE_VERSION="0.61"
 MAKE[0]="make -C ${kernel_source_dir}
   SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
 BUILT_MODULE_NAME[0]="bcm5974"