Changeset 47219 in vbox for trunk

Timestamp:

Jul 17, 2013 2:00:49 PM (12 years ago)

Author:

vboxsync

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

87333

Message:

Devices/Input: machine configuration for multi-touch device.

Location:

trunk/src/VBox

Files:

• Devices/Input/UsbMouse.cpp (modified) (2 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Input/UsbMouse.cpp

@@ -1574 +1574 @@
 {
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
-    bool isAbsolute;
+    char szMode[64];
     LogRelFlow(("usbHidConstruct/#%u:\n", iInstance));
 
@@ -1595 +1595 @@
      * Validate and read the configuration.
      */
-    rc = CFGMR3ValidateConfig(pCfg, "/", "Absolute|CoordShift", "Config", "UsbHid", iInstance);
+    rc = CFGMR3ValidateConfig(pCfg, "/", "Mode|CoordShift", "Config", "UsbHid", iInstance);
     if (RT_FAILURE(rc))
         return rc;
-    rc = CFGMR3QueryBoolDef(pCfg, "Absolute", &isAbsolute, false);
+    rc = CFGMR3QueryStringDef(pCfg, "Mode", szMode, sizeof(szMode), "relative");
     if (RT_FAILURE(rc))
         return PDMUsbHlpVMSetError(pUsbIns, rc, RT_SRC_POS, N_("HID failed to query settings"));
-    pThis->enmMode = isAbsolute ? USBHIDMODE_ABSOLUTE : USBHIDMODE_RELATIVE;
+    if (!RTStrCmp(szMode, "relative"))
+        pThis->enmMode = USBHIDMODE_RELATIVE;
+    else if (!RTStrCmp(szMode, "absolute"))
+        pThis->enmMode = USBHIDMODE_ABSOLUTE;
+    else if (!RTStrCmp(szMode, "multitouch"))
+        pThis->enmMode = USBHIDMODE_MULTI_TOUCH;
+    else
+        return PDMUsbHlpVMSetError(pUsbIns, rc, RT_SRC_POS,
+                                   N_("Invalid HID device mode"));
 
     pThis->Lun0.IBase.pfnQueryInterface = usbHidMouseQueryInterface;

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

@@ -2427 +2427 @@
                     if (aPointingHID == PointingHIDType_USBTablet)
                     {
-                        InsertConfigInteger(pCfg, "Absolute", 1);
+                        InsertConfigString(pCfg, "Mode", "absolute");
                     }
                     else
                     {
-                        InsertConfigInteger(pCfg, "Absolute", 0);
+                        InsertConfigString(pCfg, "Mode", "relative");
                     }
                     InsertConfigNode(pInst,    "LUN#0", &pLunL0);