summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2011-09-19 00:11:24 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-21 16:54:45 +0200
commit405894fc39cdab937c38b917adf4e8d390f80790 (patch)
tree797a134165df57f998be73132cd614c0c0d234cb /src/plugins
parentacd09c21f7e3f261b584eaf9136966439eaf3a8b (diff)
[directfb] Make QDirectFBInput a QThread to allow proper exits
Without this patch the application will get stuck waiting for the IDFBEventBuffer to report an event. We will use the IDFBEventBuffer::WakeUp function to interrupt the waiting but this produces the below error on exit: QEventLoop: Cannot be used without QApplication QThread: Destroyed while thread is still running This is solved by making the QDirectFBInput a QThread, reimplement the run() method to handle the events. It should work as this is only posting events to the QApplication event loop. Change-Id: I24adf2b080f96c72ede6a5499f484ac33fdd44fc Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/directfb/qdirectfbinput.cpp22
-rw-r--r--src/plugins/platforms/directfb/qdirectfbinput.h16
-rw-r--r--src/plugins/platforms/directfb/qdirectfbintegration.cpp9
3 files changed, 18 insertions, 29 deletions
diff --git a/src/plugins/platforms/directfb/qdirectfbinput.cpp b/src/plugins/platforms/directfb/qdirectfbinput.cpp
index d05729b992..bedd3b8356 100644
--- a/src/plugins/platforms/directfb/qdirectfbinput.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbinput.cpp
@@ -50,35 +50,29 @@
#include <directfb.h>
-QDirectFbInput::QDirectFbInput(QObject *parent)
- : QObject(parent), m_shouldStop(false)
+QDirectFbInput::QDirectFbInput()
+ : m_dfbInterface(QDirectFbConvenience::dfbInterface())
+ , m_shouldStop(false)
{
- m_dfbInterface = QDirectFbConvenience::dfbInterface();
-
DFBResult ok = m_dfbInterface->CreateEventBuffer(m_dfbInterface,&m_eventBuffer);
if (ok != DFB_OK)
DirectFBError("Failed to initialise eventbuffer", ok);
m_dfbInterface->GetDisplayLayer(m_dfbInterface,DLID_PRIMARY, &m_dfbDisplayLayer);
-
}
-void QDirectFbInput::runInputEventLoop()
+void QDirectFbInput::run()
{
- while (true) {
- m_eventBuffer->WaitForEvent(m_eventBuffer);
- if (m_shouldStop) {
- m_waitStop.release();
- break;
- }
- handleEvents();
+ while (!m_shouldStop) {
+ if (m_eventBuffer->WaitForEvent(m_eventBuffer) == DFB_OK)
+ handleEvents();
}
}
void QDirectFbInput::stopInputEventLoop()
{
m_shouldStop = true;
- m_waitStop.acquire();
+ m_eventBuffer->WakeUp(m_eventBuffer);
}
void QDirectFbInput::addWindow(DFBWindowID id, QWindow *qt_window)
diff --git a/src/plugins/platforms/directfb/qdirectfbinput.h b/src/plugins/platforms/directfb/qdirectfbinput.h
index 29300698c3..4165487840 100644
--- a/src/plugins/platforms/directfb/qdirectfbinput.h
+++ b/src/plugins/platforms/directfb/qdirectfbinput.h
@@ -42,8 +42,7 @@
#ifndef QDIRECTFBINPUT_H
#define QDIRECTFBINPUT_H
-#include <QSemaphore>
-#include <QObject>
+#include <QThread>
#include <QHash>
#include <QPoint>
#include <QEvent>
@@ -52,20 +51,21 @@
#include <directfb.h>
-class QDirectFbInput : public QObject
+class QDirectFbInput : public QThread
{
Q_OBJECT
public:
- QDirectFbInput(QObject *parent);
+ QDirectFbInput();
void addWindow(DFBWindowID id, QWindow *window);
void removeWindow(WId wId);
-public slots:
- void runInputEventLoop();
void stopInputEventLoop();
- void handleEvents();
+
+protected:
+ void run();
private:
+ void handleEvents();
void handleMouseEvents(const DFBEvent &event);
void handleWheelEvent(const DFBEvent &event);
void handleKeyEvents(const DFBEvent &event);
@@ -78,8 +78,6 @@ private:
IDirectFBEventBuffer *m_eventBuffer; // XXX: TODO: FIXME: leaked!!! (but it is a singleton)
bool m_shouldStop;
- QSemaphore m_waitStop;
-
QHash<DFBWindowID,QWindow *>m_tlwMap;
};
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 96ba391a38..cc667f4666 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -106,17 +106,14 @@ QDirectFbIntegration::QDirectFbIntegration()
QDirectFbScreen *primaryScreen = new QDirectFbScreen(0);
screenAdded(primaryScreen);
- m_inputRunner.reset(new QThread);
- m_input.reset(new QDirectFbInput(0));
- m_input->moveToThread(m_inputRunner.data());
- QObject::connect(m_inputRunner.data(), SIGNAL(started()),
- m_input.data(), SLOT(runInputEventLoop()));
- m_inputRunner->start();
+ m_input.reset(new QDirectFbInput());
+ m_input->start();
}
QDirectFbIntegration::~QDirectFbIntegration()
{
m_input->stopInputEventLoop();
+ m_input->wait();
}
QPlatformPixmap *QDirectFbIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const