Changeset 7610 in vbox for trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp

Timestamp:

Mar 27, 2008 10:48:00 PM (17 years ago)

Author:

vboxsync

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

29110

Message:

FE/Qt: Dropped refresh timer rendering mode.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp (modified) (12 diffs)

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

@@ -83 +83 @@
 #endif /* defined (Q_WS_MAC) */
 
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-enum { UPDATE_FREQ = 1000 / 60 }; // a-la 60Hz
-#endif
-
 #if defined (Q_WS_WIN32)
 
@@ -581 +577 @@
         setAttribute (Qt::WA_OpaquePaintEvent);
     }
-    virtual QPaintEngine * paintEngine() const 
-    { 
+    virtual QPaintEngine * paintEngine() const
+    {
         if (testAttribute (Qt::WA_PaintOnScreen))
-            return NULL; 
-        else 
+            return NULL;
+        else
             return QWidget::paintEngine();
-    } 
+    }
 };
 
@@ -681 +677 @@
     Assert (!display.isNull());
 
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-    tid = 0;
-#endif
     mFrameBuf = 0;
 
@@ -690 +683 @@
     switch (mode)
     {
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-        case VBoxDefs::TimerMode:
-            display.SetupInternalFramebuffer (32);
-            tid = startTimer (UPDATE_FREQ);
-            break;
-#endif
 #if defined (VBOX_GUI_USE_QIMAGE)
         case VBoxDefs::QImageMode:
@@ -703 +690 @@
 #if defined (VBOX_GUI_USE_SDL)
         case VBoxDefs::SDLMode:
-            /* Indicate that we are doing all 
+            /* Indicate that we are doing all
              * drawing stuff ourself */
             pViewport->setAttribute (Qt::WA_PaintOnScreen);
@@ -809 +796 @@
 #endif
 
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-    if (tid)
-        killTimer (tid);
-#endif
     if (mFrameBuf)
     {
@@ -836 +819 @@
 QSize VBoxConsoleView::sizeHint() const
 {
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-    if (mode == VBoxDefs::TimerMode)
-    {
-        CDisplay display = mConsole.GetDisplay();
-        return QSize (display.GetWidth() + frameWidth() * 2,
-                      display.GetHeight() + frameWidth() * 2);
-    }
-    else
-#endif
-    {
-        return QSize (mFrameBuf->width() + frameWidth() * 2,
-                      mFrameBuf->height() + frameWidth() * 2);
-    }
+    return QSize (mFrameBuf->width() + frameWidth() * 2,
+                  mFrameBuf->height() + frameWidth() * 2);
 }
 
@@ -1076 +1048 @@
 
                 if (mToggleFSModeTimer->isActive())
-                    mToggleFSModeTimer->stop(); 
+                    mToggleFSModeTimer->stop();
 
                 /* do frame buffer dependent resize */
@@ -2917 +2889 @@
 void VBoxConsoleView::doRefresh()
 {
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-    if (mode == VBoxDefs::TimerMode)
-    {
-        FRAMEBUF_DEBUG_START (xxx);
-        QSize last_sz = pm.size();
-        bool rc = display_to_pixmap (mConsole, pm);
-        if (rc)
-        {
-            if (pm.size() != last_sz)
-            {
-                int pw = pm.width(), ph = pm.height();
-                viewport()->resize (pw, ph);
-                updateGeometry();
-                setMaximumSize (sizeHint());
-                /* let our toplevel widget calculate its sizeHint properly */
-                QApplication::sendPostedEvents (0, QEvent::LayoutRequest);
-                normalizeGeometry();
+    viewport()->repaint();
+}
+
+void VBoxConsoleView::resizeEvent (QResizeEvent *)
+{
+    updateSliders();
+}
+
+void VBoxConsoleView::paintEvent (QPaintEvent *pe)
+{
+    if (mPausedShot.isNull())
+    {
+        /* delegate the paint function to the VBoxFrameBuffer interface */
+        mFrameBuf->paintEvent (pe);
+#ifdef Q_WS_MAC
+        /* Update the dock icon if we are in the running state */
+        if (isRunning())
+        {
+# if defined (VBOX_GUI_USE_QUARTZ2D)
+            if (mode == VBoxDefs::Quartz2DMode)
+            {
+                /* If the render mode is Quartz2D we could use the
+                 * CGImageRef of the framebuffer for the dock icon creation.
+                 * This saves some conversion time. */
+                CGImageRef ir =
+                    static_cast <VBoxQuartz2DFrameBuffer *> (mFrameBuf)->imageRef();
+                ::DarwinUpdateDockPreview (ir, mVirtualBoxLogo);
             }
             else
-            {
-                /* the alternative is to update, so we will be repainted
-                 * on the next event loop iteration. currently disabled.
-                 * updateContents(); */
-                viewport()->repaint();
-            }
-        }
-        if (rc)
-            FRAMEBUF_DEBUG_STOP (xxx, pm.width(), pm.height());
-    }
-    else
-#endif
-        viewport()->repaint();
-}
-
-void VBoxConsoleView::resizeEvent (QResizeEvent *)
-{
-    updateSliders();
-}
-
-void VBoxConsoleView::paintEvent (QPaintEvent *pe)
-{
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-#warning "port me: Is this needed anymore?"
-//    if (mode == VBoxDefs::TimerMode)
-//    {
-//        if (!pm.isNull())
-//        {
-//            /* draw a part of vbuf */
-//            const QRect &r = pe->rect();
-//            ::bitBlt (viewport(), r.x(), r.y(),
-//                      &pm, r.x() + contentsX(), r.y() + contentsY(),
-//                      r.width(), r.height(),
-//                      CopyROP, TRUE);
-//        }
-//        else
-//        {
-//            viewport()->erase (pe->rect());
-//        }
-//    }
-//    else
-#endif
-    {
-        if (mPausedShot.isNull())
-        {
-            /* delegate the paint function to the VBoxFrameBuffer interface */
-            mFrameBuf->paintEvent (pe);
+# endif
+                ::DarwinUpdateDockPreview (mFrameBuf, mVirtualBoxLogo);
+        }
+#endif
+        return;
+    }
+
+    /* we have a snapshot for the paused state */
+    QRect r = pe->rect().intersect (viewport()->rect());
+    QPainter pnt (viewport());
+    pnt.drawPixmap (r.x(), r.y(), mPausedShot,
+                    r.x() + contentsX(), r.y() + contentsY(),
+                    r.width(), r.height());
+
 #ifdef Q_WS_MAC
-            /* Update the dock icon if we are in the running state */
-            if (isRunning())
-            {
-# if defined (VBOX_GUI_USE_QUARTZ2D)
-                if (mode == VBoxDefs::Quartz2DMode)
-                {
-                    /* If the render mode is Quartz2D we could use the
-                     * CGImageRef of the framebuffer for the dock icon creation.
-                     * This saves some conversion time. */
-                    CGImageRef ir =
-                        static_cast <VBoxQuartz2DFrameBuffer *> (mFrameBuf)->imageRef();
-                    ::DarwinUpdateDockPreview (ir, mVirtualBoxLogo);
-                }
-                else
-# endif
-                    ::DarwinUpdateDockPreview (mFrameBuf, mVirtualBoxLogo);
-            }
-#endif
-            return;
-        }
-
-        /* we have a snapshot for the paused state */
-        QRect r = pe->rect().intersect (viewport()->rect());
-        QPainter pnt (viewport());
-        pnt.drawPixmap (r.x(), r.y(), mPausedShot,
-                        r.x() + contentsX(), r.y() + contentsY(),
-                        r.width(), r.height());
-
-#ifdef Q_WS_MAC
-        ::DarwinUpdateDockPreview (DarwinQPixmapToCGImage (&mPausedShot),
-                                   mVirtualBoxLogo,
-                                   mMainWnd->dockImageState());
-#endif
-    }
-}
-
-#ifdef VBOX_GUI_USE_REFRESH_TIMER
-void VBoxConsoleView::timerEvent( QTimerEvent * )
-{
-    doRefresh();
-}
-#endif
+    ::DarwinUpdateDockPreview (DarwinQPixmapToCGImage (&mPausedShot),
+                               mVirtualBoxLogo,
+                               mMainWnd->dockImageState());
+#endif
+}
 
 /**
@@ -3605 +3517 @@
     setDesktopGeometry(0, 0);
 }
- 
+
 /**
  * Set the maximum size allowed for the guest desktop to the available area
@@ -3649 +3561 @@
         h = str.section (',', 1, 1).toInt (&ok);
     QRect screen = QApplication::desktop()->screenGeometry (this);
-    if (ok && w <= screen.width() && h <= screen.height()) 
+    if (ok && w <= screen.width() && h <= screen.height())
     {
         LogFlowFunc (("Will suggest %d x %d\n", w, h));
@@ -3678 +3590 @@
 }
 
-int VBoxConsoleView::contentsWidth() const 
-{ 
-    return mFrameBuf->width(); 
-}
-
-int VBoxConsoleView::contentsHeight() const 
-{ 
-    return mFrameBuf->height(); 
+int VBoxConsoleView::contentsWidth() const
+{
+    return mFrameBuf->width();
+}
+
+int VBoxConsoleView::contentsHeight() const
+{
+    return mFrameBuf->height();
 }