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

Make xcb work again after event dispatcher changes.

Browse Source 
The platform plugin/event dispatcher creation order
has now been reversed and the event dispatcher
cannot be accessed during plugin construciton.
This commit is contained in:
Morten Johan Sorvig 2011-06-22 11:33:17 +02:00
parent 407a6fe798
commit f1975cfc53
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/kernel/qguiapplication.cpp
View File

@ -287,7 +287,6 @@ void QGuiApplicationPrivate::createEventDispatcher()
void QGuiApplicationPrivate::init()
{
qDebug() << "QGuiApplicationPrivate::init";
QList<QByteArray> pluginList;
// Get command line params

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

@ -138,14 +138,6 @@ QXcbConnection::QXcbConnection(const char *displayName)
#ifdef XCB_USE_DRI2
initializeDri2();
#endif
QSocketNotifier *notifier = new QSocketNotifier(xcb_get_file_descriptor(xcb_connection()), QSocketNotifier::Read, this);
connect(notifier, SIGNAL(activated(int)), this, SLOT(processXcbEvents()));
QAbstractEventDispatcher *dispatcher = QAbstractEventDispatcher::instance(qApp->thread());
connect(dispatcher, SIGNAL(aboutToBlock()), this, SLOT(processXcbEvents()));
connect(dispatcher, SIGNAL(awake()), this, SLOT(processXcbEvents()));
sync();
}
@ -164,6 +156,15 @@ QXcbConnection::~QXcbConnection()
delete m_keyboard;
}
void QXcbConnection::setEventDispatcher(QAbstractEventDispatcher *dispatcher)
{
QSocketNotifier *notifier = new QSocketNotifier(xcb_get_file_descriptor(xcb_connection()), QSocketNotifier::Read, this);
connect(notifier, SIGNAL(activated(int)), this, SLOT(processXcbEvents()));
connect(dispatcher, SIGNAL(aboutToBlock()), this, SLOT(processXcbEvents()));
connect(dispatcher, SIGNAL(awake()), this, SLOT(processXcbEvents()));
}
void QXcbConnection::addWindow(xcb_window_t id, QXcbWindow *window)
{
m_mapper.insert(id, window);

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

@ -222,6 +222,7 @@ namespace QXcbAtom {
};
}
class QAbstractEventDispatcher;
class QXcbConnection : public QObject
{
Q_OBJECT
@ -231,6 +232,8 @@ public:
QXcbConnection *connection() const { return const_cast<QXcbConnection *>(this); }
void setEventDispatcher(QAbstractEventDispatcher *eventDispatcher);
const QList<QXcbScreen *> &screens() const { return m_screens; }
int primaryScreen() const { return m_primaryScreen; }

4
src/plugins/platforms/xcb/qxcbintegration.cpp
View File

@ -139,7 +139,9 @@ QPlatformBackingStore *QXcbIntegration::createPlatformBackingStore(QWindow *wind
QAbstractEventDispatcher *QXcbIntegration::createEventDispatcher() const
{
return createUnixEventDispatcher();
QAbstractEventDispatcher *eventDispatcher = createUnixEventDispatcher();
m_connection->setEventDispatcher(eventDispatcher);
return eventDispatcher;
}
QList<QPlatformScreen *> QXcbIntegration::screens() const