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

Timestamp:

Jun 24, 2022 8:39:25 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt, Main/Console+Mouse: Make compatible with Qt6, and add some API change bits forgotten in previous change. bugref:9891

Location:

trunk/src/VBox/Main/src-client

Files:

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

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

@@ -2261 +2261 @@
             if (   aPointingHID == PointingHIDType_USBMouse
                 || aPointingHID == PointingHIDType_USBTablet
-                || aPointingHID == PointingHIDType_USBMultiTouch)
+                || aPointingHID == PointingHIDType_USBMultiTouch
+                || aPointingHID == PointingHIDType_USBMultiTouchScreenPlusPad)
             {
                 InsertConfigNode(pUsbDevices, "HidMouse", &pDev);
@@ -2279 +2280 @@
                 InsertConfigString(pLunL1, "Driver",        "MainMouse");
             }
-            if (aPointingHID == PointingHIDType_USBMultiTouch)
+            if (   aPointingHID == PointingHIDType_USBMultiTouch
+                || aPointingHID == PointingHIDType_USBMultiTouchScreenPlusPad)
             {
                 InsertConfigNode(pDev,     "1", &pInst);
@@ -2285 +2287 @@
 
                 InsertConfigString(pCfg,   "Mode", "multitouch");
+                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");
+            }
+            if (aPointingHID == PointingHIDType_USBMultiTouchScreenPlusPad)
+            {
+                InsertConfigNode(pDev,     "2", &pInst);
+                InsertConfigNode(pInst,    "Config", &pCfg);
+
+                InsertConfigString(pCfg,   "Mode", "touchpad");
                 InsertConfigNode(pInst,    "LUN#0", &pLunL0);
                 InsertConfigString(pLunL0, "Driver",        "MouseQueue");

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

@@ -1192 +1192 @@
 
 
-/** Can we currently send absolute events to the guest? */
+/** Can we currently send multi-touch events (touchscreen variant) to the guest? */
 bool Mouse::i_supportsTS(void)
 {
@@ -1199 +1199 @@
     i_getDeviceCaps(NULL, NULL, &fTSDev, NULL);
     return fTSDev;
+}
+
+
+/** Can we currently send multi-touch events (touchpad variant) to the guest? */
+bool Mouse::i_supportsTP(void)
+{
+    bool fTPDev;
+
+    i_getDeviceCaps(NULL, NULL, NULL, &fTPDev);
+    return fTPDev;
 }