Changeset 47798 in vbox

Timestamp:

Aug 16, 2013 10:41:55 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88059

Message:

MouseImpl: corrected touch event range check.

File:

• trunk/src/VBox/Main/src-client/MouseImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -739 +739 @@
             int32_t y2 = y1 + cHeight;
 
-            LogRel3(("%s: screen %d,%d %d,%d\n",
-                     __FUNCTION__, x1, y1, x2, y2));
+            LogRel3(("%s: screen [%d] %d,%d %d,%d\n",
+                     __FUNCTION__, uScreenId, x1, y1, x2, y2));
 
             LONG i;
@@ -756 +756 @@
                          __FUNCTION__, i, x, y, contactId, fInContact, fInRange));
 
-                /* Screen dimensions are 0,0 width, height, that is x2,y2 are exclusive,
-                 * while coords are inclusive.
+                /* x1,y1 are inclusive and x2,y2 are exclusive,
+                 * while x,y start from 1 and are inclusive.
                  */
-                if (x < x1 || x >= x2 || y < y1 || y >= y2)
+                if (x <= x1 || x > x2 || y <= y1 || y > y2)
                 {
                     /* Out of range. Skip the contact. */