Changeset 3063 in vbox for trunk

Timestamp:

Jun 6, 2007 12:02:34 PM (18 years ago)

Author:

vboxsync

Message:

Dual cursor issue fixed.

Issue description: If the GuestOS is loaded (in case of "Guest Additions" are correctly installed and activated and "Mouse integration" feature is activated too) and the mouse cursor was not moved during the guest loading process then the user can see two mouse cursors - guest's and host's, which are positioned separately. If the user moves the mouse cursor above the VM Console Viewport, both cursors will be positioned one-above-one. It looks like some dirty visual artifact.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp (modified) (7 diffs)

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

@@ -440 +440 @@
 
 #if defined (Q_WS_MAC)
-        /* 
+        /*
          * Let's try the simple approach first - grab the focus.
          * Getting a window out of the dock (minimized or whatever it's called)
@@ -449 +449 @@
             return S_OK;
 
-        ProcessSerialNumber psn = { 0, kCurrentProcess }; 
+        ProcessSerialNumber psn = { 0, kCurrentProcess };
         OSErr rc = ::SetFrontProcess (&psn);
-        if (!rc) 
+        if (!rc)
             QApplication::postEvent (mView, new QEvent ((QEvent::Type)VBoxDefs::ShowWindowEventType));
         else
@@ -457 +457 @@
             /*
              * It failed for some reason, send the other process our PSN so it can try.
-             * (This is just a precaution should Mac OS X start imposing the same sensible 
+             * (This is just a precaution should Mac OS X start imposing the same sensible
              * focus stealing restrictions that other window managers implement.)
              */
@@ -468 +468 @@
         /* Return the ID of the top-level console window. */
         *winId = (ULONG64) mView->topLevelWidget()->winId();
-#endif 
+#endif
 
         return S_OK;
@@ -947 +947 @@
                      * to the default shape if necessary */
                     if (mouse_absolute)
+                    {
+                        CMouse mouse = cconsole.GetMouse();
+                        mouse.PutMouseEventAbsolute (-1, -1, 0, 0);
                         captureMouse (false, false);
+                    }
                     else
                         viewport()->unsetCursor();
@@ -1108 +1112 @@
             case VBoxDefs::ShowWindowEventType:
             {
-                /* 
-                 *  Dunno what Qt3 thinks a window that has minimized to the dock 
+                /*
+                 *  Dunno what Qt3 thinks a window that has minimized to the dock
                  *  should be - it is not hidden, neither is it minimized. OTOH it is
-                 *  marked shown and visible, but not activated. This latter isn't of 
+                 *  marked shown and visible, but not activated. This latter isn't of
                  *  much help though, since at this point nothing is marked activated.
                  *  I might have overlooked something, but I'm buggered what if I know
-                 *  what. So, I'll just always show & activate the stupid window to 
+                 *  what. So, I'll just always show & activate the stupid window to
                  *  make it get out of the dock when the user wishes to show a VM.
                  */
@@ -1121 +1125 @@
                 return true;
             }
-#endif 
+#endif
             default:
                 break;