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

Timestamp:

Jul 19, 2013 9:43:01 AM (12 years ago)

Author:

vboxsync

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

87375

Message:

Setings: add multi-touch setting and fix combo mouse somewhat.

File:

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

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

@@ -1269 +1269 @@
         InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pKeyboard);
 
-        InsertConfigNode(pInst,    "LUN#1", &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);
         Mouse *pMouse = mMouse;
-        InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
+        PointingHIDType_T aPointingHID;
+        hrc = pMachine->COMGETTER(PointingHIDType)(&aPointingHID);          H();
+        if (   aPointingHID == PointingHIDType_PS2Mouse
+            || aPointingHID == PointingHIDType_ComboMouse)
+        {
+            InsertConfigNode(pInst,    "LUN#1", &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);
+        }
 
         /*
@@ -2417 +2423 @@
 
                 /* Virtual USB Mouse/Tablet */
-                PointingHIDType_T aPointingHID;
-                hrc = pMachine->COMGETTER(PointingHIDType)(&aPointingHID);                  H();
                 if (   aPointingHID == PointingHIDType_USBMouse
-                    || aPointingHID == PointingHIDType_USBTablet)
+                    || aPointingHID == PointingHIDType_ComboMouse
+                    || aPointingHID == PointingHIDType_USBTablet
+                    || aPointingHID == PointingHIDType_USBMultiTouch)
                 {
                     InsertConfigNode(pUsbDevices, "HidMouse", &pDev);
@@ -2435 +2441 @@
                     InsertConfigString(pLunL1, "Driver",        "MainMouse");
                     InsertConfigNode(pLunL1,   "Config", &pCfg);
-                    pMouse = mMouse;
                     InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
                 }
-                if (aPointingHID == PointingHIDType_USBTablet)
+                if (   aPointingHID == PointingHIDType_USBTablet
+                    || aPointingHID == PointingHIDType_USBMultiTouch)
                 {
                     InsertConfigNode(pDev,     "1", &pInst);
@@ -2452 +2458 @@
                     InsertConfigString(pLunL1, "Driver",        "MainMouse");
                     InsertConfigNode(pLunL1,   "Config", &pCfg);
-                    pMouse = mMouse;
                     InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
+                }
+                if (aPointingHID == PointingHIDType_USBMultiTouch)
+                {
                     InsertConfigNode(pDev,     "2", &pInst);
                     InsertConfigNode(pInst,    "Config", &pCfg);
@@ -2466 +2474 @@
                     InsertConfigString(pLunL1, "Driver",        "MainMouse");
                     InsertConfigNode(pLunL1,   "Config", &pCfg);
-                    pMouse = mMouse;
                     InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
                 }