From 9a16e146663210a4b7cdedc9b2a3dcd57cb1cbec Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 22 Jun 2012 01:30:39 +0200 Subject: Implement QXcbIntegration::queryKeyboardModifiers() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifd2255362f5ef005e2a57f4001a72d932497b453 Reviewed-by: Samuel Rødal --- src/plugins/platforms/xcb/qxcbcursor.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/xcb/qxcbcursor.cpp') 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); } -- cgit v1.2.3