Changeset 35871 in vbox

Timestamp:

Feb 7, 2011 1:19:21 PM (14 years ago)

Author:

vboxsync

Message:

Main: generate mouse events smarter

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -130 +130 @@
     const ComObjPtr<EventSource> mEventSource;
     VBoxEventDesc                mMouseEvent;
+
+    void fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons);
+#else
+    void fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons)
+    {}
 #endif
 };

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

@@ -405 +405 @@
 }
 
+#ifndef VBOXBFE_WITHOUT_COM
+void Mouse::fireMouseEvent(bool fAbsolute, LONG x, LONG y, LONG dz, LONG dw, LONG Buttons)
+{
+    /* If mouse button is pressed, we generate new event, to avoid reusable events coalescing and thus
+       dropping key press events */
+    if (Buttons != 0)
+    {
+        VBoxEventDesc evDesc;
+        evDesc.init(mEventSource, VBoxEventType_OnGuestMouse, fAbsolute, x, y, dz, dw, Buttons);
+        evDesc.fire(0);
+    }
+    else
+    {
+        mMouseEvent.reinit(VBoxEventType_OnGuestMouse, fAbsolute, x, y, dz, dw, Buttons);
+        mMouseEvent.fire(0);
+    }
+}
+#endif
+
+
 /**
  * Send a relative mouse event to the guest.
@@ -433 +453 @@
     rc = reportRelEventToMouseDev(dx, dy, dz, dw, fButtons);
 
-#ifndef VBOXBFE_WITHOUT_COM
-    mMouseEvent.reinit(VBoxEventType_OnGuestMouse, false, dx, dy, dz, dw, fButtons);
-    mMouseEvent.fire(0);
-#endif
+    fireMouseEvent(false, dx, dy, dz, dw, buttonState);
 
     return rc;
@@ -538 +555 @@
                                     & VMMDEV_MOUSE_NEW_PROTOCOL));
 
-#ifndef VBOXBFE_WITHOUT_COM
-        mMouseEvent.reinit(VBoxEventType_OnGuestMouse, true, x, y, dz, dw,
-                           fButtons);
-        mMouseEvent.fire(0);
-#endif
+        fireMouseEvent(true, x, y, dz, dw, buttonState);
     }