1 files changed, 105 insertions, 13 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index b066f4d..64009d4 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -74,6 +74,9 @@
 
 #ifdef Q_WS_X11
 #include <private/qt_x11_p.h>
+#endif
+
+#if defined(Q_WS_X11) || defined(Q_WS_S60)
 #include "qinputcontextfactory.h"
 #endif
 
@@ -130,6 +133,8 @@ bool QApplicationPrivate::quitOnLastWindowClosed = true;
 #ifdef Q_WS_WINCE
 int QApplicationPrivate::autoMaximizeThreshold = -1;
 bool QApplicationPrivate::autoSipEnabled = false;
+#else
+bool QApplicationPrivate::autoSipEnabled = true;
 #endif
 
 QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::Type type)
@@ -428,7 +433,12 @@ bool Q_GUI_EXPORT qt_tab_all_widgets = true;
 bool qt_in_tab_key_event = false;
 int qt_antialiasing_threshold = -1;
 static int drag_time = 500;
+#ifdef Q_WS_S60
+// The screens are a bit too small to for your thumb when using only 4 pixels drag distance.
+static int drag_distance = 8;
+#else
 static int drag_distance = 4;
+#endif
 static Qt::LayoutDirection layout_direction = Qt::LeftToRight;
 QSize QApplicationPrivate::app_strut = QSize(0,0); // no default application strut
 bool QApplicationPrivate::animate_ui = true;
@@ -439,11 +449,17 @@ bool QApplicationPrivate::animate_tooltip = false;
 bool QApplicationPrivate::fade_tooltip = false;
 bool QApplicationPrivate::animate_toolbox = false;
 bool QApplicationPrivate::widgetCount = false;
+bool QApplicationPrivate::auto_sip_on_mouse_focus = false;
+QString* QApplicationPrivate::styleOverride = 0;
 #if defined(Q_WS_WIN) && !defined(Q_WS_WINCE)
 bool QApplicationPrivate::inSizeMove = false;
 #endif
 #ifdef QT_KEYPAD_NAVIGATION
+#  if defined(Q_WS_S60)
+bool QApplicationPrivate::keypadNavigation = true;
+#  else
 bool QApplicationPrivate::keypadNavigation = false;
+#  endif
 QWidget *QApplicationPrivate::oldEditFocus = 0;
 #endif
 
@@ -982,7 +998,8 @@ QApplication::~QApplication()
     if (QWidgetPrivate::mapper) {
         QWidgetMapper * myMapper = QWidgetPrivate::mapper;
         QWidgetPrivate::mapper = 0;
-        for (QWidgetMapper::Iterator it = myMapper->begin(); it != myMapper->end(); ++it) {
+        for (QWidgetMapper::ConstIterator it = myMapper->constBegin();
+                it != myMapper->constEnd(); ++it) {
             register QWidget *w = *it;
             if (!w->parent())                        // window
                 w->destroy(true, true);
@@ -994,7 +1011,7 @@ QApplication::~QApplication()
     if (QWidgetPrivate::uncreatedWidgets) {
         QWidgetSet *mySet = QWidgetPrivate::uncreatedWidgets;
         QWidgetPrivate::uncreatedWidgets = 0;
-        for (QWidgetSet::Iterator it = mySet->begin(); it != mySet->end(); ++it) {
+        for (QWidgetSet::ConstIterator it = mySet->constBegin(); it != mySet->constEnd(); ++it) {
             register QWidget *w = *it;
             if (!w->parent())                        // window
                 w->destroy(true, true);
@@ -1059,6 +1076,7 @@ QApplication::~QApplication()
     QApplicationPrivate::animate_tooltip = false;
     QApplicationPrivate::fade_tooltip = false;
     QApplicationPrivate::widgetCount = false;
+    QApplicationPrivate::auto_sip_on_mouse_focus = false;
 
 #ifndef QT_NO_STATEMACHINE
     // trigger unregistering of QStateMachine's GUI types
@@ -1216,11 +1234,15 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
     \since 4.5
     \brief toggles automatic SIP (software input panel) visibility
 
-    The auto SIP property is only available as part of Qt for Windows CE.
-
     Set this property to true to automatically display the SIP when entering
     widgets that accept keyboard input. This property only affects widgets with
-    the WA_InputMethodEnabled attribute set.
+    the WA_InputMethodEnabled attribute set, and is typically used to launch
+    a virtual keyboard on devices which have very few or no keys.
+
+    The property only has an effect on platforms which use software input
+    panels, such as Windows CE and Symbian.
+
+    The default is platform dependent.
 */
 
 #ifdef Q_WS_WINCE
@@ -1233,6 +1255,7 @@ int QApplication::autoMaximizeThreshold() const
 {
     return QApplicationPrivate::autoMaximizeThreshold;
 }
+#endif
 
 void QApplication::setAutoSipEnabled(const bool enabled)
 {
@@ -1243,7 +1266,6 @@ bool QApplication::autoSipEnabled() const
 {
     return QApplicationPrivate::autoSipEnabled;
 }
-#endif
 
 #ifndef QT_NO_STYLE_STYLESHEET
 
@@ -1925,6 +1947,8 @@ QString desktopstyle;
                 desktopstyle = QLatin1String("Windows");                // default styles for Windows
 #elif defined(Q_WS_X11) && defined(Q_OS_SOLARIS)
             desktopstyle = QLatin1String("CDE");                        // default style for X11 on Solaris
+#elif defined(Q_WS_S60)
+            style = QLatin1String("S60");
 #elif defined(Q_WS_X11) && defined(Q_OS_IRIX)
             desktopstyle = QLatin1String("SGI");                        // default style for X11 on IRIX
 #elif defined(Q_WS_QWS)
@@ -2079,6 +2103,16 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason)
                         prev->setEditFocus(false);
                 }
 #endif
+#ifndef QT_NO_IM
+                if (focus) {
+                    QInputContext *prevIc;
+                    prevIc = prev->inputContext();
+                    if (prevIc && prevIc != focus->inputContext()) {
+                        QEvent closeSIPEvent(QEvent::CloseSoftwareInputPanel);
+                        QApplication::sendEvent(prev, &closeSIPEvent);
+                    }
+                }
+#endif
                 QFocusEvent out(QEvent::FocusOut, reason);
                 QPointer<QWidget> that = prev;
                 QApplication::sendEvent(prev, &out);
@@ -3431,6 +3465,39 @@ Qt::LayoutDirection QApplication::layoutDirection()
     return layout_direction;
 }
 
+/*!
+    \property autoSipOnMouseFocus
+    \since 4.6
+    \brief toggles SIP (software input panel) launch policy
+
+    This property holds whether widgets should request a software input
+    panel when it is focused with the mouse. This is typically used to
+    launch a virtual keyboard on devices which have very few or no keys.
+
+    If the property is set to true, the widget asks for an input panel
+    on the mouse click which causes the widget to be focused. If the
+    property is set to false, the user must click a second time before
+    the widget asks for an input panel.
+
+    \note If the widget is focused by other means than a mouse click,
+          the next click is will trigger an input panel request,
+          regardless of the value of this property.
+
+    The default is platform dependent.
+
+    \sa QEvent::RequestSoftwareInputPanel, QInputContext
+*/
+
+void QApplication::setAutoSipOnMouseFocus(bool enable)
+{
+    QApplicationPrivate::auto_sip_on_mouse_focus = enable;
+}
+
+bool QApplication::autoSipOnMouseFocus()
+{
+    return QApplicationPrivate::auto_sip_on_mouse_focus;
+}
+
 
 /*!
     \obsolete
@@ -3709,6 +3776,13 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
             QPoint relpos = mouse->pos();
 
             if (e->spontaneous()) {
+#ifndef QT_NO_IM
+                QInputContext *ic = w->inputContext();
+                if (ic
+                        && w->testAttribute(Qt::WA_InputMethodEnabled)
+                        && ic->filterEvent(mouse))
+                    return true;
+#endif
 
                 if (e->type() == QEvent::MouseButtonPress) {
                     QWidget *fw = w;
@@ -4019,6 +4093,20 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
         break;
 #endif
 
+    case QEvent::RequestSoftwareInputPanel:
+    case QEvent::CloseSoftwareInputPanel:
+#ifndef QT_NO_IM
+        if (receiver->isWidgetType()) {
+            QWidget *w = static_cast<QWidget *>(receiver);
+            QInputContext *ic = w->inputContext();
+            if (ic && ic->filterEvent(e)) {
+                break;
+            }
+        }
+#endif
+        res = d->notify_helper(receiver, e);
+        break;
+
     default:
         res = d->notify_helper(receiver, e);
         break;
@@ -4680,7 +4768,7 @@ void QApplicationPrivate::emitLastWindowClosed()
 
     If \a enable is true, Qt::Key_Up and Qt::Key_Down are used to change focus.
 
-    This feature is available in Qt for Embedded Linux only.
+    This feature is available in Qt for Embedded Linux and Symbian only.
 
     \sa keypadNavigationEnabled()
 */
@@ -4691,9 +4779,9 @@ void QApplication::setKeypadNavigationEnabled(bool enable)
 
 /*!
     Returns true if Qt is set to use keypad navigation; otherwise returns
-    false. The default is false.
+    false.  The default value is true on Symbian, but false on other platforms.
 
-    This feature is available in Qt for Embedded Linux only.
+    This feature is available in Qt for Embedded Linux and Symbian only.
 
     \sa setKeypadNavigationEnabled()
 */
@@ -4750,8 +4838,8 @@ bool QApplication::keypadNavigationEnabled()
     The default value on X11 is 400 milliseconds. On Windows and Mac OS X, the
     operating system's value is used.
 
-    On Microsoft Windows, calling this function sets the double click interval
-    for all applications.
+    On Microsoft Windows and Symbian, calling this function sets the
+    double click interval for all applications.
 */
 
 /*!
@@ -4909,8 +4997,7 @@ void QApplication::setInputContext(QInputContext *inputContext)
         qWarning("QApplication::setInputContext: called with 0 input context");
         return;
     }
-    if (d->inputContext)
-        delete d->inputContext;
+    delete d->inputContext;
     d->inputContext = inputContext;
 }
 
@@ -4934,6 +5021,11 @@ QInputContext *QApplication::inputContext() const
             qic = QInputContextFactory::create(QLatin1String("xim"), that);
         that->d_func()->inputContext = qic;
     }
+#elif defined(Q_WS_S60)
+    if (!d->inputContext) {
+        QApplication *that = const_cast<QApplication *>(this);
+        that->d_func()->inputContext = QInputContextFactory::create(QString::fromLatin1("coefep"), that);
+    }
 #endif
     return d->inputContext;
 }