Changeset 47841 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 19, 2013 1:20:58 PM (12 years ago)

Author:

vboxsync

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

88130

Message:

Main/Devices: reverted combined use of two emulated USB devices for reporting absolute events.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• MouseImpl.cpp (modified) (5 diffs)

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

@@ -2445 +2445 @@
                 || aPointingHID == PointingHIDType_USBTablet
                 || aPointingHID == PointingHIDType_USBMultiTouch)
-            {
                 InsertConfigNode(pUsbDevices, "HidMouse", &pDev);
+            if (aPointingHID == PointingHIDType_USBMouse)
+            {
                 InsertConfigNode(pDev,     "0", &pInst);
                 InsertConfigNode(pInst,    "Config", &pCfg);
@@ -2460 +2461 @@
                 InsertConfigNode(pLunL1,   "Config", &pCfg);
                 InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
-                InsertConfigInteger(pCfg,  "Priority",   2);  /* Prefer over PS/2 */
             }
             if (   aPointingHID == PointingHIDType_USBTablet

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

@@ -59 +59 @@
     /** The capabilities of this device. */
     uint32_t                    u32DevCaps;
-    /** The device priority. */
-    uint32_t                    u32Priority;
 };
 
@@ -439 +437 @@
                               bool fUsesVMMDevEvent)
 {
-    HRESULT rc = S_OK;
+    HRESULT rc;
     /** If we are using the VMMDev to report absolute position but without
      * VMMDev IRQ support then we need to send a small "jiggle" to the emulated
@@ -445 +443 @@
     LONG cJiggle = 0;
 
-    /*
-     * Send the absolute mouse position to the device.
-     */
-    if (x != mcLastX || y != mcLastY)
-    {
-        if (vmmdevCanAbs())
+    if (vmmdevCanAbs())
+    {
+        /*
+         * Send the absolute mouse position to the VMM device.
+         */
+        if (x != mcLastX || y != mcLastY)
         {
             rc = reportAbsEventToVMMDev(x, y);
             cJiggle = !fUsesVMMDevEvent;
         }
-        else
-            rc = reportAbsEventToMouseDev(x, y, 0, 0, fButtons);
-    }
-    if (SUCCEEDED(rc))
         rc = reportRelEventToMouseDev(cJiggle, 0, dz, dw, fButtons);
+    }
+    else
+        rc = reportAbsEventToMouseDev(x, y, dz, dw, fButtons);
 
     mcLastX = x;
@@ -998 +995 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "Object\0Priority\0"))
+    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
     AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
@@ -1032 +1029 @@
     }
     pThis->pMouse = (Mouse *)pv;        /** @todo Check this cast! */
-    /*
-     * Get the device priority.
-     */
-    rc = CFGMR3QueryU32Def(pCfg, "Priority", &pThis->u32Priority, 1);
-    if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Configuration error: Bad \"Priority\" value! rc=%Rrc\n", rc));
-        return rc;
-    }
     unsigned cDev;
     {
-        PDRVMAINMOUSE pObject = pThis;
         AutoReadLock mouseLock(pThis->pMouse COMMA_LOCKVAL_SRC_POS);
 
         for (cDev = 0; cDev < MOUSE_MAX_DEVICES; ++cDev)
-            if (pThis->pMouse->mpDrv[cDev])
+            if (!pThis->pMouse->mpDrv[cDev])
             {
-                /* Fix priorities. */
-                if (   pThis->pMouse->mpDrv[cDev]->u32Priority
-                    <= pObject->u32Priority)
-                {
-                    PDRVMAINMOUSE pNewObject = pThis->pMouse->mpDrv[cDev];
-                    pThis->pMouse->mpDrv[cDev] = pObject;
-                    pObject = pNewObject;
-                }
-            }
-            else
-            {
-                pThis->pMouse->mpDrv[cDev] = pObject;
+                pThis->pMouse->mpDrv[cDev] = pThis;
                 break;
             }