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

Timestamp:

Aug 16, 2013 12:26:40 PM (12 years ago)

Author:

vboxsync

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

88065

Message:

Main: OnGuestMouse event cleanup.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (3 diffs)
• include/MouseImpl.h (modified) (1 diff)
• src-client/MouseImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -20596 +20596 @@
   <enum
     name="GuestMouseEventMode"
-    uuid="5eff2374-9a4e-4c47-aaee-8815e5ce58c2"
+    uuid="4b500146-ebba-4b7c-bc29-69c2d57a5caf"
     >
 
@@ -20618 +20618 @@
       </desc>
     </const>
-
-    <const name="MultiTouch" value="2">
-      <desc>
-        Multi-touch event.
-      </desc>
-    </const>
   </enum>
 
   <interface
     name="IGuestMouseEvent" extends="IReusableEvent"
-    uuid="1f85d35c-c524-40ff-8e98-307000df0992"
+    uuid="179f8647-319c-4e7e-8150-c5837bd265f6"
     wsmap="managed" autogen="VBoxEvent" id="OnGuestMouse"
     >
@@ -20665 +20659 @@
     </attribute>
 
-    <attribute name="contact" type="long" readonly="yes">
-      <desc>
-        The multi-touch contact identifier.  This remains valid as long as a
-        touch is in progress and can and should be re-used after a touch has
-        terminated (see @a buttons).
-      </desc>
-    </attribute>
-
     <attribute name="buttons" type="long" readonly="yes">
       <desc>
-        Button state bitmask.  Multi-touch events should have the first bit set
-        as long as the touch is in progress and terminate with an event with no
-        bits set.
+        Button state bitmask.
       </desc>
     </attribute>

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

@@ -128 +128 @@
 
     void fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw,
-                        LONG cContact, LONG fButtons);
+                        LONG fButtons);
 };
 

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

@@ -118 +118 @@
     AssertComRCReturnRC(rc);
     mMouseEvent.init(mEventSource, VBoxEventType_OnGuestMouse,
-                     0, 0, 0, 0, 0);
+                     0, 0, 0, 0, 0, 0);
 
     /* Confirm a successful initialization */
@@ -470 +470 @@
 
 void Mouse::fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw,
-                           LONG cContact, LONG fButtons)
+                           LONG fButtons)
 {
     /* If mouse button is pressed, we generate new event, to avoid reusable events coalescing and thus
        dropping key press events */
+    GuestMouseEventMode_T mode = fAbsolute? GuestMouseEventMode_Absolute: GuestMouseEventMode_Relative;
     if (fButtons != 0)
     {
         VBoxEventDesc evDesc;
-        evDesc.init(mEventSource, VBoxEventType_OnGuestMouse, fAbsolute, x, y,
-                    dz, dw, cContact, fButtons);
+        evDesc.init(mEventSource, VBoxEventType_OnGuestMouse, mode, x, y,
+                    dz, dw, fButtons);
         evDesc.fire(0);
     }
     else
     {
-        mMouseEvent.reinit(VBoxEventType_OnGuestMouse, fAbsolute, x, y, dz, dw,
-                           cContact, fButtons);
+        mMouseEvent.reinit(VBoxEventType_OnGuestMouse, mode, x, y, dz, dw,
+                           fButtons);
         mMouseEvent.fire(0);
     }
@@ -519 +520 @@
     rc = reportRelEventToMouseDev(dx, dy, dz, dw, fButtonsAdj);
 
-    fireMouseEvent(false, dx, dy, dz, dw, 0, fButtons);
+    fireMouseEvent(false, dx, dy, dz, dw, fButtons);
 
     return rc;
@@ -633 +634 @@
                                     & VMMDEV_MOUSE_NEW_PROTOCOL));
 
-        fireMouseEvent(true, x, y, dz, dw, 0, fButtons);
+        fireMouseEvent(true, x, y, dz, dw, fButtons);
     }
 
@@ -795 +796 @@
         rc = reportMultiTouchEventToDevice(cContacts, cContacts? pau64Contacts: NULL, (uint32_t)aScanTime);
 
-        // @todo Implement. Maybe using a new TouchEvent rather than extending the mouse event.
+        // @todo Implement using a new TouchEvent rather than extending the mouse event.
         // fireMouseEvent(true, x, y, 0, 0, cContact, contactState);
     }