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

equal deleted inserted replaced

-:41300fa6a67c
+:f7bc934e204c
 /****************************************************************************
 **
-** 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.
 **
 #include "qt_s60_p.h"
 #include "private/qevent_p.h"
 #include "qstring.h"
 #include "qdebug.h"
 #include "qimage.h"
+#include "qcombobox.h"
 #include "private/qkeymapper_p.h"
 #include "private/qfont_p.h"
 #ifndef QT_NO_STYLE_S60
 #include "private/qs60style_p.h"
 #endif
 # if !defined(QT_NO_IM)
 #  include "qinputcontext.h"
 #  include <private/qcoefepinputcontext_p.h>
 # endif
 # include <private/qs60mainapplication_p.h>
+# include <centralrepository.h>
 #endif
 #include "private/qstylesheetstyle_p.h"
 #include <hal.h>
 */
 TUint s60Keysym = QApplicationPrivate::resolveS60ScanCode(keyEvent.iScanCode,
 keyEvent.iCode);
 int keyCode;
-if (s60Keysym >= 0x20 && s60Keysym < ENonCharacterKeyBase) {
+if (s60Keysym == EKeyNull){ //some key events have 0 in iCode, for them iScanCode should be used
+keyCode = qt_keymapper_private()->mapS60ScanCodesToQt(keyEvent.iScanCode);
+} else if (s60Keysym >= 0x20 && s60Keysym < ENonCharacterKeyBase) {
 // Normal characters keys.
 keyCode = s60Keysym;
 } else {
 // Special S60 keys.
 keyCode = qt_keymapper_private()->mapS60KeyToQt(s60Keysym);
 }
 #endif
 void QSymbianControl::Draw(const TRect& controlRect) const
 {
+// Set flag to avoid calling DrawNow in window surface
+QWidget *window = qwidget->window();
+Q_ASSERT(window);
+QTLWExtra *topExtra = window->d_func()->maybeTopData();
+Q_ASSERT(topExtra);
+if (!topExtra->inExpose) {
+topExtra->inExpose = true;
+QRect exposeRect = qt_TRect2QRect(controlRect);
+qwidget->d_func()->syncBackingStore(exposeRect);
+topExtra->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
 if (oldPos != newPos) {
 QRect cr = qwidget->geometry();
 cr.moveTopLeft(newPos);
 qwidget->data->crect = cr;
 QTLWExtra *top = qwidget->d_func()->maybeTopData();
-if (top)
+if (top && (qwidget->windowState() & (~Qt::WindowActive)) == Qt::WindowNoState)
-top->normalGeometry = cr;
+top->normalGeometry.moveTopLeft(newPos);
 if (qwidget->isVisible()) {
 QMoveEvent e(newPos, oldPos);
 qt_sendSpontaneousEvent(qwidget, &e);
 } else {
 QMoveEvent * e = new QMoveEvent(newPos, oldPos);
 }
 }
 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)
 QApplication::setActiveWindow(qwidget->window());
 qwidget->d_func()->setWindowIcon_sys(true);
 qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle());
 #ifdef Q_WS_S60
-// If widget is fullscreen, hide status pane and button container
+// If widget is fullscreen/minimized, hide status pane and button container otherwise show them.
-// otherwise show them.
+CEikStatusPane *statusPane = S60->statusPane();
-CEikStatusPane* statusPane = S60->statusPane();
+CEikButtonGroupContainer *buttonGroup = S60->buttonGroupContainer();
-CEikButtonGroupContainer* buttonGroup = S60->buttonGroupContainer();
+TBool visible = !(qwidget->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
-bool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen;
+if (statusPane)
-if (statusPane && (bool)statusPane->IsVisible() == isFullscreen)
+statusPane->MakeVisible(visible);
-statusPane->MakeVisible(!isFullscreen);
+if (buttonGroup) {
-if (buttonGroup && (bool)buttonGroup->IsVisible() == isFullscreen)
+// Visibility
-buttonGroup->MakeVisible(!isFullscreen);
+const TBool isFullscreen = qwidget->windowState() & Qt::WindowFullScreen;
+const TBool cbaVisibilityHint = qwidget->windowFlags() & Qt::WindowSoftkeysVisibleHint;
+buttonGroup->MakeVisible(visible || (isFullscreen && cbaVisibilityHint));
+// Responsiviness
+CEikCba *cba = static_cast<CEikCba *>( buttonGroup->ButtonGroup() ); // downcast from MEikButtonGroup
+TUint cbaFlags = cba->ButtonGroupFlags();
+if(qwidget->windowFlags() & Qt::WindowSoftkeysRespondHint)
+cbaFlags |= EAknCBAFlagRespondWhenInvisible;
+else
+cbaFlags &= ~EAknCBAFlagRespondWhenInvisible;
+cba->SetButtonGroupFlags(cbaFlags);
+}
 #endif
 } else if (QApplication::activeWindow() == qwidget->window()) {
 if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog()) {
 QWidget *fw = QApplication::focusWidget();
 if (fw) {
 QApplication::setActiveWindow(0);
 }
 // else { We don't touch the active window unless we were explicitly activated or deactivated }
 }
+void QSymbianControl::handleClientAreaChange()
+{
+const bool cbaVisibilityHint = qwidget->windowFlags() & Qt::WindowSoftkeysVisibleHint;
+if (qwidget->isFullScreen() && !cbaVisibilityHint) {
+SetExtentToWholeScreen();
+} else if (qwidget->isMaximized() || (qwidget->isFullScreen() && cbaVisibilityHint)) {
+TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
+SetExtent(r.iTl, r.Size());
+} else if (!qwidget->isMinimized()) { // Normal geometry
+if (!qwidget->testAttribute(Qt::WA_Resized)) {
+qwidget->adjustSize();
+qwidget->setAttribute(Qt::WA_Resized, false); //not a user resize
+}
+if (!qwidget->testAttribute(Qt::WA_Moved) && qwidget->windowType() != Qt::Dialog) {
+TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
+SetPosition(r.iTl);
+qwidget->setAttribute(Qt::WA_Moved, false); // not really an explicit position
+}
+}
+}
 void QSymbianControl::HandleResourceChange(int resourceType)
 {
 switch (resourceType) {
 case KInternalStatusPaneChange:
-if (qwidget->isFullScreen()) {
+handleClientAreaChange();
-SetExtentToWholeScreen();
-} else if (qwidget->isMaximized()) {
-TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
-SetExtent(r.iTl, r.Size());
-}
 if (IsFocused() && IsVisible()) {
 qwidget->d_func()->setWindowIcon_sys(true);
 qwidget->d_func()->setWindowTitle_sys(qwidget->windowTitle());
 }
 break;
 // font change event
 break;
 #ifdef Q_WS_S60
 case KEikDynamicLayoutVariantSwitch:
 {
-if (qwidget->isFullScreen()) {
+handleClientAreaChange();
-SetExtentToWholeScreen();
-} else if (qwidget->isMaximized()) {
-TRect r = static_cast<CEikAppUi*>(S60->appUi())->ClientRect();
-SetExtent(r.iTl, r.Size());
-}
 break;
 }
 #endif
 default:
 break;
 #ifdef QT_NO_DEBUG
 if (!qgetenv("QT_S60_AUTO_FLUSH_WSERV").isEmpty())
 #endif
 S60->wsSession().SetAutoFlush(ETrue);
+#ifdef Q_SYMBIAN_WINDOW_SIZE_CACHE
+TRAP_IGNORE(S60->wsSession().EnableWindowSizeCacheL());
+#endif
 S60->updateScreenSize();
 TDisplayMode mode = S60->screenDevice()->DisplayMode();
 else {
 S60->hasTouchscreen = true;
 S60->virtualMouseRequired = false;
 }
+S60->avkonComponentsSupportTransparency = false;
+#ifdef Q_WS_S60
+TUid KCRUidAvkon = { 0x101F876E };
+TUint32 KAknAvkonTransparencyEnabled = 0x0000000D;
+CRepository* repository = 0;
+TRAP(err, repository = CRepository::NewL(KCRUidAvkon));
+if(err == KErrNone) {
+TInt value = 0;
+err = repository->Get(KAknAvkonTransparencyEnabled, value);
+if(err == KErrNone) {
+S60->avkonComponentsSupportTransparency = (value==1) ? true : false;
+}
+}
+#endif
 if (touch) {
 QApplicationPrivate::navigationMode = Qt::NavigationModeNone;
 } else {
 QApplicationPrivate::navigationMode = Qt::NavigationModeKeypadDirectional;
 }
 app_do_modal = qt_modal_stack != 0;
 }
 void QApplicationPrivate::openPopup(QWidget *popup)
 {
+if (popup && qobject_cast<QComboBox *>(popup->parentWidget()))
+static_cast<QSymbianControl *>(popup->effectiveWinId())->FadeBehindPopup(ETrue);
 if (!QApplicationPrivate::popupWidgets)
 QApplicationPrivate::popupWidgets = new QWidgetList;
 QApplicationPrivate::popupWidgets->append(popup);
 // Cancel focus widget pointer capture and long tap timer
 if (QApplication::focusWidget()) {
 static_cast<QSymbianControl*>(QApplication::focusWidget()->effectiveWinId())->CancelLongTapTimer();
 QApplication::focusWidget()->effectiveWinId()->SetPointerCapture(false);
 }
 }
 void QApplicationPrivate::closePopup(QWidget *popup)
 {
+if (popup && qobject_cast<QComboBox *>(popup->parentWidget()))
+static_cast<QSymbianControl *>(popup->effectiveWinId())->FadeBehindPopup(EFalse);
 if (!QApplicationPrivate::popupWidgets)
 return;
 QApplicationPrivate::popupWidgets->removeAll(popup);
 // Cancel pointer capture and long tap for this popup
 QWidgetPrivate::keyboardGrabber->grabKeyboard();
 QWidget *fw = QApplicationPrivate::active_window ? QApplicationPrivate::active_window->focusWidget()
 : q_func()->focusWidget();
 if (fw) {
+if(fw->window()->isModal()) // restore pointer capture for modal window
+fw->effectiveWinId()->SetPointerCapture(true);
 if (fw != q_func()->focusWidget()) {
 fw->setFocus(Qt::PopupFocusReason);
 } else {
 QFocusEvent e(QEvent::FocusIn, Qt::PopupFocusReason);
 q_func()->sendEvent(fw, &e);
 }
 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) {
 delete w->d_func()->topData()->backingStore;
 w->d_func()->topData()->backingStore = 0;
-// :QTP:QT-2506:remove this when QT-2506 is fixed
+// In order to ensure that any resources used by the window surface
-if (S60)
+// are immediately freed, we flush the WSERV command buffer.
 S60->wsSession().Flush();
 } else if ((visChangedEvent->iFlags & TWsVisibilityChangedEvent::EPartiallyVisible)
 && !w->d_func()->maybeBackingStore()) {
 w->d_func()->topData()->backingStore = new QWidgetBackingStore(w);
 w->d_func()->invalidateBuffer(w->rect());
 w->repaint();
 }
 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;

changeset 7	f7bc934e204c
parent 3	41300fa6a67c