Changeset 27191 in vbox

Timestamp:

Mar 9, 2010 12:20:05 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: hide the host cursor when the guest switches to absolute reporting and clean up the cursor logic a bit

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (9 diffs)
• VBoxConsoleView.h (modified) (1 diff)

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

@@ -1151 +1151 @@
      * support switching to a hardware pointer on demand. */
     if (enabled)
-        viewport()->setCursor (QCursor (Qt::BlankCursor));
+    {
+        mHideHostPointer = true;
+        updateHostCursor();
+    }
 
     mMouseIntegration = enabled;
 
     emitMouseStateChanged();
+}
+
+void VBoxConsoleView::updateHostCursor()
+{
+    if (!mMouseIntegration && !mMouseCaptured)
+        viewport()->unsetCursor();
+    else if (mMouseCaptured || (mMouseCanAbsolute && mHideHostPointer))
+        viewport()->setCursor(Qt::BlankCursor);
+    else
+        viewport()->setCursor(mLastCursor);
 }
 
@@ -1252 +1265 @@
                 /* restoreOverrideCursor() is broken in Qt 4.4.0 if WA_PaintOnScreen
                  * widgets are present. This is the case on linux with SDL. As
-                 * workaround we save/restore the arrow cursor manually. See
+                 * workaround we restore the arrow cursor manually after the resize. See
                  * http://trolltech.com/developer/task-tracker/index_html?id=206165&method=entry
                  * for details.
-                 *
-                 * Moreover the current cursor, which could be set by the guest,
-                 * should be restored after resize.
                  */
                 QCursor cursor;
-                if (shouldHideHostPointer())
-                    cursor = QCursor (Qt::BlankCursor);
-                else
-                    cursor = viewport()->cursor();
                 mFrameBuf->resizeEvent (re);
-                viewport()->setCursor (cursor);
+                updateHostCursor();
 
 #ifdef Q_WS_MAC
@@ -1403 +1409 @@
                     }
                     else
-                        viewport()->unsetCursor();
+                        updateHostCursor();
                     emitMouseStateChanged();
                     vboxProblem().remindAboutMouseIntegration (mMouseCanAbsolute);
@@ -3704 +3710 @@
     if (mMouseCaptured)
     {
-        viewport()->setCursor (QCursor (Qt::BlankCursor));
+        updateHostCursor();
 #ifdef Q_WS_WIN32
         QRect r = viewport()->rect();
@@ -3719 +3725 @@
         /* return the cursor to where it was when we captured it and show it */
         QCursor::setPos (mCapturedPos);
-        viewport()->unsetCursor();
+        updateHostCursor();
     }
 }
@@ -3849 +3855 @@
             if (hAlphaCursor)
             {
-                viewport()->setCursor (QCursor (hAlphaCursor));
+                mLastCursor = QCursor (hAlphaCursor);
                 ok = true;
                 if (mAlphaCursor)
@@ -3912 +3918 @@
             if (cur)
             {
-                viewport()->setCursor (QCursor (cur));
+                mLastCursor = QCursor (cur);
                 ok = true;
             }
@@ -3955 +3961 @@
         QCursor cursor (QPixmap::fromImage (image),
                         me->xHot(), me->yHot());
-        viewport()->setCursor (cursor);
+        mLastCursor = cursor;
         ok = true;
         NOREF (srcShapePtrScan);
@@ -3964 +3970 @@
 
 #endif
-        if (ok)
-            mLastCursor = viewport()->cursor();
-        else
-            viewport()->unsetCursor();
-    }
-    else
-    {
-        /*
-         * We did not get any shape data
-         */
-        if (me->isVisible())
-        {
-            viewport()->setCursor (mLastCursor);
-        }
-        else
-        {
-            viewport()->setCursor (Qt::BlankCursor);
-        }
+        if (!ok)
+            mLastCursor = QCursor();  /* in practice this is equivalent to
+                                       * unsetCursor() */
     }
     mHideHostPointer = !me->isVisible();
+    updateHostCursor();
 }
 

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

@@ -101 +101 @@
     bool mouseNeedsHostCursor() const { return mMouseNeedsHostCursor; }
 
-    bool shouldHideHostPointer() const
-    { return mMouseCaptured || (mMouseCanAbsolute && mHideHostPointer); }
+    void updateHostCursor();
 
     void setAutoresizeGuest (bool on);