diff options
| author | Uli Schlachter <psychon@znc.in> | 2012-11-01 18:40:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-02 18:07:35 +0100 |
| commit | 0b1ce5db9e04b4c28713e87306fcea020c3e428b (patch) | |
| tree | befc8c1e1417bd1f744a47583e2836afa18beb21 /src | |
| parent | 92d75077d686fcad26b5ad02a40c3987fb1fc82b (diff) | |
XCB: Handle connection errors
When the XCB connection breaks, all following XCB function calls will fail and
function calls that are currently in progress will return. This means that
xcb_wait_for_event() will return NULL and thus the QXcbEventReader thread will
exit.
This patch uses the above behavior to make sure that processXcbEvents() will be
called. The error handling should always be done before normal event processing,
because all XCB calls will fail once the connection is in an error state. This
is especially unexpected for xcb_get_setup() which suddenly returns a NULL
pointer.
Task-number: QTBUG-27686
Change-Id: Ie3e4058f9d92bcbfc45934a8b36d9a7254e2b4bb
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 85f6fc9213..e35954caf9 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -283,6 +283,7 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, const char m_reader = new QXcbEventReader(this); #ifdef XCB_POLL_FOR_QUEUED_EVENT connect(m_reader, SIGNAL(eventPending()), this, SLOT(processXcbEvents()), Qt::QueuedConnection); + connect(m_reader, SIGNAL(finished()), this, SLOT(processXcbEvents())); m_reader->start(); #else QSocketNotifier *notifier = new QSocketNotifier(xcb_get_file_descriptor(xcb_connection()), QSocketNotifier::Read, this); @@ -919,6 +920,12 @@ xcb_timestamp_t QXcbConnection::getTimestamp() void QXcbConnection::processXcbEvents() { + int connection_error = xcb_connection_has_error(xcb_connection()); + if (connection_error) { + qWarning("The X11 connection broke (error %d). Did the X11 server die?", connection_error); + exit(1); + } + QXcbEventArray *eventqueue = m_reader->lock(); for(int i = 0; i < eventqueue->size(); ++i) { |