From: bru <bru@openbsd.org>
Date: Tue, 5 Jul 2016 19:33:14 +0000 (+0000)
Subject: Improve the tracking functions in wsmouse.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=cc15997034cca04fa523a12755db6abe8396c2b8;p=openbsd

Improve the tracking functions in wsmouse.

ok mpi@
---

diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index 6206441e195..b5ade6d649a 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmouse.c,v 1.30 2016/06/06 22:32:47 bru Exp $ */
+/* $OpenBSD: wsmouse.c,v 1.31 2016/07/05 19:33:14 bru Exp $ */
 /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -1125,11 +1125,13 @@ wsmouse_matching(int *matrix, int m, int n, int *buffer)
 	for (; p < alt; *p++ = 0) {}
 	for (col = 0; col < n; col++) {
 		delta = INT_MAX;
-		for (i = 0, p = matrix + col; i < m; i++, p += n)
-			if ((d = *p - red[i]) <= delta) {
+		for (i = 0, p = matrix + col; i < m; i++, p += n) {
+			d = *p - red[i];
+			if (d < delta || (d == delta && r2c[i] < 0)) {
 				delta = d;
 				row = i;
 			}
+		}
 		cd[col] = delta;
 		if (r2c[row] < 0) {
 			r2c[row] = col;
@@ -1151,7 +1153,8 @@ wsmouse_matching(int *matrix, int m, int n, int *buffer)
 						mc[i] = j;
 					}
 					d -= red[i];
-					if (d <= delta) {
+					if (d < delta || (d == delta
+					    && r2c[i] < 0)) {
 						delta = d;
 						row = i;
 					}