AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add QXcbConnectionGrabber class

Browse Source 
Inspired by QMutexLocker

Change-Id: I66e31091d2a006db3272b627567d95d3e0b1c4f9
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
This commit is contained in:
Jørgen Lind 2013-05-14 08:17:13 +02:00 committed by The Qt Project
parent 0f31a5d91f
commit 3d43d178e6
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -1720,4 +1720,24 @@ bool QXcbConnection::xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *event, int o
}
#endif // defined(XCB_USE_XINPUT2) || defined(XCB_USE_XINPUT2_MAEMO)
QXcbConnectionGrabber::QXcbConnectionGrabber(QXcbConnection *connection)
:m_connection(connection)
{
connection->grabServer();
}
QXcbConnectionGrabber::~QXcbConnectionGrabber()
{
if (m_connection)
m_connection->ungrabServer();
}
void QXcbConnectionGrabber::release()
{
if (m_connection) {
m_connection->ungrabServer();
m_connection = 0;
}
}
QT_END_NAMESPACE

9
src/plugins/platforms/xcb/qxcbconnection.h
View File

@ -585,6 +585,15 @@ xcb_generic_event_t *QXcbConnection::checkEvent(T &checker)
return 0;
}
class QXcbConnectionGrabber
{
public:
QXcbConnectionGrabber(QXcbConnection *connection);
~QXcbConnectionGrabber();
void release();
private:
QXcbConnection *m_connection;
};
#ifdef Q_XCB_DEBUG
template <typename cookie_t>

3
src/plugins/platforms/xcb/qxcbdrag.cpp
View File

@ -1141,7 +1141,7 @@ bool QXcbDrag::dndEnable(QXcbWindow *w, bool on)
if (desktop_proxy) // *WE* already have one.
return false;
connection()->grabServer();
QXcbConnectionGrabber grabber(connection());
// As per Xdnd4, use XdndProxy
xcb_window_t proxy_id = xdndProxy(connection(), w->xcb_window());
@ -1157,7 +1157,6 @@ bool QXcbDrag::dndEnable(QXcbWindow *w, bool on)
XCB_ATOM_WINDOW, 32, 1, &proxy_id);
}
connection()->ungrabServer();
} else {
xdnd_widget = w;
}