summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbcursor.cpp
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2012-06-22 01:30:39 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-22 17:38:59 +0200
commit9a16e146663210a4b7cdedc9b2a3dcd57cb1cbec (patch)
treebf8873552788154c96a398648ebaee53b8b192a9 /src/plugins/platforms/xcb/qxcbcursor.cpp
parent3506ee51b2c682ebcfb7921577743e1dbc8ec474 (diff)
Implement QXcbIntegration::queryKeyboardModifiers()
Change-Id: Ifd2255362f5ef005e2a57f4001a72d932497b453 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbcursor.cpp')
-rw-r--r--src/plugins/platforms/xcb/qxcbcursor.cpp8
1 files changed, 5 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);
}