Changeset 49625 in vbox for trunk/src

Timestamp:

Nov 22, 2013 1:00:50 PM (11 years ago)

Author:

vboxsync

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

90848

Message:

Main: make the USB tablet device instance 0 again.

File:

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

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

@@ -1729 +1729 @@
             /* Virtual USB Mouse/Tablet */
             if (   aPointingHID == PointingHIDType_USBMouse
-                || aPointingHID == PointingHIDType_ComboMouse
                 || aPointingHID == PointingHIDType_USBTablet
                 || aPointingHID == PointingHIDType_USBMultiTouch)
+            {
                 InsertConfigNode(pUsbDevices, "HidMouse", &pDev);
-            if (aPointingHID == PointingHIDType_USBMouse)
-            {
                 InsertConfigNode(pDev,     "0", &pInst);
                 InsertConfigNode(pInst,    "Config", &pCfg);
 
-                InsertConfigString(pCfg,   "Mode", "relative");
+                if (aPointingHID == PointingHIDType_USBMouse)
+                    InsertConfigString(pCfg,   "Mode", "relative");
+                else
+                    InsertConfigString(pCfg,   "Mode", "absolute");
                 InsertConfigNode(pInst,    "LUN#0", &pLunL0);
                 InsertConfigString(pLunL0, "Driver",        "MouseQueue");
@@ -1749 +1750 @@
                 InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
             }
-            if (   aPointingHID == PointingHIDType_USBTablet
-                || aPointingHID == PointingHIDType_USBMultiTouch)
+            if (aPointingHID == PointingHIDType_USBMultiTouch)
             {
                 InsertConfigNode(pDev,     "1", &pInst);
-                InsertConfigNode(pInst,    "Config", &pCfg);
-
-                InsertConfigString(pCfg,   "Mode", "absolute");
-                InsertConfigNode(pInst,    "LUN#0", &pLunL0);
-                InsertConfigString(pLunL0, "Driver",        "MouseQueue");
-                InsertConfigNode(pLunL0,   "Config", &pCfg);
-                InsertConfigInteger(pCfg,  "QueueSize",            128);
-
-                InsertConfigNode(pLunL0,   "AttachedDriver", &pLunL1);
-                InsertConfigString(pLunL1, "Driver",        "MainMouse");
-                InsertConfigNode(pLunL1,   "Config", &pCfg);
-                InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
-            }
-            if (aPointingHID == PointingHIDType_USBMultiTouch)
-            {
-                InsertConfigNode(pDev,     "2", &pInst);
                 InsertConfigNode(pInst,    "Config", &pCfg);