[arch-commits] Commit in virtualbox/trunk (009-i3wm.patch PKGBUILD)

[Christian Hesse]

    Date: Monday, May 31, 2021 @ 20:10:41
  Author: eworm
Revision: 952889

fix windows handling in i3 wm (FS#56730)

Added:
  virtualbox/trunk/009-i3wm.patch
Modified:
  virtualbox/trunk/PKGBUILD

----------------+
 009-i3wm.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD       |    2 ++
 2 files changed, 52 insertions(+)

Added: 009-i3wm.patch
===================================================================
--- 009-i3wm.patch	                        (rev 0)
+++ 009-i3wm.patch	2021-05-31 20:10:41 UTC (rev 952889)
@@ -0,0 +1,50 @@
+diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
+--- VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp	2017-03-08 18:19:53.000000000 +0100
++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp	2017-03-10 10:25:58.876132400 +0100
+@@ -282,7 +282,7 @@
+     /* Get cached available-geometry: */
+     const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex);
+     /* Return cached available-geometry if it's valid or screen-geometry otherwise: */
+-    return availableGeometry.isValid() ? availableGeometry :
++    return availableGeometry.isValid() && X11WindowManagerType() != X11WMType_i3 ? availableGeometry :
+            QApplication::desktop()->screenGeometry(iHostScreenIndex);
+ #else /* !VBOX_WS_X11 */
+     /* Redirect call to desktop-widget: */
+diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp
+--- VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp	2017-03-08 18:19:54.000000000 +0100
++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp	2017-03-10 10:23:15.729460200 +0100
+@@ -93,6 +93,9 @@
+                 else
+                 if (QString((const char*)pcData).contains("Xfwm4", Qt::CaseInsensitive))
+                     wmType = X11WMType_Xfwm4;
++                else
++                if (QString((const char*)pcData).contains("i3", Qt::CaseInsensitive))
++                    wmType = X11WMType_i3;
+                 if (pcData)
+                     XFree(pcData);
+             }
+diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h
+--- VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h	2017-03-08 18:19:54.000000000 +0100
++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h	2017-03-10 10:22:11.876123200 +0100
+@@ -27,6 +27,7 @@
+     X11WMType_KWin,
+     X11WMType_Mutter,
+     X11WMType_Xfwm4,
++    X11WMType_i3,
+ };
+ 
+ /** X11: Determines and returns whether the compositing manager is running. */
+diff -Naur VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
+--- VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	2017-03-08 18:19:58.000000000 +0100
++++ VirtualBox/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	2017-03-10 10:29:12.549409400 +0100
+@@ -727,6 +727,10 @@
+     /* Enable translucency through Qt API if supported: */
+     if (vboxGlobal().isCompositingManagerRunning())
+         setAttribute(Qt::WA_TranslucentBackground);
++
++    if (X11WindowManagerType() == X11WMType_i3)
++         setWindowFlags(Qt::FramelessWindowHint);
++
+ #endif /* VBOX_WS_X11 */
+ 
+     /* Make sure we have no focus: */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-31 20:10:41 UTC (rev 952888)
+++ PKGBUILD	2021-05-31 20:10:41 UTC (rev 952889)
@@ -68,6 +68,7 @@
         '005-gsoap-build.patch'
         '006-rdesktop-vrdp-keymap-path.patch'
         '008-no-vboxvideo.patch'
+        '009-i3wm.patch'
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         '013-Makefile.patch'
         '017-fix-narrowing-conversion.patch'
@@ -89,6 +90,7 @@
             '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
             '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
             '053bfeee8863f3ffdf2f0e3f9f0d77dc61dd32764700a97a7635fd8611e20491'
+            'c1e13ea4340cff681b273408b1e7f38c887ff8dab6923db390aa58d5ae0f82fa'
             '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
             'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
             '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'