Changeset 7610 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

Timestamp:

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

Author:

vboxsync

Message:

FE/Qt: Dropped refresh timer rendering mode.

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxConsoleView.h (modified) (4 diffs)
• VBoxDefs.h (modified) (1 diff)
• VBoxFrameBuffer.h (modified) (1 diff)

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

@@ -105 +105 @@
     int visibleWidth() const { return horizontalScrollBar()->pageStep(); }
     int visibleHeight() const { return verticalScrollBar()->pageStep(); }
-    void scrollBy (int dx, int dy) 
-    { 
+    void scrollBy (int dx, int dy)
+    {
         horizontalScrollBar()->setValue (horizontalScrollBar()->value() + dx);
         verticalScrollBar()->setValue (verticalScrollBar()->value() + dy);
@@ -112 +112 @@
     QPoint viewportToContents ( const QPoint & vp ) const
     {
-        return QPoint (vp.x() + contentsX(), 
+        return QPoint (vp.x() + contentsX(),
                        vp.y() + contentsY());
     }
@@ -185 +185 @@
     void resizeEvent (QResizeEvent *);
     void paintEvent (QPaintEvent *);
-#ifdef VBOX_GUI_USE_REFRESH_TIMER
-    void timerEvent( QTimerEvent * );
-#endif
 
     void captureKbd (bool aCapture, bool aEmitSignal = true);
@@ -280 +277 @@
 #endif
 
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-    QPixmap pm;
-    int tid;        /**< Timer id */
-#endif
-
     VBoxFrameBuffer *mFrameBuf;
     CConsoleCallback mCallback;

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

@@ -56 +56 @@
   #if defined (VBOX_GUI_USE_EXT_FRAMEBUFFER)
     #undef VBOX_GUI_USE_EXT_FRAMEBUFFER
-  #endif
-  #if !defined (VBOX_GUI_USE_REFRESH_TIMER)
-    #define VBOX_GUI_USE_REFRESH_TIMER
   #endif
 #endif

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

@@ -124 +124 @@
     QRegion mReg;
 };
-
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined (VBOX_GUI_USE_REFRESH_TIMER)
-
-/**
- *  Copies the current VM video buffer contents to the pixmap referenced
- *  by the argument. The return value indicates whether the
- *  buffer has been updated since the last call to this method or not.
- *
- *  The copy operation is atomic (guarded by a mutex).
- *
- *  This method is intentionally inlined for faster execution and should be
- *  called only by VBoxConsoleView members.
- *
- *  @return true if the pixmap is updated, and false otherwise.
- */
-inline bool display_to_pixmap( const CConsole &c, QPixmap &pm )
-{
-    CDisplay display = c.GetDisplay();
-
-    uint8_t *addr = (uint8_t *) display.LockFramebuffer();
-    AssertMsg (addr, ("The buffer address must not be null"));
-
-    QImage::Format format = QImage::Format_Invalid;
-    switch (display.GetBitsPerPixel())
-    {
-        /* 32-, 8- and 1-bpp are the only depths suported by QImage */
-        case 32:
-            format = QImage::Format_RGB32;
-            break;
-        case 8:
-            format = QImage::Format_Indexed8;
-            break;
-        case 1:
-            format = QImage::Format_Mono;
-            break;
-    }
-
-    bool rc = false;
-    if(format != QImage::Format_Invalid)
-    {
-        pm = QPixmap::fromImage (QImage (addr,
-                                         display.GetWidth(), display.GetHeight(),
-                                         format));
-        rc = !pm.isNull();
-        AssertMsg (rc, ("convertFromImage() must always return true"));
-    }
-
-    display.UnlockFramebuffer();
-
-    return rc;
-}
-
-#endif
 
 /////////////////////////////////////////////////////////////////////////////