Changeset 47228 in vbox

Timestamp:

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

Author:

vboxsync

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

87344

Message:

ConsoleImpl2: enable the multi-touch device in the guest.

File:

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

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

@@ -2419 +2419 @@
                 PointingHIDType_T aPointingHID;
                 hrc = pMachine->COMGETTER(PointingHIDType)(&aPointingHID);                  H();
-                if (aPointingHID == PointingHIDType_USBMouse || aPointingHID == PointingHIDType_USBTablet)
+                if (   aPointingHID == PointingHIDType_USBMouse
+                    || aPointingHID == PointingHIDType_USBTablet)
                 {
                     InsertConfigNode(pUsbDevices, "HidMouse", &pDev);
@@ -2425 +2426 @@
                     InsertConfigNode(pInst,    "Config", &pCfg);
 
-                    if (aPointingHID == PointingHIDType_USBTablet)
-                    {
-                        InsertConfigString(pCfg, "Mode", "absolute");
-                    }
-                    else
-                    {
-                        InsertConfigString(pCfg, "Mode", "relative");
-                    }
+                    InsertConfigString(pCfg,   "Mode", "relative");
+                    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);
+                    pMouse = mMouse;
+                    InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
+                }
+                if (aPointingHID == PointingHIDType_USBTablet)
+                {
+                    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);
+                    pMouse = mMouse;
+                    InsertConfigInteger(pCfg,  "Object",     (uintptr_t)pMouse);
+                    InsertConfigNode(pDev,     "2", &pInst);
+                    InsertConfigNode(pInst,    "Config", &pCfg);
+
+                    InsertConfigString(pCfg,   "Mode", "multitouch");
                     InsertConfigNode(pInst,    "LUN#0", &pLunL0);
                     InsertConfigString(pLunL0, "Driver",        "MouseQueue");