Changeset 47226 in vbox

Timestamp:

Jul 18, 2013 8:20:07 AM (12 years ago)

Author:

vboxsync

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

87342

Message:

Main/Mouse: more adjustments to prepare for multi-touch.

Location:

trunk/src/VBox/Main

Files:

• include/MouseImpl.h (modified) (1 diff)
• src-client/MouseImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/MouseImpl.h

@@ -26 +26 @@
 
 /** Maximum number of devices supported */
-enum { MOUSE_MAX_DEVICES = 3 };
+enum { MOUSE_MAX_DEVICES = 10 };
 /** Mouse driver instance data. */
 typedef struct DRVMAINMOUSE DRVMAINMOUSE, *PDRVMAINMOUSE;

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

@@ -443 +443 @@
     LONG cJiggle = 0;
 
-    if (vmmdevCanAbs())
-    {
-        /*
-         * Send the absolute mouse position to the VMM device.
-         */
-        if (x != mcLastX || y != mcLastY)
+    /*
+     * Send the absolute mouse position to the device.
+     */
+    if (x != mcLastX || y != mcLastY)
+    {
+        if (vmmdevCanAbs())
         {
             rc = reportAbsEventToVMMDev(x, y);
             cJiggle = !fUsesVMMDevEvent;
         }
-        rc = reportRelEventToMouseDev(cJiggle, 0, dz, dw, fButtons);
-    }
-    else
-        rc = reportAbsEventToMouseDev(x, y, dz, dw, fButtons);
+        else
+            rc = reportAbsEventToMouseDev(x, y, 0, 0, 0);
+    }
+    rc = reportRelEventToMouseDev(cJiggle, 0, dz, dw, fButtons);
 
     mcLastX = x;