Changeset 98848 in vbox

Timestamp:

Mar 7, 2023 7:55:33 AM (2 years ago)

Author:

vboxsync

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

156171

Message:

FE/Qt: bugref:10322: Runtime UI: Small cleanup for UIFrameBuffer class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBuffer.cpp (modified) (12 diffs)
• UIFrameBuffer.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -33 +33 @@
 
 /* GUI includes: */
-#include "UIActionPool.h"
 #include "UIActionPoolRuntime.h"
+#include "UICommon.h"
+#include "UIExtraDataManager.h"
 #include "UIFrameBuffer.h"
-#include "UISession.h"
 #include "UIMachine.h"
 #include "UIMachineLogic.h"
+#include "UIMachineView.h"
 #include "UIMachineWindow.h"
-#include "UIMachineView.h"
 #include "UINotificationCenter.h"
-#include "UIExtraDataManager.h"
-#include "UICommon.h"
-#ifdef VBOX_WITH_MASKED_SEAMLESS
-# include "UIMachineWindow.h"
-#endif /* VBOX_WITH_MASKED_SEAMLESS */
-#ifdef VBOX_WS_X11
-# include "VBoxUtils-x11.h"
-#endif
+#include "UISession.h"
 
 /* COM includes: */
-#include "CConsole.h"
 #include "CDisplay.h"
 #include "CFramebuffer.h"
@@ -66 +58 @@
 /* Other includes: */
 #include <math.h>
-
 #ifdef VBOX_WS_X11
-/* X11 includes: */
 # include <X11/Xlib.h>
 # undef Bool // Qt5 vs Xlib gift..
@@ -82 +72 @@
 // #include <iprt/stdint.h>
 // #include <iprt/win/windows.h>
-#include <QOffscreenSurface>
-#include <QOpenGLFunctions>
-#include <QOpenGLTexture>
-#include <QOpenGLWidget>
-
-# ifdef RT_OS_LINUX
+# include <QOffscreenSurface>
+# include <QOpenGLFunctions>
+# include <QOpenGLTexture>
+# include <QOpenGLWidget>
+
+#  ifdef RT_OS_LINUX
 /* GL/glx.h must be included after Qt GL headers (which define GL_GLEXT_LEGACY) to avoid GL_GLEXT_VERSION conflict. */
-#include <GL/glx.h>
-# endif
+#   include <GL/glx.h>
+#  endif
 
 class UIFrameBufferPrivate;
@@ -232 +222 @@
     GLuint m_guestTexture;
 };
+
+/* End of experimental code. */
 #endif /* VBOX_GUI_WITH_QTGLFRAMEBUFFER */
+
 
 /** IFramebuffer implementation used to maintain VM display video memory. */
@@ -252 +245 @@
 public:
 
-    /** Frame-buffer constructor. */
+    /** Constructs frame-buffer. */
     UIFrameBufferPrivate();
-    /** Frame-buffer destructor. */
-    ~UIFrameBufferPrivate();
+    /** Destructs frame-buffer. */
+    virtual ~UIFrameBufferPrivate() RT_OVERRIDE;
 
     /** Frame-buffer initialization.
@@ -284 +277 @@
     /** Returns default frame-buffer pixel-format. */
     ulong pixelFormat() const { return KBitmapFormat_BGR; }
-    /** Returns the visual-state this frame-buffer is used for. */
-    UIVisualStateType visualState() const { return m_pMachineView ? m_pMachineView->visualStateType() : UIVisualStateType_Invalid; }
 
     /** Defines whether frame-buffer is <b>unused</b>.
@@ -1098 +1089 @@
 #endif
 {
+    LogRel2(("GUI: UIFrameBufferPrivate::UIFrameBufferPrivate %p\n", this));
+
     /* Update coordinate-system: */
     updateCoordinateSystem();
 }
 
+UIFrameBufferPrivate::~UIFrameBufferPrivate()
+{
+    LogRel2(("GUI: UIFrameBufferPrivate::~UIFrameBufferPrivate %p\n", this));
+
+    /* Disconnect handlers: */
+    if (m_pMachineView)
+        cleanupConnections();
+
+    /* Deinitialize critical-section: */
+    RTCritSectDelete(&m_critSect);
+}
+
 HRESULT UIFrameBufferPrivate::init(UIMachineView *pMachineView)
 {
@@ -1110 +1115 @@
 
     /* Assign display: */
-    m_comDisplay = m_pMachineView->uimachine()->uisession()->display();
+    m_comDisplay = gpMachine->uisession()->display();
 
     /* Initialize critical-section: */
@@ -1125 +1130 @@
 
     return S_OK;
-}
-
-UIFrameBufferPrivate::~UIFrameBufferPrivate()
-{
-    LogRel2(("GUI: UIFrameBufferPrivate::~UIFrameBufferPrivate %p\n", this));
-
-    /* Disconnect handlers: */
-    if (m_pMachineView)
-        cleanupConnections();
-
-    /* Deinitialize critical-section: */
-    RTCritSectDelete(&m_critSect);
 }
 
@@ -1176 +1169 @@
 void UIFrameBufferPrivate::detach()
 {
-    CFramebuffer frameBuffer = display().QueryFramebuffer(m_uScreenId);
-    if (!frameBuffer.isNull())
+    CFramebuffer comFramebuffer = display().QueryFramebuffer(m_uScreenId);
+    if (!comFramebuffer.isNull())
     {
         display().DetachFramebuffer(m_uScreenId, m_uFramebufferId);
@@ -2345 +2338 @@
 }
 
-uchar* UIFrameBuffer::address()
+uchar *UIFrameBuffer::address()
 {
     return m_pFrameBuffer->address();
@@ -2368 +2361 @@
 {
     return m_pFrameBuffer->bytesPerLine();
-}
-
-UIVisualStateType UIFrameBuffer::visualState() const
-{
-    return m_pFrameBuffer->visualState();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h

@@ -76 +76 @@
 
     /** Returns frame-buffer data address. */
-    uchar* address();
+    uchar *address();
     /** Returns frame-buffer width. */
     ulong width() const;
@@ -85 +85 @@
     /** Returns frame-buffer bytes-per-line value. */
     ulong bytesPerLine() const;
-    /** Returns the visual-state this frame-buffer is used for. */
-    UIVisualStateType visualState() const;
 
     /** Defines whether frame-buffer is <b>unused</b>.
@@ -148 +146 @@
 
     /** Holds the frame-buffer private instance. */
-    ComObjPtr<UIFrameBufferPrivate> m_pFrameBuffer;
+    ComObjPtr<UIFrameBufferPrivate>  m_pFrameBuffer;
 
     /** Holds whether frame-buffer was initialized already. */