Changeset 7590

Timestamp:

03/27/08 14:21:57 (8 months ago)

Author:

vboxsync

Message:

FE/Qt4: Ported console window to qt4.

Files:

• trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleView.h (modified) (8 diffs)
• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp (modified) (27 diffs)
• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp (modified) (5 diffs)
• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp (modified) (5 diffs)

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

@@ -26 +26 @@
-
-/* Qt includes */
-
+
+
-
-#if defined (Q_WS_PM)
@@ -46 +47 @@
-class QMenuData;
-
-3ScrollView
+AbstractScrollArea
-{
-    Q_OBJECT
@@ -64 +65 @@
-                     const CConsole &console,
-                     VBoxDefs::RenderMode rm,
-, const char *name = 0, Qt::WFlags f = 0
+
-    ~VBoxConsoleView();
-
@@ -95 +96 @@
-
-    QRect getDesktopGeometry();
+
+    /* todo: This are some support functions for the qt4 port. Maybe we get rid
+     * of them some day. */
+    int contentsX() const { return horizontalScrollBar()->value(); }
+    int contentsY() const { return verticalScrollBar()->value(); }
+    int contentsWidth() const;
+    int contentsHeight() const;
+    int visibleWidth() const { return horizontalScrollBar()->pageStep(); }
+    int visibleHeight() const { return verticalScrollBar()->pageStep(); }
+    void scrollBy (int dx, int dy) 
+    { 
+        horizontalScrollBar()->setValue (horizontalScrollBar()->value() + dx);
+        verticalScrollBar()->setValue (verticalScrollBar()->value() + dy);
+    }
+    QPoint viewportToContents ( const QPoint & vp ) const
+    {
+        return QPoint (vp.x() + contentsX(), 
+                       vp.y() + contentsY());
+    }
+    void updateSliders();
-
-signals:
@@ -141 +162 @@
-    bool mouseEvent (int aType, const QPoint &aPos, const QPoint &aGlobalPos,
-                     Qt::ButtonState aButton,
-ButtonState aState, Qt::ButtonState aStateAfter
+MouseButtons aButtons, Qt::KeyboardModifiers aModifiers
-                     int aWheelDelta, Qt::Orientation aWheelDir);
-
@@ -162 +183 @@
-    void doRefresh();
-
-
+
+
-#ifdef VBOX_GUI_USE_REFRESH_TIMER
-    void timerEvent( QTimerEvent * );
@@ -170 +192 @@
-    void captureMouse (bool aCapture, bool aEmitSignal = true);
-
-QMenuData *
+const QList<QAction*>& 
-    void updateModifiers (bool fNumLock, bool fCapsLock, bool fScrollLock);
-
@@ -235 +257 @@
-    long muCapsLockAdaptionCnt;
-
-    QTimer *resize_hint_timer;
-    QTimer *mToggleFSModeTimer;
-

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

@@ -259 +259 @@
-{
-public:
-MenuData *menuData, uint index
+Action *aData
-        QEvent ((QEvent::Type) VBoxDefs::ActivateMenuEventType),
-
-
-
+
+
-private:
-
-
+
-};
-
@@ -574 +572 @@
-#endif
-
+class VBoxViewport: public QWidget
+{
+public:
+    VBoxViewport (QWidget *aParent)
+        : QWidget (aParent)
+    {
+        /* No need for background drawing */
+        setAttribute (Qt::WA_OpaquePaintEvent);
+    }
+    virtual QPaintEngine * paintEngine() const 
+    { 
+        if (testAttribute (Qt::WA_PaintOnScreen))
+            return NULL; 
+        else 
+            return QWidget::paintEngine();
+    } 
+};
+
-//
-// VBoxConsoleView class
@@ -587 +603 @@
-                                  const CConsole &console,
-                                  VBoxDefs::RenderMode rm,
-, const char *name, Qt::WFlags f
-3ScrollView (parent, name, f | Qt::WStaticContents | Qt::WNoAutoErase
+
+AbstractScrollArea (parent
-    , mMainWnd (mainWnd)
-    , mConsole (console)
@@ -630 +646 @@
-#endif
-
+    VBoxViewport *pViewport = new VBoxViewport (this);
+    setViewport (pViewport);
+
-    /* enable MouseMove events */
-    viewport()->setMouseTracking (true);
@@ -652 +671 @@
-    ::memset (mPressedKeys, 0, SIZEOF_ARRAY (mPressedKeys));
-
-    resize_hint_timer = new QTimer (this);
-    connect (resize_hint_timer, SIGNAL (timeout()),
-             this, SLOT (doResizeHint()));
-
-    mToggleFSModeTimer = new QTimer (this);
-    mToggleFSModeTimer->setSingleShot (true);
@@ -688 +703 @@
-#if defined (VBOX_GUI_USE_SDL)
-        case VBoxDefs::SDLMode:
+            /* Indicate that we are doing all 
+             * drawing stuff ourself */
+            pViewport->setAttribute (Qt::WA_PaintOnScreen);
-# ifdef Q_WS_X11
-            /* This is somehow necessary to prevent strange X11 warnings on
@@ -1058 +1076 @@
-
-                if (mToggleFSModeTimer->isActive())
-
+ 
-
-                /* do frame buffer dependent resize */
@@ -1080 +1098 @@
-
-                /* resize the guest canvas */
-
+
+
-                /* let our toplevel widget calculate its sizeHint properly */
-                QApplication::sendPostedEvents (0, QEvent::LayoutRequest);
@@ -1221 +1240 @@
-            {
-                ActivateMenuEvent *ame = (ActivateMenuEvent *) e;
-
-
+
-
-                /*
@@ -1414 +1432 @@
-                        /* process hot keys not processed in keyEvent()
-                         * (as in case of non-alphanumeric keys) */
-
-
-
+
+
-                    }
-                }
@@ -1461 +1478 @@
-    }
-
-3ScrollView
+AbstractScrollArea
-}
-
@@ -1477 +1494 @@
-                QMouseEvent *me = (QMouseEvent *) e;
-                if (mouseEvent (me->type(), me->pos(), me->globalPos(),
-state(), me->stateAfter
+buttons(), me->modifiers
-                                0, Qt::Horizontal))
-                    return true; /* stop further event handling */
@@ -1486 +1503 @@
-                QWheelEvent *we = (QWheelEvent *) e;
-                if (mouseEvent (we->type(), we->pos(), we->globalPos(),
-state(), we->state
+buttons(), we->modifiers
-                                we->delta(), we->orientation()))
-                    return true; /* stop further event handling */
@@ -1555 +1572 @@
-                if (!mIgnoreMainwndResize &&
-                    mIsAdditionsActive && mAutoresizeGuest)
-resize_hint_timer->start (300, TRUE
+QTimer::singleShot (300, this, SLOT (doResizeHint())
-                break;
-            }
@@ -1582 +1599 @@
-            {
-                QKeyEvent *ke = (QKeyEvent *) e;
-!(ke->state() & Qt::KeyboardModifierMask
+(ke->modifiers() == Qt::NoModifier
-                    if (mMainWnd->menuBar()->hasFocus())
-                        setFocus();
@@ -1592 +1609 @@
-    }
-
-3ScrollView
+AbstractScrollArea
-}
-
@@ -2503 +2520 @@
-                processed = processHotKey (QKeySequence (Qt::UNICODE_ACCEL +
-                                                QChar (ch).upper().unicode()),
-
+->actions()
-        }
-        delete[] list;
@@ -2521 +2538 @@
-            {
-                QChar c = QString::fromLocal8Bit (&ch, 1) [0];
-
-
-
-
+
+
+
-            }
-        }
-#elif defined (Q_WS_MAC)
-
-
-
-
-
+
+
+
+
-
-        /* Don't consider the hot key as pressed since the guest never saw
@@ -2585 +2600 @@
-bool VBoxConsoleView::mouseEvent (int aType, const QPoint &aPos,
-                                  const QPoint &aGlobalPos, Qt::ButtonState aButton,
-ButtonState aState, Qt::ButtonState aStateAfter
+MouseButtons aButtons, Qt::KeyboardModifiers aModifiers
-                                  int aWheelDelta, Qt::Orientation aWheelDir)
-{
@@ -2591 +2606 @@
-    char buf [256];
-    sprintf (buf,
-st=%08X stAfter
+btns=%08X mod
-             "wdelta=%03d wdir=%03d",
-State, aStateAfter
+Buttons, aModifiers
-             aWheelDelta, aWheelDir);
-    mMainWnd->statusBar()->message (buf);
-#else
-    Q_UNUSED (aButton);
-State
+Modifiers
-#endif
-
-    int state = 0;
-StateAfter
+Buttons
-        state |= KMouseButtonState_LeftButton;
-StateAfter
+Buttons
-        state |= KMouseButtonState_RightButton;
-StateAfter
+Buttons
-        state |= KMouseButtonState_MiddleButton;
-
@@ -2784 +2799 @@
-            if (hasFocus() &&
-                (aType == QEvent::MouseButtonRelease &&
-!aStateAfter
+aButtons == Qt::NoButton
-            {
-                if (isPaused())
@@ -2844 +2859 @@
-                    mPausedShot = QPixmap::fromImage (shot);
-                    /* fully repaint to pick up mPausedShot */
-viewport()->
+
-                }
-            }
@@ -2913 +2928 @@
-            {
-                int pw = pm.width(), ph = pm.height();
-resizeContents
+viewport()->resize
-                updateGeometry();
-                setMaximumSize (sizeHint());
@@ -2925 +2940 @@
-                 * on the next event loop iteration. currently disabled.
-                 * updateContents(); */
-repaintContents (false
+viewport()->repaint(
-            }
-        }
@@ -2933 +2948 @@
-    else
-#endif
-
-
-
-
+
+
+
+
+
+
+
+
+
-{
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-//            ::bitBlt (viewport(), r.x(), r.y(),
-//                      &pm, r.x() + contentsX(), r.y() + contentsY(),
-//                      r.width(), r.height(),
-//                      CopyROP, TRUE);
-
-
-
-
-
-
-
+//
+//
+//
+//
+//
+//
+//
-#endif
-    {
@@ -3118 +3138 @@
- *  is found, activates it and returns true. Otherwise returns false.
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return false;
@@ -3676 +3677 @@
-    }
-}
+
+int VBoxConsoleView::contentsWidth() const 
+{ 
+    return mFrameBuf->width(); 
+}
+
+int VBoxConsoleView::contentsHeight() const 
+{ 
+    return mFrameBuf->height(); 
+}
+
+void VBoxConsoleView::updateSliders()
+{
+    QSize p = viewport()->size();
+    QSize m = maximumViewportSize();
+
+    QSize v = QSize (mFrameBuf->width(), mFrameBuf->height());
+    /* no scroll bars needed */
+    if (m.expandedTo(v) == m)
+        p = m;
+
+    horizontalScrollBar()->setRange(0, v.width() - p.width());
+    verticalScrollBar()->setRange(0, v.height() - p.height());
+    horizontalScrollBar()->setPageStep(p.width());
+    verticalScrollBar()->setPageStep(p.height());
+}
+

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -680 +680 @@
-
-    console = new VBoxConsoleView (this, cconsole, mode,
-, "console"
+
-
-    activateUICustomizations();
@@ -837 +837 @@
-    /* set the correct initial machine_state value */
-    machine_state = cconsole.GetState();
+
+    console->normalizeGeometry (true /* adjustPosition */);
-
-    updateAppearanceOf (AllStuff);
@@ -2091 +2093 @@
-        foreach (QWidget *w, list)
-        {
-
+
+
+
+
+
-            {
-                if (!w->isHidden())
@@ -2115 +2121 @@
-        centralWidget()->setEraseColor (Qt::black);
-        console_style = console->frameStyle();
-3
+
-        console->setMaximumSize (scrGeo.size());
-
-
-
+
+
-
-        /* Going fullscreen */
@@ -2204 +2209 @@
-        console->setFrameStyle (console_style);
-        console->setMaximumSize (console->sizeHint());
-
-
-
+
+
-
-        /* Show everything hidden when going fullscreen. */

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp

@@ -1507 +1507 @@
-            "operation. The currently assigned host key is shown on the status bar "
-            "at the bottom of the Virtual Machine window, next to the "
-
+:/
-            "with the mouse icon placed nearby, indicate the current keyboard "
-            "and mouse capture state."
@@ -1540 +1540 @@
-            "operation. The currently assigned host key is shown on the status bar "
-            "at the bottom of the Virtual Machine window, next to the "
-
+:/
-            "with the mouse icon placed nearby, indicate the current keyboard "
-            "and mouse capture state."
@@ -1581 +1581 @@
-                "</p>"
-                "<p>The mouse icon on the status bar will look like&nbsp;"
-
+:/
-                "pointer integration is supported by the guest OS and is "
-                "currently turned on."
@@ -1700 +1700 @@
-            "You can go back to windowed mode at any time by pressing "
-            "<b>%1</b>. Note that the <i>Host</i> key is currently "
-1
+2
-            "<p>Note that the main menu bar is hidden in fullscreen mode. You "
-            "can access it by pressing <b>Host+Home</b>.</p>")
@@ -1722 +1722 @@
-            "You can go back to windowed mode at any time by pressing "
-            "<b>%1</b>. Note that the <i>Host</i> key is currently "
-1
+2
-            "<p>Note that the main menu bar is hidden in seamless mode. You "
-            "can access it by pressing <b>Host+Home</b>.</p>")