Changeset 97888 in vbox

Timestamp:

Dec 28, 2022 12:52:28 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9898: X11: Migrating VBoxUtils bits to Qt6; Tested a bit on Linux host.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11

Files:

• VBoxUtils-x11.cpp (modified) (3 diffs)
• VBoxUtils-x11.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.cpp

@@ -613 +613 @@
 }
 
-Display *NativeWindowSubsystem::X11GetDisplay(void)
-{
-#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
-    Display *pDisplay = nullptr;
+Display *NativeWindowSubsystem::X11GetDisplay()
+{
+#ifdef VBOX_IS_QT6_OR_LATER /** QX11Info is replaced with QNativeInterface::QX11Application since qt6 */
+    Display *pDisplay = 0;
     if (qApp)
     {
@@ -630 +630 @@
 }
 
-xcb_connection_t *NativeWindowSubsystem::X11GetConnection(void)
-{
-#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
+xcb_connection_t *NativeWindowSubsystem::X11GetConnection()
+{
+#ifdef VBOX_IS_QT6_OR_LATER /** QX11Info is replaced with QNativeInterface::QX11Application since qt6 */
+    xcb_connection_t *pConnection = 0;
     if (qApp)
     {
         QNativeInterface::QX11Application *pX11App = qApp->nativeInterface<QNativeInterface::QX11Application>();
         if (pX11App)
-            return pX11App->connection();
-    }
-    return NULL;
+            pConnection = pX11App->connection();
+    }
 #else
-    return QX11Info::connection();
+    xcb_connection_t *pConnection = QX11Info::connection();
 #endif
-}
-
-uint32_t NativeWindowSubsystem::X11GetAppRootWindow(void)
-{
-#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
+    Assert(pConnection);
+    return pConnection;
+}
+
+uint32_t NativeWindowSubsystem::X11GetAppRootWindow()
+{
+#ifdef VBOX_IS_QT6_OR_LATER /** QX11Info is replaced with QNativeInterface::QX11Application since qt6 */
     Window idWindow = 0;
     Display *pDisplay = NativeWindowSubsystem::X11GetDisplay();
     if (pDisplay)
-        idWindow = DefaultRootWindow(pDisplay); /** @todo qt6: ?? */
+        idWindow = DefaultRootWindow(pDisplay);
     return idWindow;
 #else
@@ -657 +659 @@
 #endif
 }
-

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxUtils-x11.h

@@ -130 +130 @@
     SHARED_LIBRARY_STUFF void X11SetXwaylandMayGrabKeyboardFlag(QWidget *pWidget);
 
-    /** X11: Get the X11 display pointer. */
-    SHARED_LIBRARY_STUFF struct _XDisplay *X11GetDisplay(void);
-
-    /** X11: Get the X11 connection.   */
-    SHARED_LIBRARY_STUFF struct xcb_connection_t *X11GetConnection(void);
-
-    /** X11: Get the X11 root (desktop) window. */
-    SHARED_LIBRARY_STUFF uint32_t X11GetAppRootWindow(void);
+    /** X11: Gets the X11 display pointer. */
+    SHARED_LIBRARY_STUFF struct _XDisplay *X11GetDisplay();
+    /** X11: Gets the X11 connection. */
+    SHARED_LIBRARY_STUFF struct xcb_connection_t *X11GetConnection();
+    /** X11: Gets the X11 root (desktop) window. */
+    SHARED_LIBRARY_STUFF uint32_t X11GetAppRootWindow();
 }