void QQnxBpsEventFilter::registerForScreenEvents(QQnxScreen *screen)
{
+ if (!m_screenEventHandler) {
+ qWarning("QQNX: trying to register for screen events, but no handler provided.");
+ return;
+ }
+
if (screen_request_events(screen->nativeContext()) != BPS_SUCCESS)
qWarning("QQNX: failed to register for screen events on screen %p", screen->nativeContext());
}
void QQnxBpsEventFilter::unregisterForScreenEvents(QQnxScreen *screen)
{
+ if (!m_screenEventHandler) {
+ qWarning("QQNX: trying to unregister for screen events, but no handler provided.");
+ return;
+ }
+
if (screen_stop_events(screen->nativeContext()) != BPS_SUCCESS)
qWarning("QQNX: failed to unregister for screen events on screen %p", screen->nativeContext());
}
qBpsEventFilterDebug() << Q_FUNC_INFO << "event=" << event << "domain=" << eventDomain;
if (eventDomain == screen_get_domain()) {
+ if (!m_screenEventHandler) {
+ qWarning("QQNX: registered for screen events, but no handler provided.");
+ return false;
+ }
+
screen_event_t screenEvent = screen_event_get_event(event);
return m_screenEventHandler->handleEvent(screenEvent);
}
#endif
// Create/start event thread
- // Not on BlackBerry, it has specialised event dispatcher which also handles screen events
-#if !defined(Q_OS_BLACKBERRY)
+#if defined(QQNX_SCREENEVENTTHREAD)
m_screenEventThread = new QQnxScreenEventThread(m_screenContext, m_screenEventHandler);
m_screenEventThread->start();
#endif
#if defined(Q_OS_BLACKBERRY)
QQnxVirtualKeyboardBps* virtualKeyboardBps = new QQnxVirtualKeyboardBps;
- m_bpsEventFilter = new QQnxBpsEventFilter(m_navigatorEventHandler, m_screenEventHandler, virtualKeyboardBps);
+ m_bpsEventFilter = new QQnxBpsEventFilter(m_navigatorEventHandler,
+ (m_screenEventThread ? 0 : m_screenEventHandler), virtualKeyboardBps);
m_bpsEventFilter->installOnEventDispatcher(m_eventDispatcher);
m_virtualKeyboard = virtualKeyboardBps;
// create the displays first.
createDisplays();
-#if defined(Q_OS_BLACKBERRY)
+#if !defined(QQNX_SCREENEVENTTHREAD) && defined(Q_OS_BLACKBERRY)
// Register for screen domain events with bps
Q_FOREACH (QQnxScreen *screen, m_screens)
m_bpsEventFilter->registerForScreenEvents(screen);
#endif
delete m_navigatorEventHandler;
-#if !defined(Q_OS_BLACKBERRY)
+#if defined(QQNX_SCREENEVENTTHREAD)
// Stop/destroy screen event thread
delete m_screenEventThread;
-#else
+#elif defined(Q_OS_BLACKBERRY)
Q_FOREACH (QQnxScreen *screen, m_screens)
m_bpsEventFilter->unregisterForScreenEvents(screen);
+#endif
+#if defined(Q_OS_BLACKBERRY)
delete m_bpsEventFilter;
#endif