Changeset 72425 in vbox for trunk

Timestamp:

Jun 4, 2018 9:57:30 AM (7 years ago)

Author:

vboxsync

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

122897

Message:

X11 build fix for r122884.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (2 diffs)

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

@@ -1590 +1590 @@
 }
 
-/* static */
-bool VBoxGlobal::activateWindow (WId aWId, bool aSwitchDesktop /* = true */)
-{
-    RT_NOREF(aSwitchDesktop);
-    bool result = true;
-
-#if defined (VBOX_WS_WIN)
-
-    HWND handle = (HWND)aWId;
-
-    if (IsIconic (handle))
-        result &= !!ShowWindow (handle, SW_RESTORE);
-    else if (!IsWindowVisible (handle))
-        result &= !!ShowWindow (handle, SW_SHOW);
-
-    result &= !!SetForegroundWindow (handle);
-
-#elif defined (VBOX_WS_X11)
-
-    Display *dpy = QX11Info::display();
-
-    if (aSwitchDesktop)
-    {
-        /* try to find the desktop ID using the NetWM property */
-        CARD32 *desktop = (CARD32 *) XXGetProperty (dpy, aWId, XA_CARDINAL,
-                                                    "_NET_WM_DESKTOP");
-        if (desktop == NULL)
-            // WORKAROUND:
-            // if the NetWM properly is not supported try to find
-            // the desktop ID using the GNOME WM property.
-            desktop = (CARD32 *) XXGetProperty (dpy, aWId, XA_CARDINAL,
-                                                "_WIN_WORKSPACE");
-
-        if (desktop != NULL)
-        {
-            Bool ok = XXSendClientMessage (dpy, DefaultRootWindow (dpy),
-                                           "_NET_CURRENT_DESKTOP",
-                                           *desktop);
-            if (!ok)
-            {
-                Log1WarningFunc(("Couldn't switch to desktop=%08X\n", desktop));
-                result = false;
-            }
-            XFree (desktop);
-        }
-        else
-        {
-            Log1WarningFunc(("Couldn't find a desktop ID for aWId=%08X\n", aWId));
-            result = false;
-        }
-    }
-
-    Bool ok = XXSendClientMessage (dpy, aWId, "_NET_ACTIVE_WINDOW");
-    result &= !!ok;
-
-    XRaiseWindow (dpy, aWId);
-
-#else
-
-    NOREF (aWId);
-    NOREF (aSwitchDesktop);
-    AssertFailed();
-    result = false;
-
-#endif
-
-    if (!result)
-        Log1WarningFunc(("Couldn't activate aWId=%08X\n", aWId));
-
-    return result;
-}
-
 #if defined (VBOX_WS_X11)
 
@@ -1716 +1644 @@
                        SubstructureRedirectMask, &ev) != 0;
 }
+
+#endif
+
+/* static */
+bool VBoxGlobal::activateWindow (WId aWId, bool aSwitchDesktop /* = true */)
+{
+    RT_NOREF(aSwitchDesktop);
+    bool result = true;
+
+#if defined (VBOX_WS_WIN)
+
+    HWND handle = (HWND)aWId;
+
+    if (IsIconic (handle))
+        result &= !!ShowWindow (handle, SW_RESTORE);
+    else if (!IsWindowVisible (handle))
+        result &= !!ShowWindow (handle, SW_SHOW);
+
+    result &= !!SetForegroundWindow (handle);
+
+#elif defined (VBOX_WS_X11)
+
+    Display *dpy = QX11Info::display();
+
+    if (aSwitchDesktop)
+    {
+        /* try to find the desktop ID using the NetWM property */
+        CARD32 *desktop = (CARD32 *) XXGetProperty (dpy, aWId, XA_CARDINAL,
+                                                    "_NET_WM_DESKTOP");
+        if (desktop == NULL)
+            // WORKAROUND:
+            // if the NetWM properly is not supported try to find
+            // the desktop ID using the GNOME WM property.
+            desktop = (CARD32 *) XXGetProperty (dpy, aWId, XA_CARDINAL,
+                                                "_WIN_WORKSPACE");
+
+        if (desktop != NULL)
+        {
+            Bool ok = XXSendClientMessage (dpy, DefaultRootWindow (dpy),
+                                           "_NET_CURRENT_DESKTOP",
+                                           *desktop);
+            if (!ok)
+            {
+                Log1WarningFunc(("Couldn't switch to desktop=%08X\n", desktop));
+                result = false;
+            }
+            XFree (desktop);
+        }
+        else
+        {
+            Log1WarningFunc(("Couldn't find a desktop ID for aWId=%08X\n", aWId));
+            result = false;
+        }
+    }
+
+    Bool ok = XXSendClientMessage (dpy, aWId, "_NET_ACTIVE_WINDOW");
+    result &= !!ok;
+
+    XRaiseWindow (dpy, aWId);
+
+#else
+
+    NOREF (aWId);
+    NOREF (aSwitchDesktop);
+    AssertFailed();
+    result = false;
+
+#endif
+
+    if (!result)
+        Log1WarningFunc(("Couldn't activate aWId=%08X\n", aWId));
+
+    return result;
+}
+
+#if defined (VBOX_WS_X11)
 
 /* static */