Changeset 10922 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Jul 28, 2008 8:10:03 PM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Porting qimage frame-buffer to qt4, fixing some little painting issues.

Location:

trunk/src/VBox/Frontends/VirtualBox4/src

Files:

• VBoxConsoleView.cpp (modified) (5 diffs)
• VBoxFrameBuffer.cpp (modified) (3 diffs)

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

@@ -119 +119 @@
     UInt32 eventKind = ::GetEventKind (inEvent);
     /* For debugging events */
-    /* 
+    /*
     if (!(eventClass == 'cute'))
         ::darwinDebugPrintEvent ("view: ", inEvent);
@@ -163 +163 @@
 
     /* For debugging events */
-    /* 
+    /*
     if (!(eventClass == 'cute'))
         ::darwinDebugPrintEvent ("view: ", inEvent);
@@ -1157 +1157 @@
             }
 
-#if !defined (Q_WS_WIN) && !defined (Q_WS_PM)
-            /* see VBox[QImage|SDL]FrameBuffer::NotifyUpdate(). */
+            /* See VBox[QImage|SDL]FrameBuffer::NotifyUpdate(). */
             case VBoxDefs::RepaintEventType:
             {
@@ -1168 +1167 @@
                 return true;
             }
-#endif
 
             case VBoxDefs::SetRegionEventType:
@@ -2684 +2682 @@
 
 #ifdef Q_WS_MAC
-    /* Simulate the right click on 
+    /* Simulate the right click on
      * Host+Left Mouse */
     if (mIsHostkeyPressed &&

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

@@ -316 +316 @@
                                                   BOOL *aFinished)
 {
-#if !defined (Q_WS_WIN) && !defined (Q_WS_PM)
-    /* we're not on the GUI thread and update() isn't thread safe in Qt 3.3.x
-       on the Mac (4.2.x is), on Linux (didn't check Qt 4.x there) and
-       probably on other non-DOS platforms, so post the event instead. */
+    /* We're not on the GUI thread and update() isn't thread safe in
+     * Qt 4.3.x on the Win, Qt 3.3.x on the Mac (4.2.x is),
+     * on Linux (didn't check Qt 4.x there) and probably on other
+     * non-DOS platforms, so post the event instead. */
     QApplication::postEvent (mView,
                              new VBoxRepaintEvent (aX, aY, aW, aH));
-#else
-    /* we're not on the GUI thread, so update() instead of repaint()! */
-    mView->viewport()->update (aX - mView->contentsX(),
-                               aY - mView->contentsY(),
-                               aW, aH);
-#endif
-    /* the update has been finished, return TRUE */
+
+    /* The update has been finished, return TRUE */
     *aFinished = TRUE;
     return S_OK;
@@ -335 +330 @@
 void VBoxQImageFrameBuffer::paintEvent (QPaintEvent *pe)
 {
-    const QRect &r = pe->rect().intersect (mView->viewport()->rect());
-
-    /*  some outdated rectangle during processing VBoxResizeEvent */
+    const QRect &r = pe->rect().intersected (mView->viewport()->rect());
+
+    /* Some outdated rectangle during processing VBoxResizeEvent */
     if (r.isEmpty())
         return;
@@ -349 +344 @@
     FRAMEBUF_DEBUG_START (xxx);
 
-    /* In Qt4 there is not bitblt anymore. So 
-     * we create a qpainter object and paint on 
-     * that. Todo: Do some performance test. */
-//#warning port me: do it faster?
     QPainter painter (mView->viewport());
-    painter.drawImage (r.x(), r.y(), mImg, 
-                       r.x() + mView->contentsX(),
-                       r.y() + mView->contentsY(),
-                       r.width(), r.height());
-//    if (r.width() < mWdt * 2 / 3)
-//    {
-//        /* this method is faster for narrow updates */
-//        mPM.convertFromImage (mImg.copy (r.x() + mView->contentsX(),
-//                                         r.y() + mView->contentsY(),
-//                                         r.width(), r.height()));
-//        ::bitBlt (mView->viewport(), r.x(), r.y(),
-//                  &mPM, 0, 0,
-//                  r.width(), r.height(),
-//                  Qt::CopyROP, TRUE);
-//    }
-//    else
-//    {
-//        /* this method is faster for wide updates */
-//        mPM.convertFromImage (QImage (mImg.scanLine (r.y() + mView->contentsY()),
-//                                      mImg.width(), r.height(), mImg.depth(),
-//                                      0, 0, QImage::LittleEndian));
-//        ::bitBlt (mView->viewport(), r.x(), r.y(),
-//                  &mPM, r.x() + mView->contentsX(), 0,
-//                  r.width(), r.height(),
-//                  Qt::CopyROP, TRUE);
-//    }
+
+    if (r.width() < mWdt * 2 / 3)
+    {
+        /* This method is faster for narrow updates */
+        mPM = QPixmap::fromImage (mImg.copy (r.x() + mView->contentsX(),
+                                             r.y() + mView->contentsY(),
+                                             r.width(), r.height()));
+        painter.drawPixmap (r.x(), r.y(), mPM);
+    }
+    else
+    {
+        /* This method is faster for wide updates */
+        mPM = QPixmap::fromImage (QImage (mImg.scanLine (r.y() + mView->contentsY()),
+                                  mImg.width(), r.height(), mImg.bytesPerLine(),
+                                  QImage::Format_RGB32));
+        painter.drawPixmap (r.x() + mView->contentsX(), r.y(), mPM);
+    }
 
     FRAMEBUF_DEBUG_STOP (xxx, r.width(), r.height());