Changeset 26782 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Feb 25, 2010 11:17:30 AM (15 years ago)

Author:

vboxsync

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

58047

Message:

Main, Frontends: added support for virtual pointing devices with no relative reporting and cleaned up the VMMDev/mouse device absolute reporting interaction

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -185 +185 @@
 static BOOL gfAbsoluteMouseHost = FALSE;
 static BOOL gfAbsoluteMouseGuest = FALSE;
+static BOOL gfRelativeMouseGuest = TRUE;
 static BOOL gfGuestNeedsHostCursor = FALSE;
 static BOOL gfOffCursorActive = FALSE;
@@ -430 +431 @@
     }
 
-    STDMETHOD(OnMouseCapabilityChange)(BOOL supportsAbsolute, BOOL needsHostCursor)
-    {
-        LogFlow(("OnMouseCapabilityChange: supportsAbsolute = %d\n", supportsAbsolute));
+    STDMETHOD(OnMouseCapabilityChange)(BOOL supportsAbsolute, BOOL supportsRelative, BOOL needsHostCursor)
+    {
+        LogFlow(("OnMouseCapabilityChange: supportsAbsolute = %d, supportsRelative = %d, needsHostCursor = %d\n",
+                 supportsAbsolute, supportsRelative, needsHostCursor));
         gfAbsoluteMouseGuest   = supportsAbsolute;
+        gfRelativeMouseGuest   = supportsRelative;
         gfGuestNeedsHostCursor = needsHostCursor;
 
@@ -3879 +3882 @@
     DisableGlobalHotKeys(true);
 #endif
-    if (!gfGuestNeedsHostCursor)
+    if (!gfGuestNeedsHostCursor && gfRelativeMouseGuest)
         SDL_ShowCursor(SDL_DISABLE);
     SDL_WM_GrabInput(SDL_GRAB_ON);
@@ -3898 +3901 @@
 {
     SDL_WM_GrabInput(SDL_GRAB_OFF);
-    if (!gfGuestNeedsHostCursor)
+    if (!gfGuestNeedsHostCursor && gfRelativeMouseGuest)
         SDL_ShowCursor(SDL_ENABLE);
 #ifdef RT_OS_DARWIN
@@ -3931 +3934 @@
      * If supported and we're not in grabbed mode, we'll use the absolute mouse.
      * If we are in grabbed mode and the guest is not able to draw the mouse cursor
-     * itself, we have to use absolute coordinates, otherwise the host cursor and
+     * itself, or can't handle relative reporting, we have to use absolute
+     * coordinates, otherwise the host cursor and
      * the coordinates the guest thinks the mouse is at could get out-of-sync. From
      * the SDL mailing list:
@@ -3939 +3943 @@
      * call SDL_GetMouseState, the "button" is already up."
      */
-    abs = (UseAbsoluteMouse() && !gfGrabbed) || gfGuestNeedsHostCursor;
+    abs =    (UseAbsoluteMouse() && !gfGrabbed)
+          || gfGuestNeedsHostCursor
+          || !gfRelativeMouseGuest;
 
     /* only used if abs == TRUE */