1 files changed, 29 insertions, 33 deletions

diff --git a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
index 1980a99ed9..cda4f2e88e 100644
--- a/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
+++ b/src/plugins/platforms/qnx/qqnxinputcontext_imf.h
@@ -1,6 +1,6 @@
 /***************************************************************************
 **
-** Copyright (C) 2011 - 2012 Research In Motion
+** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -43,6 +43,7 @@
 #define QQNXINPUTCONTEXT_H
 
 #include <qpa/qplatforminputcontext.h>
+#include "qqnxscreeneventfilter.h"
 
 #include <QtCore/QLocale>
 #include <QtCore/QMetaType>
@@ -55,8 +56,9 @@ QT_BEGIN_NAMESPACE
 
 class QQnxAbstractVirtualKeyboard;
 class QQnxIntegration;
+class QQnxImfRequest;
 
-class QQnxInputContext : public QPlatformInputContext
+class QQnxInputContext : public QPlatformInputContext, public QQnxScreenEventFilter
 {
     Q_OBJECT
 public:
@@ -68,8 +70,9 @@ public:
     bool filterEvent(const QEvent *event);
     QRectF keyboardRect() const;
     void reset();
+    void commit();
     void update(Qt::InputMethodQueries);
-    bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap);
+    bool handleKeyboardEvent(int flags, int sym, int mod, int scan, int cap, int sequenceId);
 
 
     void showInputPanel();
@@ -79,61 +82,54 @@ public:
     QLocale locale() const;
     void setFocusObject(QObject *object);
 
-protected:
-    // Filters only for IMF events.
-    bool eventFilter(QObject *obj, QEvent *event);
-
 private Q_SLOTS:
     void keyboardVisibilityChanged(bool visible);
     void keyboardLocaleChanged(const QLocale &locale);
+    void processImfEvent(QQnxImfRequest *event);
 
 private:
     // IMF Event dispatchers
-    bool dispatchFocusEvent(FocusEventId id, int hints = Qt::ImhNone);
+    bool dispatchFocusGainEvent(int inputHints);
+    void dispatchFocusLossEvent();
     bool dispatchRequestSoftwareInputPanel();
     bool dispatchCloseSoftwareInputPanel();
     int32_t processEvent(event_t *event);
 
     void closeSession();
-    void openSession();
+    bool openSession();
     bool hasSession();
+    void updateCursorPosition();
     void endComposition();
-    void setComposingText(QString const &composingText);
+    void finishComposingText();
     bool hasSelectedText();
+    void updateComposition(spannable_string_t *text, int32_t new_cursor_position);
 
     // IMF Event handlers - these events will come in from QCoreApplication.
-    int32_t onBeginBatchEdit(input_session_t *ic);
-    int32_t onClearMetaKeyStates(input_session_t *ic, int32_t states);
-    int32_t onCommitText(input_session_t *ic, spannable_string_t *text, int32_t new_cursor_position);
-    int32_t onDeleteSurroundingText(input_session_t *ic, int32_t left_length, int32_t right_length);
-    int32_t onEndBatchEdit(input_session_t *ic);
-    int32_t onFinishComposingText(input_session_t *ic);
-    int32_t onGetCursorCapsMode(input_session_t *ic, int32_t req_modes);
-    int32_t onGetCursorPosition(input_session_t *ic);
-    extracted_text_t *onGetExtractedText(input_session_t *ic, extracted_text_request_t *request, int32_t flags);
-    spannable_string_t *onGetSelectedText(input_session_t *ic, int32_t flags);
-    spannable_string_t *onGetTextAfterCursor(input_session_t *ic, int32_t n, int32_t flags);
-    spannable_string_t *onGetTextBeforeCursor(input_session_t *ic, int32_t n, int32_t flags);
-    int32_t onPerformEditorAction(input_session_t *ic, int32_t editor_action);
-    int32_t onReportFullscreenMode(input_session_t *ic, int32_t enabled);
-    int32_t onSendEvent(input_session_t *ic, event_t *event);
-    int32_t onSendAsyncEvent(input_session_t *ic, event_t *event);
-    int32_t onSetComposingRegion(input_session_t *ic, int32_t start, int32_t end);
-    int32_t onSetComposingText(input_session_t *ic, spannable_string_t *text, int32_t new_cursor_position);
-    int32_t onSetSelection(input_session_t *ic, int32_t start, int32_t end);
+    int32_t onCommitText(spannable_string_t *text, int32_t new_cursor_position);
+    int32_t onDeleteSurroundingText(int32_t left_length, int32_t right_length);
+    int32_t onGetCursorCapsMode(int32_t req_modes);
+    int32_t onFinishComposingText();
+    int32_t onGetCursorPosition();
+    spannable_string_t *onGetTextAfterCursor(int32_t n, int32_t flags);
+    spannable_string_t *onGetTextBeforeCursor(int32_t n, int32_t flags);
+    int32_t onSendEvent(event_t *event);
+    int32_t onSendAsyncEvent(event_t *event);
+    int32_t onSetComposingRegion(int32_t start, int32_t end);
+    int32_t onSetComposingText(spannable_string_t *text, int32_t new_cursor_position);
+    int32_t onIsTextSelected(int32_t* pIsSelected);
+    int32_t onIsAllTextSelected(int32_t* pIsSelected);
     int32_t onForceUpdate();
 
-    int m_lastCaretPos;
+    int m_caretPosition;
     bool m_isComposing;
     QString m_composingText;
+    bool m_isUpdatingText;
     bool m_inputPanelVisible;
     QLocale m_inputPanelLocale;
     QQnxIntegration *m_integration;
-    QQnxAbstractVirtualKeyboard &m_virtualKeyboad;
+    QQnxAbstractVirtualKeyboard &m_virtualKeyboard;
 };
 
-Q_DECLARE_METATYPE(extracted_text_t*)
-
 QT_END_NAMESPACE
 
 #endif // QQNXINPUTCONTEXT_H