xcb: Expose the systemtray functions through platformheaders

Change-Id: I3504141d8130bbfe3246d81b61c8cbb010e255d6
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

4 files changed, 69 insertions, 25 deletions

diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
index 5f322108a5..614390a8d8 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
@@ -109,22 +109,12 @@ bool QXcbNativeInterface::systemTrayAvailable(const QScreen *screen) const
 
 bool QXcbNativeInterface::requestSystemTrayWindowDock(const QWindow *window)
 {
-    const QPlatformWindow *platformWindow = window->handle();
-    if (!platformWindow)
-        return false;
-    QXcbSystemTrayTracker *trayTracker = systemTrayTracker(window->screen());
-    if (!trayTracker)
-        return false;
-    trayTracker->requestSystemTrayWindowDock(static_cast<const QXcbWindow *>(platformWindow)->xcb_window());
-    return true;
+    return QXcbWindow::requestSystemTrayWindowDockStatic(window);
 }
 
 QRect QXcbNativeInterface::systemTrayWindowGlobalGeometry(const QWindow *window)
 {
-    if (const QPlatformWindow *platformWindow = window->handle())
-        if (const QXcbSystemTrayTracker *trayTracker = systemTrayTracker(window->screen()))
-            return trayTracker->systemTrayWindowGlobalGeometry(static_cast<const QXcbWindow *>(platformWindow)->xcb_window());
-    return QRect();
+    return QXcbWindow::systemTrayWindowGlobalGeometryStatic(window);
 }
 
 xcb_window_t QXcbNativeInterface::locateSystemTray(xcb_connection_t *conn, const QXcbScreen *screen)
@@ -193,16 +183,9 @@ bool QXcbNativeInterface::systrayVisualHasAlphaChannel() {
     }
 }
 
-void QXcbNativeInterface::setParentRelativeBackPixmap(const QWindow *qwindow)
+void QXcbNativeInterface::setParentRelativeBackPixmap(QWindow *window)
 {
-    if (const QPlatformWindow *platformWindow = qwindow->handle()) {
-        const QXcbWindow *qxwindow = static_cast<const QXcbWindow *>(platformWindow);
-        xcb_connection_t *xcb_conn = qxwindow->xcb_connection();
-
-        const quint32 mask = XCB_CW_BACK_PIXMAP;
-        const quint32 values[] = { XCB_BACK_PIXMAP_PARENT_RELATIVE };
-        Q_XCB_CALL(xcb_change_window_attributes(xcb_conn, qxwindow->xcb_window(), mask, values));
-    }
+    QXcbWindow::setParentRelativeBackPixmapStatic(window);
 }
 
 void *QXcbNativeInterface::nativeResourceForIntegration(const QByteArray &resourceString)
@@ -378,9 +361,18 @@ QFunctionPointer QXcbNativeInterface::platformFunction(const QByteArray &functio
         return func;
 
     //case sensitive
-    if (function == QXcbWindowFunctions::setWmWindowTypeIdentifier()) {
-        return QFunctionPointer(QXcbWindow::setWmWindowTypeStatic);
-    }
+    if (function == QXcbWindowFunctions::setWmWindowTypeIdentifier())
+        return QFunctionPointer(QXcbWindowFunctions::SetWmWindowType(QXcbWindow::setWmWindowTypeStatic));
+
+    if (function == QXcbWindowFunctions::setParentRelativeBackPixmapIdentifier())
+        return QFunctionPointer(QXcbWindowFunctions::SetParentRelativeBackPixmap(QXcbWindow::setParentRelativeBackPixmapStatic));
+
+    if (function == QXcbWindowFunctions::requestSystemTrayWindowDockIdentifier())
+        return QFunctionPointer(QXcbWindowFunctions::RequestSystemTrayWindowDock(QXcbWindow::requestSystemTrayWindowDockStatic));
+
+    if (function == QXcbWindowFunctions::systemTrayWindowGlobalGeometryIdentifier())
+        return QFunctionPointer(QXcbWindowFunctions::SystemTrayWindowGlobalGeometry(QXcbWindow::systemTrayWindowGlobalGeometryStatic));
+
     return Q_NULLPTR;
 }
 
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h
index 64da388258..bf7058f8e3 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.h
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h
@@ -104,7 +104,7 @@ public:
 
     Q_INVOKABLE void beep();
     Q_INVOKABLE bool systemTrayAvailable(const QScreen *screen) const;
-    Q_INVOKABLE void setParentRelativeBackPixmap(const QWindow *window);
+    Q_INVOKABLE void setParentRelativeBackPixmap(QWindow *window);
     Q_INVOKABLE bool systrayVisualHasAlphaChannel();
     Q_INVOKABLE bool requestSystemTrayWindowDock(const QWindow *window);
     Q_INVOKABLE QRect systemTrayWindowGlobalGeometry(const QWindow *window);
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 34289fb90e..1d8ba69e55 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -46,6 +46,7 @@
 #include "qxcbwmsupport.h"
 #include "qxcbimage.h"
 #include "qxcbnativeinterface.h"
+#include "qxcbsystemtraytracker.h"
 
 #include <qpa/qplatformintegration.h>
 
@@ -1664,6 +1665,48 @@ void QXcbWindow::setWmWindowType(QXcbWindowFunctions::WmWindowTypes types)
     xcb_flush(xcb_connection());
 }
 
+void QXcbWindow::setParentRelativeBackPixmapStatic(QWindow *window)
+{
+    if (window->handle())
+        static_cast<QXcbWindow *>(window->handle())->setParentRelativeBackPixmap();
+}
+
+void QXcbWindow::setParentRelativeBackPixmap()
+{
+    const quint32 mask = XCB_CW_BACK_PIXMAP;
+    const quint32 values[] = { XCB_BACK_PIXMAP_PARENT_RELATIVE };
+    Q_XCB_CALL(xcb_change_window_attributes(xcb_connection(), m_window, mask, values));
+}
+
+bool QXcbWindow::requestSystemTrayWindowDockStatic(const QWindow *window)
+{
+    if (window->handle())
+        return static_cast<QXcbWindow *>(window->handle())->requestSystemTrayWindowDock();
+    return false;
+}
+
+bool QXcbWindow::requestSystemTrayWindowDock() const
+{
+    if (!connection()->systemTrayTracker())
+        return false;
+    connection()->systemTrayTracker()->requestSystemTrayWindowDock(m_window);
+    return true;
+}
+
+QRect QXcbWindow::systemTrayWindowGlobalGeometryStatic(const QWindow *window)
+{
+    if (window->handle())
+        return static_cast<QXcbWindow *>(window->handle())->systemTrayWindowGlobalGeometry();
+    return QRect();
+}
+
+QRect QXcbWindow::systemTrayWindowGlobalGeometry() const
+{
+   if (!connection()->systemTrayTracker())
+       return QRect();
+   return connection()->systemTrayTracker()->systemTrayWindowGlobalGeometry(m_window);
+}
+
 class ExposeCompressor
 {
 public:
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index 8f78be573c..20c7d5a7b2 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -142,6 +142,15 @@ public:
     QXcbWindowFunctions::WmWindowTypes wmWindowTypes() const;
     void setWmWindowType(QXcbWindowFunctions::WmWindowTypes types);
 
+    static void setParentRelativeBackPixmapStatic(QWindow *window);
+    void setParentRelativeBackPixmap();
+
+    static bool requestSystemTrayWindowDockStatic(const QWindow *window);
+    bool requestSystemTrayWindowDock() const;
+
+    static QRect systemTrayWindowGlobalGeometryStatic(const QWindow *window);
+    QRect systemTrayWindowGlobalGeometry() const;
+
     bool needsSync() const;
 
     void postSyncWindowRequest();