Changeset 95395 in vbox for trunk/src/VBox

Timestamp:

Jun 27, 2022 3:49:05 PM (3 years ago)

Author:

vboxsync

Message:

Main/Mouse+SystemProperties+Settings: Forgotten important pieces of TouchPad support. bugref:9891

Location:

trunk/src/VBox/Main

Files:

• include/MouseImpl.h (modified) (1 diff)
• src-server/SystemPropertiesImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/MouseImpl.h

@@ -28 +28 @@
 
 /** Maximum number of devices supported */
-enum { MOUSE_MAX_DEVICES = 3 };
+enum { MOUSE_MAX_DEVICES = 4 };
 /** Mouse driver instance data. */
 typedef struct DRVMAINMOUSE DRVMAINMOUSE, *PDRVMAINMOUSE;

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -1511 +1511 @@
 #endif
         PointingHIDType_USBMultiTouch,
+        PointingHIDType_USBMultiTouchScreenPlusPad,
     };
     aSupportedPointingHIDTypes.assign(aPointingHIDTypes,

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4930 +4930 @@
                 else if (strHIDType == "USBMultiTouch")
                     hw.pointingHIDType = PointingHIDType_USBMultiTouch;
+                else if (strHIDType == "USBMTScreenPlusPad")
+                    hw.pointingHIDType = PointingHIDType_USBMultiTouchScreenPlusPad;
                 else
                     throw ConfigFileError(this,
@@ -6539 +6541 @@
                 case PointingHIDType_ComboMouse:    pcszHID = "ComboMouse";   break;
                 case PointingHIDType_USBMultiTouch: pcszHID = "USBMultiTouch";break;
+                case PointingHIDType_USBMultiTouchScreenPlusPad: pcszHID = "USBMTScreenPlusPad";break;
                 case PointingHIDType_None:          pcszHID = "None";         break;
                 default:            Assert(false);  pcszHID = "PS2Mouse";     break;