Changeset 26929 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 2, 2010 12:27:24 AM (15 years ago)

Author:

vboxsync

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

58216

Message:

FE/Qt4: New running VM core: mm support extended to use absolute mouse-coordinates, few cosmetics also.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineView.cpp (modified) (17 diffs)
• UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -283 +283 @@
 }
 
+QSize UIMachineView::desktopGeometry() const
+{
+    QSize geometry;
+    switch (m_desktopGeometryType)
+    {
+        case DesktopGeo_Fixed:
+        case DesktopGeo_Automatic:
+            geometry = QSize(qMax(m_desktopGeometry.width(), m_storedConsoleSize.width()),
+                             qMax(m_desktopGeometry.height(), m_storedConsoleSize.height()));
+            break;
+        case DesktopGeo_Any:
+            geometry = QSize(0, 0);
+            break;
+        default:
+            AssertMsgFailed(("Bad geometry type %d!\n", m_desktopGeometryType));
+    }
+    return geometry;
+}
+
+void UIMachineView::setDesktopGeometry(DesktopGeo geometry, int aWidth, int aHeight)
+{
+    switch (geometry)
+    {
+        case DesktopGeo_Fixed:
+            m_desktopGeometryType = DesktopGeo_Fixed;
+            if (aWidth != 0 && aHeight != 0)
+                m_desktopGeometry = QSize(aWidth, aHeight);
+            else
+                m_desktopGeometry = QSize(0, 0);
+            storeConsoleSize(0, 0);
+            break;
+        case DesktopGeo_Automatic:
+            m_desktopGeometryType = DesktopGeo_Automatic;
+            m_desktopGeometry = QSize(0, 0);
+            storeConsoleSize(0, 0);
+            break;
+        case DesktopGeo_Any:
+            m_desktopGeometryType = DesktopGeo_Any;
+            m_desktopGeometry = QSize(0, 0);
+            break;
+        default:
+            AssertMsgFailed(("Invalid desktop geometry type %d\n", geometry));
+            m_desktopGeometryType = DesktopGeo_Invalid;
+    }
+}
+
+void UIMachineView::storeConsoleSize(int iWidth, int iHeight)
+{
+    m_storedConsoleSize = QSize(iWidth, iHeight);
+}
+
+void UIMachineView::calculateDesktopGeometry()
+{
+    /* This method should not get called until we have initially set up the m_desktopGeometryType: */
+    Assert((m_desktopGeometryType != DesktopGeo_Invalid));
+    /* If we are not doing automatic geometry calculation then there is nothing to do: */
+    if (DesktopGeo_Automatic == m_desktopGeometryType)
+    {
+        /* Available geometry of the desktop.  If the desktop is a single
+         * screen, this will exclude space taken up by desktop taskbars
+         * and things, but this is unfortunately not true for the more
+         * complex case of a desktop spanning multiple screens: */
+        QRect desktop = availableGeometry();
+        /* The area taken up by the machine window on the desktop,
+         * including window frame, title and menu bar and whatnot: */
+        QRect frame = machineWindowWrapper()->machineWindow()->frameGeometry();
+        /* The area taken up by the machine view, so excluding all decorations: */
+        QRect window = geometry();
+        /* To work out how big we can make the console window while still
+         * fitting on the desktop, we calculate desktop - frame + window.
+         * This works because the difference between frame and window
+         * (or at least its width and height) is a constant. */
+        m_desktopGeometry = QSize(desktop.width() - frame.width() + window.width(),
+                                  desktop.height() - frame.height() + window.height());
+    }
+}
+
 void UIMachineView::updateMouseClipping()
 {
@@ -312 +389 @@
 
     QSize v = QSize(m_pFrameBuffer->width(), m_pFrameBuffer->height());
-    /* no scroll bars needed */
+    /* No scroll bars needed: */
     if (m.expandedTo(v) == m)
         p = m;
@@ -553 +630 @@
 }
 
-QSize UIMachineView::desktopGeometry() const
-{
-    QSize geometry;
-    switch (m_desktopGeometryType)
-    {
-        case DesktopGeo_Fixed:
-        case DesktopGeo_Automatic:
-            geometry = QSize(qMax(m_desktopGeometry.width(), m_storedConsoleSize.width()),
-                             qMax(m_desktopGeometry.height(), m_storedConsoleSize.height()));
-            break;
-        case DesktopGeo_Any:
-            geometry = QSize(0, 0);
-            break;
-        default:
-            AssertMsgFailed(("Bad geometry type %d!\n", m_desktopGeometryType));
-    }
-    return geometry;
-}
-
-void UIMachineView::setDesktopGeometry(DesktopGeo geometry, int aWidth, int aHeight)
-{
-    switch (geometry)
-    {
-        case DesktopGeo_Fixed:
-            m_desktopGeometryType = DesktopGeo_Fixed;
-            if (aWidth != 0 && aHeight != 0)
-                m_desktopGeometry = QSize(aWidth, aHeight);
-            else
-                m_desktopGeometry = QSize(0, 0);
-            storeConsoleSize(0, 0);
-            break;
-        case DesktopGeo_Automatic:
-            m_desktopGeometryType = DesktopGeo_Automatic;
-            m_desktopGeometry = QSize(0, 0);
-            storeConsoleSize(0, 0);
-            break;
-        case DesktopGeo_Any:
-            m_desktopGeometryType = DesktopGeo_Any;
-            m_desktopGeometry = QSize(0, 0);
-            break;
-        default:
-            AssertMsgFailed(("Invalid desktop geometry type %d\n", geometry));
-            m_desktopGeometryType = DesktopGeo_Invalid;
-    }
-}
-
-void UIMachineView::calculateDesktopGeometry()
-{
-    /* This method should not get called until we have initially set up the m_desktopGeometryType: */
-    Assert((m_desktopGeometryType != DesktopGeo_Invalid));
-    /* If we are not doing automatic geometry calculation then there is nothing to do: */
-    if (DesktopGeo_Automatic == m_desktopGeometryType)
-    {
-        /* Available geometry of the desktop.  If the desktop is a single
-         * screen, this will exclude space taken up by desktop taskbars
-         * and things, but this is unfortunately not true for the more
-         * complex case of a desktop spanning multiple screens: */
-        QRect desktop = availableGeometry();
-        /* The area taken up by the machine window on the desktop,
-         * including window frame, title and menu bar and whatnot: */
-        QRect frame = machineWindowWrapper()->machineWindow()->frameGeometry();
-        /* The area taken up by the machine view, so excluding all decorations: */
-        QRect window = geometry();
-        /* To work out how big we can make the console window while still
-         * fitting on the desktop, we calculate desktop - frame + window.
-         * This works because the difference between frame and window
-         * (or at least its width and height) is a constant. */
-        m_desktopGeometry = QSize(desktop.width() - frame.width() + window.width(),
-                                  desktop.height() - frame.height() + window.height());
-    }
-}
-
-void UIMachineView::storeConsoleSize(int iWidth, int iHeight)
-{
-    m_storedConsoleSize = QSize(iWidth, iHeight);
-}
-
-
 void UIMachineView::cleanupCommon()
 {
@@ -671 +670 @@
         /* Detach framebuffer from Display: */
         CDisplay display = session().GetConsole().GetDisplay();
-        display.SetFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, CFramebuffer(NULL));
+        display.SetFramebuffer(m_uScreenId, CFramebuffer(NULL));
         /* Release the reference: */
         m_pFrameBuffer->Release();
@@ -695 +694 @@
             else
             {
-                /* Release the host key and all other pressed keys too even when paused (otherwise, we will get stuck
-                 * keys in the guest when doing sendChangedKeyStates() on resume because key presses were already
-                 * recorded in m_pressedKeys but key releases will most likely not reach us but the new focus window instead): */
-                releaseAllPressedKeys(true /* fReleaseHostKey */);
+                /* Release the host key and all other pressed keys too even when paused
+                 * (otherwise, we will get stuck keys in the guest when doing sendChangedKeyStates() on resume
+                 * because key presses were already recorded in m_pressedKeys but key releases will most likely
+                 * not reach us but the new focus window instead): */
+                releaseAllPressedKeys(true /* including host key? */);
             }
             break;
@@ -708 +708 @@
             viewport()->repaint(pPaintEvent->x() - contentsX(), pPaintEvent->y() - contentsY(),
                                 pPaintEvent->width(), pPaintEvent->height());
-            /* session().GetConsole().GetDisplay().UpdateCompleted(); - the event was acked already */
             return true;
         }
@@ -855 +854 @@
                 {
                     /* Process hot keys not processed in keyEvent() (as in case of non-alphanumeric keys): */
-                    machineWindowWrapper()->machineLogic()->actionsPool()->processHotKey(QKeySequence (pKeyEvent->key()));
+                    machineWindowWrapper()->machineLogic()->actionsPool()->processHotKey(QKeySequence(pKeyEvent->key()));
                 }
             }
@@ -955 +954 @@
                  * registered in the VM. Only do this if the keyboard/mouse is grabbed (this is when
                  * we have a valid event handler): */
-                setMouseCoalescingEnabled (false);
+                setMouseCoalescingEnabled(false);
                 break;
             }
@@ -1497 +1496 @@
     if (aWheelDir == Qt::Vertical)
     {
-        /* the absolute value of wheel delta is 120 units per every wheel
-         * move; positive deltas correspond to counterclockwize rotations
-         * (usually up), negative -- to clockwize (usually down). */
+        /* The absolute value of wheel delta is 120 units per every wheel move;
+         * positive deltas correspond to counterclockwize rotations (usually up),
+         * negative deltas correspond to clockwize (usually down). */
         wheelVertical = - (aWheelDelta / 120);
     }
@@ -1508 +1507 @@
     {
 #ifdef Q_WS_WIN32
-        /* send pending WM_PAINT events */
+        /* Send pending WM_PAINT events: */
         ::UpdateWindow(viewport()->winId());
 #endif
@@ -1639 +1638 @@
                 /* Try to automatically scroll the guest canvas if the
                  * mouse goes outside its visible part: */
-
                 int dx = 0;
                 if (aPos.x() > vw) dx = aPos.x() - vw;
@@ -1649 +1647 @@
             }
 
-            QPoint cpnt = viewportToContents (aPos);
-            if (cpnt.x() < 0) cpnt.setX (0);
-            else if (cpnt.x() > cw) cpnt.setX (cw);
-            if (cpnt.y() < 0) cpnt.setY (0);
-            else if (cpnt.y() > ch) cpnt.setY (ch);
+            QPoint cpnt = viewportToContents(aPos);
+            if (cpnt.x() < 0) cpnt.setX(0);
+            else if (cpnt.x() > cw) cpnt.setX(cw);
+            if (cpnt.y() < 0) cpnt.setY(0);
+            else if (cpnt.y() > ch) cpnt.setY(ch);
+
+            // TODO: Where to put that actually?
+            /* Get & Setup absolute-event shift: */
+            CFramebuffer framebuffer;
+            LONG xShift = 0, yShift = 0;
+            session().GetConsole().GetDisplay().GetFramebuffer(screenId(), framebuffer, xShift, yShift);
+            cpnt.setX(cpnt.x() + xShift);
+            cpnt.setY(cpnt.y() + yShift);
 
             CMouse mouse = session().GetConsole().GetMouse();
-            mouse.PutMouseEventAbsolute (cpnt.x(), cpnt.y(), wheelVertical,
-                                         wheelHorizontal, state);
+            // AssertMsgFailed(("x=%d, y=%d", cpnt.x(), cpnt.y())); // this shows what absolute coordinates are correct!
+            mouse.PutMouseEventAbsolute(cpnt.x(), cpnt.y(), wheelVertical, wheelHorizontal, state);
             return true;
         }
@@ -1674 +1680 @@
                     m_bIsAutoCaptureDisabled = true;
                     bool autoConfirmed = false;
-                    bool ok = vboxProblem().confirmInputCapture (&autoConfirmed);
+                    bool ok = vboxProblem().confirmInputCapture(&autoConfirmed);
                     if (autoConfirmed)
                         m_bIsAutoCaptureDisabled = false;
@@ -1742 +1748 @@
 #endif
 //    {
-//        /* We have a snapshot for the paused state: */
-//        QRect r = pPaintEvent->rect().intersect (viewport()->rect());
-//        /* We have to disable paint on screen if we are using the regular painter */
-//        bool paintOnScreen = viewport()->testAttribute(Qt::WA_PaintOnScreen);
-//        viewport()->setAttribute(Qt::WA_PaintOnScreen, false);
-//        QPainter pnt(viewport());
-//        pnt.drawPixmap(r.x(), r.y(), m_pauseShot, r.x() + contentsX(), r.y() + contentsY(), r.width(), r.height());
-//        /* Restore the attribute to its previous state */
-//        viewport()->setAttribute(Qt::WA_PaintOnScreen, paintOnScreen);
+#if 0 // TODO: Paint pause-shot on screen during pause!
+        /* We have a snapshot for the paused state: */
+        QRect r = pPaintEvent->rect().intersect(viewport()->rect());
+        /* We have to disable paint on screen if we are using the regular painter: */
+        bool paintOnScreen = viewport()->testAttribute(Qt::WA_PaintOnScreen);
+        viewport()->setAttribute(Qt::WA_PaintOnScreen, false);
+        QPainter pnt(viewport());
+        pnt.drawPixmap(r.x(), r.y(), m_pauseShot, r.x() + contentsX(), r.y() + contentsY(), r.width(), r.height());
+        /* Restore the attribute to its previous state: */
+        viewport()->setAttribute(Qt::WA_PaintOnScreen, paintOnScreen);
+#endif
 #ifdef Q_WS_MAC
 //        updateDockIcon();
@@ -2370 +2378 @@
 QPoint UIMachineView::viewportToContents(const QPoint &vp) const
 {
-    return QPoint (vp.x() + contentsX(), vp.y() + contentsY());
+    return QPoint(vp.x() + contentsX(), vp.y() + contentsY());
 }
 
@@ -2452 +2460 @@
         m_capturedMousePos = QCursor::pos();
 #ifdef Q_WS_WIN32
-        viewport()->setCursor (QCursor (Qt::BlankCursor));
+        viewport()->setCursor(QCursor(Qt::BlankCursor));
         /* Move the mouse to the center of the visible area: */
-        QCursor::setPos (mapToGlobal (visibleRegion().boundingRect().center()));
+        QCursor::setPos(mapToGlobal(visibleRegion().boundingRect().center()));
         m_lastMousePos = QCursor::pos();
 #elif defined (Q_WS_MAC)
         /* Move the mouse to the center of the visible area: */
         m_lastMousePos = mapToGlobal (visibleRegion().boundingRect().center());
-        QCursor::setPos (m_lastMousePos);
+        QCursor::setPos(m_lastMousePos);
         /* Grab all mouse events: */
         viewport()->grabMouse();
@@ -2474 +2482 @@
         /* Release mouse buttons: */
         CMouse mouse = session().GetConsole().GetMouse();
-        mouse.PutMouseEvent(0, 0, 0, 0 /* Horizontal wheel */, 0);
+        mouse.PutMouseEvent(0, 0, 0, 0, 0);
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

@@ -118 +118 @@
     bool isFrameBufferResizeIgnored() const { return m_bIsFrameBufferResizeIgnored; }
     const QPixmap& pauseShot() const { return m_pauseShot; }
-    void calculateDesktopGeometry();
     virtual QSize desktopGeometry() const;
+
+    /* Protected setters: */
     void setDesktopGeometry(DesktopGeo geometry, int iWidth, int iHeight);
     void storeConsoleSize(int iWidth, int iHeight);
-
-    /* Protected setters: */
     void setMachineWindowResizeIgnored(bool fIgnore = true) { m_bIsMachineWindowResizeIgnored = fIgnore; }
     void setFrameBufferResizeIgnored(bool fIgnore = true) { m_bIsFrameBufferResizeIgnored = fIgnore; }
 
     /* Protected helpers: */
+    void calculateDesktopGeometry();
     void updateMouseClipping();
     void updateSliders();