Implement QXcbIntegration::queryKeyboardModifiers()

Change-Id: Ifd2255362f5ef005e2a57f4001a72d932497b453
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

4 files changed, 19 insertions, 3 deletions

diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index 0f69221f4c..fefca06da7 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -506,7 +506,7 @@ xcb_cursor_t QXcbCursor::createBitmapCursor(QCursor *cursor)
     return c;
 }
 
-static void getPosAndRoot(xcb_connection_t *conn, xcb_window_t *rootWin, QPoint *pos)
+void QXcbCursor::queryPointer(xcb_connection_t *conn, xcb_window_t *rootWin, QPoint *pos, int *keybMask)
 {
     if (pos)
         *pos = QPoint();
@@ -521,6 +521,8 @@ static void getPosAndRoot(xcb_connection_t *conn, xcb_window_t *rootWin, QPoint
                 *pos = QPoint(reply->root_x, reply->root_y);
             if (rootWin)
                 *rootWin = root;
+            if (keybMask)
+                *keybMask = reply->mask;
             free(reply);
             return;
         }
@@ -533,7 +535,7 @@ static void getPosAndRoot(xcb_connection_t *conn, xcb_window_t *rootWin, QPoint
 QPoint QXcbCursor::pos() const
 {
     QPoint p;
-    getPosAndRoot(xcb_connection(), 0, &p);
+    queryPointer(xcb_connection(), 0, &p);
     return p;
 }
 
@@ -541,7 +543,7 @@ void QXcbCursor::setPos(const QPoint &pos)
 {
     xcb_connection_t *conn = xcb_connection();
     xcb_window_t root;
-    getPosAndRoot(conn, &root, 0);
+    queryPointer(conn, &root, 0);
     xcb_warp_pointer(conn, XCB_NONE, root, 0, 0, 0, 0, pos.x(), pos.y());
     xcb_flush(conn);
 }
diff --git a/src/plugins/platforms/xcb/qxcbcursor.h b/src/plugins/platforms/xcb/qxcbcursor.h
index 80fb88b39d..5904c7e07a 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.h
+++ b/src/plugins/platforms/xcb/qxcbcursor.h
@@ -56,6 +56,8 @@ public:
     QPoint pos() const;
     void setPos(const QPoint &pos);
 
+    static void queryPointer(xcb_connection_t *conn, xcb_window_t *rootWin, QPoint *pos, int *keybMask = 0);
+
 private:
     xcb_cursor_t createFontCursor(int cshape);
     xcb_cursor_t createBitmapCursor(QCursor *cursor);
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 9fbf21abc2..c40ebe47bc 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -43,6 +43,8 @@
 #include "qxcbconnection.h"
 #include "qxcbscreen.h"
 #include "qxcbwindow.h"
+#include "qxcbcursor.h"
+#include "qxcbkeyboard.h"
 #include "qxcbbackingstore.h"
 #include "qxcbnativeinterface.h"
 #include "qxcbclipboard.h"
@@ -257,6 +259,14 @@ QPlatformServices *QXcbIntegration::services() const
     return m_services.data();
 }
 
+Qt::KeyboardModifiers QXcbIntegration::queryKeyboardModifiers() const
+{
+    int keybMask = 0;
+    QXcbConnection* conn = m_connections.at(0);
+    QXcbCursor::queryPointer(conn->xcb_connection(), 0, 0, &keybMask);
+    return conn->keyboard()->translateModifiers(keybMask);
+}
+
 QStringList QXcbIntegration::themeNames() const
 {
     return QGenericUnixTheme::themeNames();
diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h
index 1eeaa6e914..691d4ccf1f 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.h
+++ b/src/plugins/platforms/xcb/qxcbintegration.h
@@ -87,6 +87,8 @@ public:
 
     QPlatformServices *services() const;
 
+    Qt::KeyboardModifiers queryKeyboardModifiers() const;
+
     QStringList themeNames() const;
     QPlatformTheme *createPlatformTheme(const QString &name) const;