Changeset 47360 in vbox for trunk/src/VBox

Timestamp:

Jul 24, 2013 3:46:46 AM (12 years ago)

Author:

vboxsync

Message:

Multi-touch: little fixes.

Location:

trunk/src/VBox/Devices/Input

Files:

• DrvMouseQueue.cpp (modified) (1 diff)
• UsbMouse.cpp (modified) (6 diffs)

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

@@ -92 +92 @@
         struct
         {
-            bool        fContact;
+            uint32_t    fContact;
             uint32_t    x;
             uint32_t    y;

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

@@ -141 +141 @@
         struct
         {
-            bool        fContact;
+            uint32_t    fContact;
             uint32_t    x;
             uint32_t    y;
@@ -899 +899 @@
     {
     case USBHIDMODE_ABSOLUTE:
-    {
         pReport->t.fButtons = pAccumulated->u.Absolute.fButtons;
         pReport->t.x        = pAccumulated->u.Absolute.x;
@@ -909 +908 @@
                  cbCopy));
         break;
-    }
     case USBHIDMODE_RELATIVE:
-    {
         pReport->m.fButtons = pAccumulated->u.Relative.fButtons;
         pReport->m.dx       = clamp_i8(pAccumulated->u.Relative.dx);
@@ -922 +919 @@
                  pReport->m.fButtons, cbCopy));
         break;
-    }
     case USBHIDMODE_MULTI_TOUCH:
-    {
         pReport->mt.idReport         = REPORTID_MOUSE;
         pReport->mt.cContact         = pAccumulated->u.MultiTouch.cContact;
@@ -931 +926 @@
         pReport->mt.fContact         = pAccumulated->u.MultiTouch.fContact;
 
-        cbCopy = sizeof(pReport->t);
+        cbCopy = sizeof(pReport->mt);
         LogRel3(("Multi-touch event, x=%u, y=%u, report size %d\n",
                  pReport->mt.x, pReport->mt.y, cbCopy));
         break;
-    }
     }
 
@@ -1222 +1216 @@
                                 {
                                 case USBHIDMODE_ABSOLUTE:
-                                {
                                     cbDesc = sizeof(g_UsbHidTIfHidDesc);
                                     pDesc = (const uint8_t *)&g_UsbHidTIfHidDesc;
                                     break;
-                                }
                                 case USBHIDMODE_RELATIVE:
-                                {
                                     cbDesc = sizeof(g_UsbHidMIfHidDesc);
                                     pDesc = (const uint8_t *)&g_UsbHidMIfHidDesc;
                                     break;
-                                }
                                 case USBHIDMODE_MULTI_TOUCH:
-                                {
                                     cbDesc = sizeof(g_UsbHidMTIfHidDesc);
                                     pDesc = (const uint8_t *)&g_UsbHidMTIfHidDesc;
                                     break;
-                                }
                                 }
                                 /* Returned data is written after the setup message. */