1 files changed, 21 insertions, 46 deletions

diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index 6089265304..4c6177835a 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -56,6 +56,8 @@
 #include <QtCore/QLoggingCategory>
 #include <QtCore/private/qglobal_p.h>
 
+#include <memory>
+
 // This is needed to make Qt compile together with XKB. xkb.h is using a variable
 // which is called 'explicit', this is a reserved keyword in c++
 #if QT_CONFIG(xkb)
@@ -81,8 +83,6 @@ struct XInput2TouchDeviceData;
 
 struct xcb_randr_get_output_info_reply_t;
 
-//#define Q_XCB_DEBUG
-
 QT_BEGIN_NAMESPACE
 
 Q_DECLARE_LOGGING_CATEGORY(lcQpaXInput)
@@ -467,6 +467,7 @@ public:
     bool hasXRandr() const { return has_randr_extension; }
     bool hasInputShape() const { return has_input_shape; }
     bool hasXKB() const { return has_xkb; }
+    bool hasXRender() const { return has_render_extension; }
 
     bool supportsThreadedRendering() const { return m_reader->isRunning(); }
     bool threadedEventHandling() const { return m_reader->isRunning(); }
@@ -475,8 +476,8 @@ public:
     xcb_window_t getSelectionOwner(xcb_atom_t atom) const;
     xcb_window_t getQtSelectionOwner();
 
-    void setButton(Qt::MouseButton button, bool down) { m_buttons.setFlag(button, down); }
-    Qt::MouseButtons buttons() const { return m_buttons; }
+    void setButtonState(Qt::MouseButton button, bool down) { m_buttonState.setFlag(button, down); }
+    Qt::MouseButtons buttonState() const { return m_buttonState; }
     Qt::MouseButton translateMouseButton(xcb_button_t s);
 
     QXcbWindow *focusWindow() const { return m_focusWindow; }
@@ -647,23 +648,6 @@ private:
     } m_startSystemResizeInfo;
 #endif
 #endif
-#ifdef Q_XCB_DEBUG
-    struct CallInfo {
-        int sequence;
-        QByteArray file;
-        int line;
-    };
-    QVector<CallInfo> m_callLog;
-    QMutex m_callLogMutex;
-    void log(const char *file, int line, int sequence);
-    template <typename cookie_t>
-    friend cookie_t q_xcb_call_template(const cookie_t &cookie, QXcbConnection *connection,
-                                        const char *file, int line);
-    template <typename reply_t>
-    friend reply_t *q_xcb_call_template(reply_t *reply, QXcbConnection *connection,
-                                        const char *file, int line);
-#endif
-
     WindowMapper m_mapper;
 
     QVector<PeekFunc> m_peekFuncs;
@@ -677,8 +661,9 @@ private:
     bool has_randr_extension = false;
     bool has_input_shape;
     bool has_xkb = false;
+    bool has_render_extension;
 
-    Qt::MouseButtons m_buttons = 0;
+    Qt::MouseButtons m_buttonState = 0;
 
     QXcbWindow *m_focusWindow = nullptr;
     QXcbWindow *m_mouseGrabber = nullptr;
@@ -731,6 +716,20 @@ private:
     QXcbConnection *m_connection;
 };
 
+#define Q_XCB_REPLY_CONNECTION_ARG(connection, ...) connection
+
+#define Q_XCB_REPLY(call, ...) \
+    std::unique_ptr<call##_reply_t, decltype(std::free) *>( \
+        call##_reply(Q_XCB_REPLY_CONNECTION_ARG(__VA_ARGS__), call(__VA_ARGS__), nullptr), \
+        std::free \
+    )
+
+#define Q_XCB_REPLY_UNCHECKED(call, ...) \
+    std::unique_ptr<call##_reply_t, decltype(std::free) *>( \
+        call##_reply(Q_XCB_REPLY_CONNECTION_ARG(__VA_ARGS__), call##_unchecked(__VA_ARGS__), nullptr), \
+        std::free \
+    )
+
 template <typename T>
 union q_padded_xcb_event {
   T event;
@@ -744,30 +743,6 @@ union q_padded_xcb_event {
     q_padded_xcb_event<event_type> store = {}; \
     auto &event_var = store.event;
 
-#ifdef Q_XCB_DEBUG
-template <typename cookie_t>
-cookie_t q_xcb_call_template(const cookie_t &cookie, QXcbConnection *connection, const char *file,
-                             int line)
-{
-    connection->log(file, line, cookie.sequence);
-    return cookie;
-}
-
-template <typename reply_t>
-reply_t *q_xcb_call_template(reply_t *reply, QXcbConnection *connection, const char *file, int line)
-{
-    connection->log(file, line, reply->sequence);
-    return reply;
-}
-#define Q_XCB_CALL(x) q_xcb_call_template(x, connection(), __FILE__, __LINE__)
-#define Q_XCB_CALL2(x, connection) q_xcb_call_template(x, connection, __FILE__, __LINE__)
-#define Q_XCB_NOOP(c) q_xcb_call_template(xcb_no_operation(c->xcb_connection()), c, __FILE__, __LINE__);
-#else
-#define Q_XCB_CALL(x) x
-#define Q_XCB_CALL2(x, connection) x
-#define Q_XCB_NOOP(c) (void)c;
-#endif
-
 QT_END_NAMESPACE
 
 #endif