Changeset 69552 in vbox

Timestamp:

Nov 2, 2017 2:30:06 PM (7 years ago)

Author:

vboxsync

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

118901

Message:

FE/Qt: Setting different WM_CLASS for VirtualBox Manager and Virtual Machine windows to be able to differentiate them thru window manager rules. see bugref:9027

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -169 +169 @@
 # include <X11/Xlib.h>
 # include <X11/Xatom.h>
+# include <X11/Xutil.h>
 # include <X11/extensions/Xinerama.h>
 # define BOOL PRBool
@@ -3322 +3323 @@
 }
 
+#ifdef VBOX_WS_X11
+void VBoxGlobal::setWMClass(QWidget *pWidget, const char *pStrName, const char *pStrClass)
+{
+    /* Make sure all arguments set: */
+    AssertReturnVoid(pWidget && pStrName && pStrClass);
+
+    /* Create duplicates to avoid casting away constness: */
+    char *pWindowName = strdup(pStrName);
+    char *pWindowClass = strdup(pStrClass);
+    AssertReturnVoid(pWindowName && pWindowClass);
+
+    XClassHint windowClass;
+    windowClass.res_name = pWindowName;
+    windowClass.res_class = pWindowClass;
+    /* Set WM_CLASS of the window to passed name and class strings: */
+    XSetClassHint(QX11Info::display(), pWidget->window()->winId(), &windowClass);
+
+    /* Free duplicates: */
+    XFree(windowClass.res_class);
+    XFree(windowClass.res_name);
+}
+#endif /* VBOX_WS_X11 */
+
 // Public slots
 ////////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -452 +452 @@
       * @note  Take into account that this request may fail on X11. */
     static void setTopLevelGeometry(QWidget *pWidget, const QRect &rect);
+
+#ifdef VBOX_WS_X11
+    /** Assigns WM_CLASS property for passed @a pWidget. */
+    static void setWMClass(QWidget *pWidget, const char *pStrName, const char *pStrClass);
+#endif
 
 signals:

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

@@ -96 +96 @@
 void UIMachineWindow::prepare()
 {
+#ifdef VBOX_WS_X11
+    /* Compose window name: */
+    const QString strWindowName = QString("VirtualBox Machine UUID: %1").arg(vboxGlobal().managedVMUuid());
+
+    /* Assign it to both WM_CLASS name & class for now: */
+    const char *pBuffer = strWindowName.toLatin1().constData();
+    if (pBuffer)
+        vboxGlobal().setWMClass(this, pBuffer, pBuffer);
+    else
+        vboxGlobal().setWMClass(this, "VirtualBox Machine", "VirtualBox Machine");
+#endif
+
     /* Prepare session-connections: */
     prepareSessionConnections();

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1321 +1321 @@
 void UISelectorWindow::prepare()
 {
+#ifdef VBOX_WS_X11
+    /* Assign same name to both WM_CLASS name & class for now: */
+    vboxGlobal().setWMClass(this, "VirtualBox Manager", "VirtualBox Manager");
+#endif
+
 #ifdef VBOX_WS_MAC
     /* We have to make sure that we are getting the front most process: */