Changeset 22822 in vbox

Timestamp:

Sep 7, 2009 7:33:48 PM (15 years ago)

Author:

vboxsync

Message:

video hw accel: generic template for overlay buffer

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (1 diff)
• include/VBoxFrameBuffer.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (2 diffs)
• src/VBoxFBOverlay.cpp (modified) (1 diff)
• src/VBoxFBQGL.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

@@ -1257 +1257 @@
 
 
+template <class T>
+class VBoxOverlayFrameBuffer : public T
+{
+public:
+    VBoxOverlayFrameBuffer (class VBoxConsoleView *aView)
+        : T(aView),
+          mOverlay(aView, this)
+    {}
+
+
+    STDMETHOD(ProcessVHWACommand)(BYTE *pCommand)
+    {
+        return mOverlay.onVHWACommand((VBOXVHWACMD*)pCommand);
+    }
+
+    void doProcessVHWACommand(QEvent * pEvent)
+    {
+        mOverlay.onVHWACommandEvent(pEvent);
+    }
+
+    STDMETHOD(NotifyUpdate) (ULONG aX, ULONG aY,
+                             ULONG aW, ULONG aH)
+    {
+        if(mOverlay.onNotifyUpdate(aX, aY, aW, aH))
+            return S_OK;
+        return T::NotifyUpdate(aX, aY, aW, aH);
+    }
+
+    void paintEvent (QPaintEvent *pe)
+    {
+        QRect rect;
+        VBOXFBOVERLAY_RESUT res = mOverlay.onPaintEvent(pe, &rect);
+        switch(res)
+        {
+            case VBOXFBOVERLAY_MODIFIED:
+            {
+                QPaintEvent modified(rect);
+                T::paintEvent(&modified);
+            } break;
+            case VBOXFBOVERLAY_UNTOUCHED:
+                T::paintEvent(pe);
+                break;
+        }
+    }
+
+    void resizeEvent (VBoxResizeEvent *re)
+    {
+        mOverlay.onResizeEvent(re);
+        T::resizeEvent(re);
+        mOverlay.onResizeEventPostprocess(re);
+    }
+private:
+    VBoxQGLOverlay mOverlay;
+};
+
 #endif
 

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

@@ -333 +333 @@
 };
 
-# ifdef VBOX_WITH_VIDEOHWACCEL
-#  ifdef VBOX_GUI_USE_QIMAGE
-class VBoxQImageOverlayFrameBuffer : public VBoxQImageFrameBuffer
-{
-public:
-    VBoxQImageOverlayFrameBuffer (VBoxConsoleView *aView);
-
-
-    STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
-
-    void doProcessVHWACommand(QEvent * pEvent);
-
-    STDMETHOD(NotifyUpdate) (ULONG aX, ULONG aY,
-                             ULONG aW, ULONG aH);
-
-    void paintEvent (QPaintEvent *pe);
-    void resizeEvent (VBoxResizeEvent *re);
-private:
-    VBoxQGLOverlay mOverlay;
-};
-#  endif /* #  ifdef VBOX_GUI_USE_QIMAGE */
-# endif /* # ifdef VBOX_WITH_VIDEOHWACCEL */
-
 #endif
 

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

@@ -840 +840 @@
             mFrameBuf =
 #ifdef VBOX_WITH_VIDEOHWACCEL
-                    mAccelerate2DVideo ? new VBoxQImageOverlayFrameBuffer (this) :
+                    mAccelerate2DVideo ? new VBoxOverlayFrameBuffer<VBoxQImageFrameBuffer>(this) :
 #endif
                     new VBoxQImageFrameBuffer (this);
@@ -855 +855 @@
             XFlush(QX11Info::display());
 # endif
-            mFrameBuf = new VBoxSDLFrameBuffer (this);
+            mFrameBuf =
+#if defined(VBOX_WITH_VIDEOHWACCEL) && defined(DEBUG_misha) /* not tested yet */
+                    mAccelerate2DVideo ? new VBoxOverlayFrameBuffer<VBoxSDLFrameBuffer>(this) :
+#endif
+                    new VBoxSDLFrameBuffer (this);
             /*
              *  disable scrollbars because we cannot correctly draw in a

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -5711 +5711 @@
     }
 }
-#endif
+
+#endif

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp

@@ -164 +164 @@
 }
 
-
-VBoxQImageOverlayFrameBuffer::VBoxQImageOverlayFrameBuffer (VBoxConsoleView *aView)
-    : VBoxQImageFrameBuffer(aView),
-      mOverlay(aView, this)
-{}
-
-
-STDMETHODIMP VBoxQImageOverlayFrameBuffer::ProcessVHWACommand(BYTE *pCommand)
-{
-    return mOverlay.onVHWACommand((VBOXVHWACMD*)pCommand);
-}
-
-void VBoxQImageOverlayFrameBuffer::doProcessVHWACommand(QEvent * pEvent)
-{
-    mOverlay.onVHWACommandEvent(pEvent);
-}
-
-STDMETHODIMP VBoxQImageOverlayFrameBuffer::NotifyUpdate (ULONG aX, ULONG aY,
-                             ULONG aW, ULONG aH)
-{
-    if(mOverlay.onNotifyUpdate(aX, aY, aW, aH))
-        return S_OK;
-    return VBoxQImageFrameBuffer::NotifyUpdate(aX, aY, aW, aH);
-}
-
-void VBoxQImageOverlayFrameBuffer::paintEvent (QPaintEvent *pe)
-{
-    QRect rect;
-    VBOXFBOVERLAY_RESUT res = mOverlay.onPaintEvent(pe, &rect);
-    switch(res)
-    {
-        case VBOXFBOVERLAY_MODIFIED:
-        {
-            QPaintEvent modified(rect);
-            VBoxQImageFrameBuffer::paintEvent(&modified);
-        } break;
-        case VBOXFBOVERLAY_UNTOUCHED:
-            VBoxQImageFrameBuffer::paintEvent(pe);
-            break;
-    }
-}
-
-void VBoxQImageOverlayFrameBuffer::resizeEvent (VBoxResizeEvent *re)
-{
-    mOverlay.onResizeEvent(re);
-    VBoxQImageFrameBuffer::resizeEvent(re);
-    mOverlay.onResizeEventPostprocess(re);
-}
-
 #endif