Changeset 21772 in vbox

Timestamp:

Jul 22, 2009 10:46:26 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt: fix a double mouse pointer issue in Moblin

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleView.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -88 +88 @@
 
     bool isMouseAbsolute() const { return mMouseAbsolute; }
+
+    bool shouldHideHostPointer() const
+    { return mMouseCaptured || (mMouseAbsolute && mHideHostPointer); }
 
     void setAutoresizeGuest (bool on);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

@@ -733 +733 @@
     , mDesktopGeo (DesktopGeo_Invalid)
     , mPassCAD (false)
-    , mHideHostPointer (false)
+      /* Don't show a hardware pointer until we have one to show */
+    , mHideHostPointer (true)
 {
     Assert (!mConsole.isNull() &&
@@ -1132 +1133 @@
      * OnMousePointerShapeChange event handler.
      *
-     * This is necessary to avoid double-cursor issue when both the
-     * guest and the host cursors are displayed in one place one-above-one.
+     * This is necessary to avoid double-cursor issues where both the
+     * guest and the host cursors are displayed in one place, one above the
+     * other.
      *
-     * This is a workaround because the correct decision is to notify
+     * This is a workaround because the correct decision would be to notify
      * the Guest Additions about we are entering the mouse integration
      * mode. The GuestOS should hide it's cursor to allow using of
      * host cursor for the guest's manipulation.
      *
-     * This notification is not possible right now due to there is
-     * no the required API. */
+     * This notification is not always possible though, as not all guests
+     * support switching to a hardware pointer on demand. */
     if (enabled)
         viewport()->setCursor (QCursor (Qt::BlankCursor));
@@ -1235 +1237 @@
                  * for details. */
                 QCursor cursor;
-                if (!mHideHostPointer)
+                if (shouldHideHostPointer())
+                    cursor = QCursor (Qt::BlankCursor);
+                else
                     cursor = viewport()->cursor();
-                else
-                    cursor = QCursor (Qt::BlankCursor);
                 mFrameBuf->resizeEvent (re);
                 viewport()->setCursor (cursor);
 #else
                 mFrameBuf->resizeEvent (re);
-                if (!mHideHostPointer)
+                if (shouldHideHostPointer())
+                    viewport()->setCursor (QCursor (Qt::BlankCursor));
+                else
                     viewport()->unsetCursor();
-                else
-                    viewport()->setCursor (QCursor (Qt::BlankCursor));
 #endif