FCL/sf/mw/qt: comparison src/gui/kernel/qapplication

equal deleted inserted replaced

-:41300fa6a67c
+:3b1da2848fc7
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
 }
 #endif
 void QSymbianControl::Draw(const TRect& controlRect) const
 {
+// Set flag to avoid calling DrawNow in window surface
+QWExtra *extra = qwidget->d_func()->extraData();
+if (extra && !extra->inExpose) {
+extra->inExpose = true;
+QRect exposeRect = qt_TRect2QRect(controlRect);
+qwidget->d_func()->syncBackingStore(exposeRect);
+extra->inExpose = false;
+}
 QWindowSurface *surface = qwidget->windowSurface();
 QPaintEngine *engine = surface ? surface->paintDevice()->paintEngine() : NULL;
 if (!engine)
 return;
 break;
 default:
 Q_ASSERT(false);
 }
-} else {
-surface->flush(qwidget, QRegion(qt_TRect2QRect(backingStoreRect)), QPoint());
 }
 if (sendNativePaintEvents) {
 const QRect r = qt_TRect2QRect(controlRect);
 // The draw ops aren't actually sent to WSERV until the graphics
 }
 }
 void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */)
 {
-if (m_ignoreFocusChanged)
+if (m_ignoreFocusChanged || (qwidget->windowType() & Qt::WindowType_Mask) == Qt::Desktop)
 return;
 // Popups never get focused, but still receive the FocusChanged when they are hidden.
 if (QApplicationPrivate::popupWidgets != 0
 || (qwidget->windowType() & Qt::Popup) == Qt::Popup)
 }
 if (qt_S60Beep)
 qt_S60Beep->Play();
 }
+static inline bool callSymbianEventFilters(const QSymbianEvent *event)
+{
+long unused;
+return qApp->filterEvent(const_cast<QSymbianEvent *>(event), &unused);
+}
 /*!
 \warning This function is only available on Symbian.
 \since 4.6
 This function processes an individual Symbian event
 {
 Q_D(QApplication);
 QScopedLoopLevelCounter counter(d->threadData);
+if (d->eventDispatcher->filterEvent(const_cast<QSymbianEvent *>(event)))
+return 1;
 QWidget *w = qApp ? qApp->focusWidget() : 0;
 if (w) {
 QInputContext *ic = w->inputContext();
 if (ic && ic->symbianFilterEvent(w, event))
 return 1;
 if (symbianEventFilter(event))
 return 1;
 switch (event->type()) {
 case QSymbianEvent::WindowServerEvent:
-return d->symbianProcessWsEvent(event->windowServerEvent());
+return d->symbianProcessWsEvent(event);
 case QSymbianEvent::CommandEvent:
-return d->symbianHandleCommand(event->command());
+return d->symbianHandleCommand(event);
 case QSymbianEvent::ResourceChangeEvent:
-return d->symbianResourceChange(event->resourceChangeType());
+return d->symbianResourceChange(event);
 default:
 return -1;
 }
 }
-int QApplicationPrivate::symbianProcessWsEvent(const TWsEvent *event)
+int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent)
 {
 // Qt event handling. Handle some events regardless of if the handle is in our
 // widget map or not.
+const TWsEvent *event = symbianEvent->windowServerEvent();
 CCoeControl* control = reinterpret_cast<CCoeControl*>(event->Handle());
 const bool controlInMap = QWidgetPrivate::mapper && QWidgetPrivate::mapper->contains(control);
 switch (event->Type()) {
 case EEventPointerEnter:
-if (controlInMap)
+if (controlInMap) {
+callSymbianEventFilters(symbianEvent);
 return 1; // Qt::Enter will be generated in HandlePointerL
+}
 break;
 case EEventPointerExit:
 if (controlInMap) {
+if (callSymbianEventFilters(symbianEvent))
+return 1;
 if (S60) {
 // mouseEvent outside our window, send leave event to last focused widget
 QMouseEvent mEvent(QEvent::Leave, S60->lastPointerEventPos, S60->lastCursorPos,
 Qt::NoButton, QApplicationPrivate::mouse_buttons, Qt::NoModifier);
 if (S60->lastPointerEventTarget)
 }
 return 1;
 }
 break;
 case EEventScreenDeviceChanged:
+if (callSymbianEventFilters(symbianEvent))
+return 1;
 if (S60)
 S60->updateScreenSize();
 if (qt_desktopWidget) {
 QSize oldSize = qt_desktopWidget->size();
 qt_desktopWidget->data->crect.setWidth(S60->screenWidthInPixels);
 QApplication::sendEvent(qt_desktopWidget, &e);
 }
 return 0; // Propagate to CONE
 case EEventWindowVisibilityChanged:
 if (controlInMap) {
+if (callSymbianEventFilters(symbianEvent))
+return 1;
 const TWsVisibilityChangedEvent *visChangedEvent = event->VisibilityChanged();
 QWidget *w = QWidgetPrivate::mapper->value(control);
 if (!w->d_func()->maybeTopData())
 break;
 if (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) {
 }
 return 1;
 }
 break;
 case EEventFocusGained:
+if (callSymbianEventFilters(symbianEvent))
+return 1;
 #ifndef QT_NO_CURSOR
 //re-enable mouse interaction
 if (S60->mouseInteractionEnabled) {
 #ifndef Q_SYMBIAN_FIXED_POINTER_CURSORS
 if (S60->brokenPointerCursors)
 S60->wsSession().SetPointerCursorMode(EPointerCursorNormal);
 }
 #endif
 break;
 case EEventFocusLost:
+if (callSymbianEventFilters(symbianEvent))
+return 1;
 #ifndef QT_NO_CURSOR
 //disable mouse as may be moving to application that does not support it
 if (S60->mouseInteractionEnabled) {
 #ifndef Q_SYMBIAN_FIXED_POINTER_CURSORS
 if (S60->brokenPointerCursors)
 partially achieved by deriving from CAknAppUi. Currently, exit,
 menu and softkey commands are handled.
 \sa s60EventFilter(), s60ProcessEvent()
 */
-int QApplicationPrivate::symbianHandleCommand(int command)
+int QApplicationPrivate::symbianHandleCommand(const QSymbianEvent *symbianEvent)
 {
 Q_Q(QApplication);
 int ret = 0;
+if (callSymbianEventFilters(symbianEvent))
+return 1;
+int command = symbianEvent->command();
 switch (command) {
 #ifdef Q_WS_S60
 case EAknSoftkeyExit: {
 QCloseEvent ev;
 Handles the resource change specified by \a type.
 Currently, KEikDynamicLayoutVariantSwitch and
 KAknsMessageSkinChange are handled.
 */
-int QApplicationPrivate::symbianResourceChange(int type)
+int QApplicationPrivate::symbianResourceChange(const QSymbianEvent *symbianEvent)
 {
 int ret = 0;
+int type = symbianEvent->resourceChangeType();
 switch (type) {
 #ifdef Q_WS_S60
 case KEikDynamicLayoutVariantSwitch:
 {
+if (callSymbianEventFilters(symbianEvent))
+return 1;
 if (S60)
 S60->updateScreenSize();
 #ifndef QT_NO_STYLE_S60
 QS60Style *s60Style = 0;
 }
 break;
 #ifndef QT_NO_STYLE_S60
 case KAknsMessageSkinChange:
+if (callSymbianEventFilters(symbianEvent))
+return 1;
 if (QS60Style *s60Style = qobject_cast<QS60Style*>(QApplication::style())) {
 s60Style->d_func()->handleSkinChange();
 ret = 1;
 }
 break;

branch	RCL_3
changeset 4	3b1da2848fc7
parent 3	41300fa6a67c
child 5	d3bac044e0f0