Changeset 197f54a2b9 in tspsg

Timestamp:

Sep 12, 2012, 6:55:57 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

545591d1a9

Parents:

89e5214692

Message:

No QX11Info class in Qt 5.

Replaced all usage of QX11Info with direct access to X11 API. More
reliable detection of X11 in Qt 5 might be needed.

File:

• src/qtwin.cpp (modified) (2 diffs)

src/qtwin.cpp

@@ -15 +15 @@
 #include <QPointer>
 
+//! \todo TODO: Detect X11 in Qt 5 more reliably
+// No Q_WS_X11 in Qt 5. Check if we're using X11 and define it.
+#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0)) && defined(Q_OS_UNIX) && !defined(Q_WS_X11)
+#   if !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN) && !defined(Q_WS_QPA)
+#       define Q_WS_X11
+#   endif
+#endif
+
 #ifdef Q_WS_X11
-#include <QX11Info>
+#include <X11/Xlib.h>
 #endif // Q_WS_X11
 
@@ -109 +117 @@
     return false;
 #elif defined(Q_WS_X11)
-    return QX11Info::isCompositingManagerRunning();
+    Display *d = XOpenDisplay(NULL);
+    Atom _NET_WM_CM_S0 = XInternAtom(d, "_NET_WM_CM_S0", true);
+    bool result = (_NET_WM_CM_S0 != None);
+    if (result)
+        result = (XGetSelectionOwner(d, _NET_WM_CM_S0) != None);
+    XCloseDisplay(d);
+    return result;
 #else
     //! \todo TODO: Check for trsnsparency support in other OSes.