FCL/sf/mw/hb: comparison src/hbplugins/inputmethods/hardwareinput/hbhardwareinputbasic12keyhandler.cpp

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 #include "hbinputabstractbase.h"
 #include "hbhardware12key.h"
 class HbHardwareInputBasic12KeyHandlerPrivate: public HbInputBasicHandlerPrivate
 {
-	Q_DECLARE_PUBLIC(HbHardwareInputBasic12KeyHandler)
+Q_DECLARE_PUBLIC(HbHardwareInputBasic12KeyHandler)
 public:
-	HbHardwareInputBasic12KeyHandlerPrivate();
+HbHardwareInputBasic12KeyHandlerPrivate();
-	~HbHardwareInputBasic12KeyHandlerPrivate();
+~HbHardwareInputBasic12KeyHandlerPrivate();
-	void handleAlphaEvent(int buttonId);
+void handleAlphaEvent(int buttonId);
-	bool keyPressed(const QKeyEvent *keyEvent);
+bool keyPressed(const QKeyEvent *keyEvent);
-	bool keyReleased(const QKeyEvent *keyEvent);
+bool keyReleased(const QKeyEvent *keyEvent);
-	bool actionHandler(HbInputModeHandler::HbInputModeAction action);
+bool actionHandler(HbInputModeHandler::HbInputModeAction action);
-	void _q_timeout();
+void _q_timeout();
 public:
-	int mLastKey;
+int mLastKey;
-	QChar mCurrentChar;
+QChar mCurrentChar;
-	int mNumChr;
+int mNumChr;
-	bool mButtonDown;
+bool mButtonDown;
-	HbInputFocusObject *mCurrentlyFocused;
+HbInputFocusObject *mCurrentlyFocused;
 };
 HbHardwareInputBasic12KeyHandlerPrivate::HbHardwareInputBasic12KeyHandlerPrivate()
 :    mLastKey(0),
 mCurrentChar(0),
 }
 // handles the key press events. It starts a multitap timer as well.
 void HbHardwareInputBasic12KeyHandlerPrivate::handleAlphaEvent(int buttonId)
 {
-	Q_Q(HbHardwareInputBasic12KeyHandler);
+Q_Q(HbHardwareInputBasic12KeyHandler);
-	HbInputFocusObject *focusObject = 0;
+HbInputFocusObject *focusObject = 0;
-	focusObject = mInputMethod->focusObject();
+focusObject = mInputMethod->focusObject();
-	if (!focusObject) {
+if (!focusObject) {
-		return;
+return;
-	}
+}
-	mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId);
+mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId);
-	if (mCurrentChar != 0) {
+if (mCurrentChar != 0) {
-		QString str;
+QString str;
-		str += mCurrentChar;
+str += mCurrentChar;
-		QList<QInputMethodEvent::Attribute> list;
+QList<QInputMethodEvent::Attribute> list;
-		QInputMethodEvent event(str, list);
+QInputMethodEvent event(str, list);
-		focusObject->sendEvent(event);
+focusObject->sendEvent(event);
-		mTimer->start(HbMultiTapTimerTimeout);
+mTimer->start(HbMultiTapTimerTimeout);
-	}
+}
 }
 bool HbHardwareInputBasic12KeyHandlerPrivate::keyPressed(const QKeyEvent *keyEvent)
 {
-	Q_Q(HbHardwareInputBasic12KeyHandler);
+Q_Q(HbHardwareInputBasic12KeyHandler);
-	HbInputFocusObject *focusObject = 0;
+HbInputFocusObject *focusObject = 0;
-	focusObject = mInputMethod->focusObject();
+focusObject = mInputMethod->focusObject();
-	if (!focusObject) {
+if (!focusObject) {
-		return false;
+return false;
-	}
+}
-	int buttonId = keyEvent->key();
+int buttonId = keyEvent->key();
-	if( mLastKey != buttonId) {
+if( mLastKey != buttonId) {
-		mLastKey = buttonId;
+mLastKey = buttonId;
-		if(mTimer->isActive()) {
+if(mTimer->isActive()) {
-			mTimer->stop();
+mTimer->stop();
-			mNumChr = 0;
+mNumChr = 0;
-			if (isEnterCharacter(mCurrentChar)) {
+if (isEnterCharacter(mCurrentChar)) {
-				focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared.
+focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared.
-				mCurrentChar = QChar('\n');                  // Convert enter character to line feed.
+mCurrentChar = QChar('\n');                  // Convert enter character to line feed.
-			}
+}
-			if(mCurrentChar != 0) {
+if(mCurrentChar != 0) {
-				focusObject->filterAndCommitCharacter(mCurrentChar);
+focusObject->filterAndCommitCharacter(mCurrentChar);
-			}
+}
-			// For QLineEdit it works fine. For HbLineEdit, need to set the state
+// For QLineEdit it works fine. For HbLineEdit, need to set the state
-			// to lower by calling activateState().
+// to lower by calling activateState().
-			// This is needed for the scenario - When automatic text case is true
+// This is needed for the scenario - When automatic text case is true
-			// click a button and before the multitap timer expires click on
+// click a button and before the multitap timer expires click on
-			// another button.
+// another button.
-			mInputMethod->updateState();
+mInputMethod->updateState();
 refreshAutoCompleter();
-		}
+}
-	}
+}
-	if (buttonId == Qt::Key_Return) {
+if (buttonId == Qt::Key_Return) {
-		mLastKey = buttonId;
+mLastKey = buttonId;
-		return true;
+return true;
-	} else if (buttonId == Qt::Key_Shift) {
+} else if (buttonId == Qt::Key_Shift) {
-		// For single key press, change the text input case. If the second shift key press is
+// For single key press, change the text input case. If the second shift key press is
-		// received within long key press time out interval, then activate the next state
+// received within long key press time out interval, then activate the next state
-		if (mTimer->isActive() && (mLastKey == buttonId)){
+if (mTimer->isActive() && (mLastKey == buttonId)){
-			mTimer->stop();
+mTimer->stop();
 HbInputState rootState;
 mInputMethod->editorRootState(rootState);
 mInputMethod->activateState(rootState);
-		} else {
+} else {
-			updateTextCase();
+updateTextCase();
-			mTimer->start(HbLongPressTimerTimeout);
+mTimer->start(HbLongPressTimerTimeout);
-		}
+}
-		mCurrentChar = 0;
+mCurrentChar = 0;
-		mButtonDown = true;
+mButtonDown = true;
-		mCurrentChar = 0;
+mCurrentChar = 0;
-		return true;
+return true;
-	}
+}
-	// Let's see if we can get the handler for this button in the base class.
+// Let's see if we can get the handler for this button in the base class.
-	if (q->HbInputBasicHandler::filterEvent(keyEvent)) {
+if (q->HbInputBasicHandler::filterEvent(keyEvent)) {
-		return true;
+return true;
-	}
+}
-	mLastKey = buttonId;
+mLastKey = buttonId;
-	mButtonDown = true;
+mButtonDown = true;
-	handleAlphaEvent(buttonId);
+handleAlphaEvent(buttonId);
-	return true;
+return true;
 }
 /*!
 Handles the key release events from the VKB. Launches the SCT with key release event of
 asterisk.
 */
 bool HbHardwareInputBasic12KeyHandlerPrivate::keyReleased(const QKeyEvent *keyEvent)
 {
-	Q_Q(HbHardwareInputBasic12KeyHandler);
+Q_Q(HbHardwareInputBasic12KeyHandler);
-	mButtonDown = false;
+mButtonDown = false;
-	int buttonId = keyEvent->key();
+int buttonId = keyEvent->key();
-	if (buttonId == Qt::Key_Asterisk) {
+if (buttonId == Qt::Key_Asterisk) {
-		//Same asterisk key is used for launching candidate list (long key press)
+//Same asterisk key is used for launching candidate list (long key press)
-		//and also for SCT. So, do not launch SCT if candidate list is already launched.
+//and also for SCT. So, do not launch SCT if candidate list is already launched.
-		mInputMethod->switchMode(buttonId);
+mInputMethod->switchMode(buttonId);
-		return true;
+return true;
-	} else if (buttonId == Qt::Key_Delete) {
+} else if (buttonId == Qt::Key_Delete) {
-		QKeyEvent keyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier);
+QKeyEvent keyEvent(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier);
-		q->sendAndUpdate(keyEvent);
+q->sendAndUpdate(keyEvent);
-		return true;
+return true;
-	}
+}
-	return false;
+return false;
 }
 void HbHardwareInputBasic12KeyHandlerPrivate::_q_timeout()
 {
-	Q_Q(HbHardwareInputBasic12KeyHandler);
+Q_Q(HbHardwareInputBasic12KeyHandler);
-	mTimer->stop();
+mTimer->stop();
-	mNumChr = 0;
+mNumChr = 0;
-	HbInputFocusObject *focusedObject = 0;
+HbInputFocusObject *focusedObject = 0;
-	focusedObject = mInputMethod->focusObject();
+focusedObject = mInputMethod->focusObject();
-	if (!focusedObject) {
+if (!focusedObject) {
-		qDebug("HbHardwareInputBasic12KeyHandler::timeout focusObject == 0");
+qDebug("HbHardwareInputBasic12KeyHandler::timeout focusObject == 0");
-		return;
+return;
-	}
+}
-	if (isEnterCharacter(mCurrentChar)) {
+if (isEnterCharacter(mCurrentChar)) {
-		focusedObject->sendPreEditString(QString("")); // Make sure the enter character is cleared.
+focusedObject->sendPreEditString(QString("")); // Make sure the enter character is cleared.
-		mCurrentChar = QChar('\n');                    // Convert enter character to line feed.
+mCurrentChar = QChar('\n');                    // Convert enter character to line feed.
-	}
+}
-	//Long key press number key is applicable to all keys
+//Long key press number key is applicable to all keys
-	if (mButtonDown) {
+if (mButtonDown) {
-		//switch to numeric mode for long key press of Hash key
+//switch to numeric mode for long key press of Hash key
-		if (mLastKey == Qt::Key_Shift){
+if (mLastKey == Qt::Key_Shift){
-			updateTextCase();
+updateTextCase();
-			mInputMethod->switchMode(Qt::Key_Shift);
+mInputMethod->switchMode(Qt::Key_Shift);
-		}else {
+}else {
-			q->commitFirstMappedNumber(mLastKey);
+q->commitFirstMappedNumber(mLastKey);
-		}
+}
-	} else if(mLastKey != Qt::Key_Shift){
+} else if(mLastKey != Qt::Key_Shift){
-		if (!focusedObject->characterAllowedInEditor(mCurrentChar)) {
+if (!focusedObject->characterAllowedInEditor(mCurrentChar)) {
-			focusedObject->sendCommitString(QString());
+focusedObject->sendCommitString(QString());
-		} else {
+} else {
-			if ( mCurrentChar != 0){
+if ( mCurrentChar != 0){
-				QString curString;
+QString curString;
-				curString.append(mCurrentChar);
+curString.append(mCurrentChar);
-				focusedObject->sendCommitString(curString);
+focusedObject->sendCommitString(curString);
-			}
+}
-			mInputMethod->updateState();
+mInputMethod->updateState();
-			// pass this character to autocompleter.
+// pass this character to autocompleter.
 refreshAutoCompleter();
-		}
+}
-	}
+}
-	return;
+return;
 }
 bool HbHardwareInputBasic12KeyHandlerPrivate::actionHandler(HbInputModeHandler::HbInputModeAction action)
 {
-	HbInputFocusObject *focusObject = 0;
+HbInputFocusObject *focusObject = 0;
-	focusObject = mInputMethod->focusObject();
+focusObject = mInputMethod->focusObject();
-	if (!focusObject) {
+if (!focusObject) {
-		return false;
+return false;
-	}
+}
-	bool ret = true;
+bool ret = true;
-	switch (action) {
+switch (action) {
 case HbInputModeHandler::HbInputModeActionReset:
-	mLastKey = 0;
+mLastKey = 0;
-	mNumChr = 0;
+mNumChr = 0;
-	if (mTimer->isActive()) {
+if (mTimer->isActive()) {
-		mTimer->stop();
+mTimer->stop();
-	}
+}
-	break;
+break;
 case HbInputModeHandler::HbInputModeActionDeleteAndCommit:{
-	mTimer->stop();
+mTimer->stop();
-	QString empty;
+QString empty;
-	if(mInputMethod) {
+if(mInputMethod) {
-		//In case of the sct the character is already committed
+//In case of the sct the character is already committed
-		//We need to remove the committed character.
+//We need to remove the committed character.
-		QList<QInputMethodEvent::Attribute> list;
+QList<QInputMethodEvent::Attribute> list;
-		QInputMethodEvent event(QString(), list);
+QInputMethodEvent event(QString(), list);
-		event.setCommitString(empty, -1, 1);
+event.setCommitString(empty, -1, 1);
-		focusObject->sendEvent(event);
+focusObject->sendEvent(event);
-	} else {
+} else {
-		// Close event was originated from a button press, remove the uncommitted character.
+// Close event was originated from a button press, remove the uncommitted character.
-		focusObject->sendCommitString(empty);
+focusObject->sendCommitString(empty);
-	}
+}
-														  }
+}
-														  break;
+break;
 case HbInputModeHandler::HbInputModeActionFocusRecieved:
-	mTimer->stop();
+mTimer->stop();
-	mNumChr = 0;
+mNumChr = 0;
-	if (mCurrentlyFocused != focusObject) {
+if (mCurrentlyFocused != focusObject) {
-		mCurrentlyFocused = focusObject;
+mCurrentlyFocused = focusObject;
-		if (mAutoCompleter) {
+if (mAutoCompleter) {
-			mAutoCompleter->commit();
+mAutoCompleter->commit();
-		}
+}
-	}
+}
-	// set up auto completer
+// set up auto completer
-	setUpAutoCompleter();
+setUpAutoCompleter();
-	break;
+break;
 case HbInputModeHandler::HbInputModeActionCommit:
 case HbInputModeHandler::HbInputModeActionFocusLost:
-	if (mTimer->isActive()) {
+if (mTimer->isActive()) {
-		mTimer->stop();
+mTimer->stop();
-		if (mCurrentChar != 0) {
+if (mCurrentChar != 0) {
-			if (isEnterCharacter(mCurrentChar)) {
+if (isEnterCharacter(mCurrentChar)) {
-				focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared.
+focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared.
-				mCurrentChar = QChar('\n');                    // Convert enter character to line feed.
+mCurrentChar = QChar('\n');                    // Convert enter character to line feed.
-			}
+}
-			focusObject->filterAndCommitCharacter(mCurrentChar);
+focusObject->filterAndCommitCharacter(mCurrentChar);
-			mCurrentChar = 0;
+mCurrentChar = 0;
-		}
+}
-		mLastKey = 0;
+mLastKey = 0;
-		mNumChr = 0;
+mNumChr = 0;
-		mInputMethod->updateState();
+mInputMethod->updateState();
-	}
+}
-	break;
+break;
 default: {
-	ret = false;
+ret = false;
-		 }
+}
-		 break;
+break;
-	};
+};
-	return ret;
+return ret;
 }
 HbHardwareInputBasic12KeyHandler::HbHardwareInputBasic12KeyHandler(HbInputAbstractMethod* inputMethod)
 :HbInputBasicHandler( *new HbHardwareInputBasic12KeyHandlerPrivate, inputMethod)
 {
-	Q_D(HbHardwareInputBasic12KeyHandler);
+Q_D(HbHardwareInputBasic12KeyHandler);
-	d->q_ptr = this;
+d->q_ptr = this;
 }
 HbHardwareInputBasic12KeyHandler::~HbHardwareInputBasic12KeyHandler()
 {
 }
 /*!
 filterEvent function for handling different keyevents.
 */
 bool HbHardwareInputBasic12KeyHandler::filterEvent(const QKeyEvent * event)
 {
-	Q_D(HbHardwareInputBasic12KeyHandler);
+Q_D(HbHardwareInputBasic12KeyHandler);
-	if (event->isAutoRepeat()) {
+if (event->isAutoRepeat()) {
-		// Ignore all repeat events after first repeat event
+// Ignore all repeat events after first repeat event
-		return true;
+return true;
-	} else if (event->type() == QEvent::KeyRelease) {
+} else if (event->type() == QEvent::KeyRelease) {
-		return d->keyReleased(event);
+return d->keyReleased(event);
-	} else {
+} else {
-		return d->keyPressed(event);
+return d->keyPressed(event);
-	}
+}
 }
 /*!
 returns true if in inline edit.
 */
 bool HbHardwareInputBasic12KeyHandler::isComposing() const
 {
-	Q_D(const HbHardwareInputBasic12KeyHandler);
+Q_D(const HbHardwareInputBasic12KeyHandler);
-	return d->mTimer->isActive();
+return d->mTimer->isActive();
 }
 /*!
 Action Handler
 */
 bool HbHardwareInputBasic12KeyHandler::actionHandler(HbInputModeAction action)
 {
-	Q_D(HbHardwareInputBasic12KeyHandler);
+Q_D(HbHardwareInputBasic12KeyHandler);
-	if (!d->actionHandler(action)) {
+if (!d->actionHandler(action)) {
-		// no action taken so let's pass it to the base class.
+// no action taken so let's pass it to the base class.
-		return HbInputBasicHandler::actionHandler(action);
+return HbInputBasicHandler::actionHandler(action);
-	}
+}
-	return false;
+return false;
 }
 // EOF

changeset 34	ed14f46c0e55
parent 1	f7ac710697a9