Changeset 107174 in vbox

Timestamp:

Nov 28, 2024 12:34:10 PM (7 weeks ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10407. When VM window is a wayland client then call winId on machine window instead of view's viewport.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (3 diffs)

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

@@ -62 +62 @@
 #ifdef VBOX_WS_NIX
 # include <X11/Xlib.h>
+# include "VBoxUtils-nix.h"
 # undef Bool // Qt5 vs Xlib gift..
 #endif /* VBOX_WS_NIX */
@@ -452 +453 @@
     /* Reassign index: */
     m_uScreenId = m_pMachineView ? m_pMachineView->screenId() : 0;
-    /* Recache window ID: */
-    m_iWinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
 
 #ifdef VBOX_WS_NIX
@@ -459 +458 @@
         /* Resync Qt and X11 Server (see xTracker #7547). */
         XSync(NativeWindowSubsystem::X11GetDisplay(), false);
+    if (NativeWindowSubsystem::displayServerType() == VBGHDISPLAYSERVERTYPE_PURE_WAYLAND)
+        m_iWinId = (m_pMachineView && m_pMachineView->machineWindow()) ? (LONG64)m_pMachineView->machineWindow()->winId() : 0;
+    else
+        m_iWinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
+#else
+    /* Recache window ID: */
+    m_iWinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
 #endif