Changeset 47758 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 15, 2013 12:39:09 PM (12 years ago)

Author:

vboxsync

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

88016

Message:

Main/Mouse: add priorities to mouse devices so that the USB mouse is preferred over the PS/2 one when supported by the guest.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl2.cpp (modified) (1 diff)
• MouseImpl.cpp (modified) (3 diffs)

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

@@ -2460 +2460 @@
                 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;
 };
 
@@ -975 +977 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "Object\0"))
+    if (!CFGMR3AreValuesValid(pCfg, "Object\0Priority\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
     AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
@@ -1009 +1011 @@
     }
     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])
             {
-                pThis->pMouse->mpDrv[cDev] = pThis;
+                /* 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;
                 break;
             }