FCL/sf/mw/inputmethods: comparison fep/aknfep/src/AknFepPluginManager.cpp

equal deleted inserted replaced

-:e6a39382bb9c
+:c8fb4cf7b3ae
 #include <apgwgnam.h>
 #include <PtiKeyMappings.h>
 #include <AknPriv.hrh>
+#ifdef RD_UI_TRANSITION_EFFECTS_POPUPS
+#include <gfxtranseffect/gfxtranseffect.h>
+#include <akntransitionutils.h>
+#include <akntranseffect.h>
+#include <e32property.h>
+#include <avkondomainpskeys.h>
+#endif
 // Constants
 const TInt KCursorBlinkPerioid = 10000;//300000; // five tenth of a second * 2
 const TInt KMaxServerDataLength = 50;
 const TUint KVkbParagraphSeparator = 0x2029;
 const TUint KVkbTabulator = 0x0009;
 CAknFepSharedDataInterface& aSharedData,
 CAknFepLanguageManager& aLangMan,
 CAknFepCaseManager& aCaseMan )
 : iFepMan( aFepMan ), iLangMan( aLangMan ), iCaseMan( aCaseMan ),
 iSharedData( aSharedData ), iPluginPrimaryRange( ERangeInvalid ), iCandidateIndex(1),
-iCharStartPostion( KInvalidValue ),
+iCharStartPostion( KInvalidValue )
-	  iInSpellMode( EFalse )
 {
 iIndicatorImgID = 0;
 iIndicatorTextID = 0;
 iLastDataQueryWin = NULL;
 iDefaultOrientation = -1;
 }
 LaunchPenInputMenuL(R_AVKON_PENINPUT_OPTION_MENU_BAR);
 }
 break;
 case ESignalLayoutClosed:
+if(iPluginInputMode == EPluginInputModeItut)
+	{
+					iFepMan.PtiEngine()->CancelTimerActivity();
+	}
 ClosePluginInputModeL(ETrue);
 if(iPenInputSvrConnected ) //lost foreground
 {
 iPenInputServer.LoseForeground();
 }
 iPenInputServer.LoseForeground();
 }
 }
 else
 {
-OnFocusChangedL( aEventData ) ;
+OnFocusChangedL( aEventData );
 }
+iForegroundChange = EFalse;
 }
 break;
 case EPluginFocusChanged:
 {
 OnFocusChangedL( aEventData );
 // -----------------------------------------------------------------------------
 //
 TBool CAknFepPluginManager::TryChangePluginInputModeByModeL
 (TPluginInputMode aSuggestMode, TInt aOpenMode,TInt aSuggestRange)
 {
+iNeedFetchDimState = ETrue;
 if ( iSharedData.QwertyInputMode() )
 {
 return EFalse;
 }
 iFepMan.SetNotifyPlugin( ETrue );
 iOrientationChanged = EFalse;
 }
 TBool isSplit = IsEditorSupportSplitIme();
+TInt inputLang = iFepMan.InputLanguageCapabilities().iInputLanguageCode;
 // temp code for Chinese split view
-if ( iSharedData.PenInputLanguage() == ELangPrcChinese ||
+if ( inputLang == ELangPrcChinese ||
-iSharedData.PenInputLanguage() == ELangTaiwanChinese ||
+	 inputLang == ELangTaiwanChinese ||
-iSharedData.PenInputLanguage() == ELangHongKongChinese )
+	 inputLang == ELangHongKongChinese )
 {
 isSplit = EFalse;
 }
 iLangMan.SetSplitView(isSplit);
-TInt inputLang = iFepMan.InputLanguageCapabilities().iInputLanguageCode;
-if( ( aSuggestMode == EPluginInputModeFSc ||
-aSuggestMode == EPluginInputModeHwr ||
-aSuggestMode == EPluginInputModeFingerHwr )
-&& ( iSharedData.PenInputLanguage() == ELangPrcChinese
-|| iSharedData.PenInputLanguage() == ELangHongKongChinese
-|| iSharedData.PenInputLanguage() == ELangTaiwanChinese) )
-{
-// Solution for HWR can not be in used after switched to latin-only editor.
-inputLang = iSharedData.PenInputLanguage();
-}
 MAknFepManagerInterface* fepUI = iLangMan.GetPluginInputFepUiL(
 aSuggestMode,
 inputLang,
 uiLanguage,
 &iPenInputServer);
 iCurrentPluginInputFepUI = fepUI;
 if ( iCurrentPluginInputFepUI )
 {
-iPenInputServer.DimUiLayout(EFalse);
+// iPenInputServer.DimUiLayout(EFalse);
 AddCurrentWinToOpenListL();
 if (iPluginInputMode == EPluginInputModeItut)
 {
 iIndicatorImgID = 0;
 if( aRestore && !iSharedData.QwertyInputMode() && iFepMan.InputMode() == ELatin)
 {
 	    RestorePredictStateL();
 //  comment out the following code
-//if ( iFepMan.EditorType() == CAknExtendedInputCapabilities::EPhoneNumberEditor )
+if ( iFepMan.EditorType() == CAknExtendedInputCapabilities::EPhoneNumberEditor
-//    {
+&& !iOrientationChangedfromUI )
-//    if( AknTextUtils::NumericEditorDigitType() == EDigitTypeEasternArabicIndic ||
+{
-//        AknTextUtils::NumericEditorDigitType() == EDigitTypeDevanagari ||
+if( AknTextUtils::NumericEditorDigitType() == EDigitTypeEasternArabicIndic ||
-//        AknTextUtils::NumericEditorDigitType() == EDigitTypeArabicIndic )
+AknTextUtils::NumericEditorDigitType() == EDigitTypeDevanagari ||
-//        {
+AknTextUtils::NumericEditorDigitType() == EDigitTypeArabicIndic )
-//        iFepMan.TryChangeModeL( ENativeNumber );
+{
-//        }
+iFepMan.TryChangeModeL( ENativeNumber );
-//    else
+}
-//        {
+else
-//        iFepMan.TryChangeModeL( ENumber );
+{
-//        }
+iFepMan.TryChangeModeL( ENumber );
-//    }
+}
+}
 }
 //iFepMan.UpdateCbaL( NULL );
 iFepMan.UiInterface()->TouchPaneSetInputMethodIconActivated(EFalse);
 if(!bOpen )
 {
 return;
 }
-if( iInMenu && iCurEditor == iFepMan.FepAwareTextEditor() )
+if( iInMenu &&
-{
+	( iCurEditor == iFepMan.FepAwareTextEditor() || iLaunchSCTInSpell ) )
+{
+iLaunchSCTInSpell = EFalse;
+#ifdef RD_UI_TRANSITION_EFFECTS_POPUPS
+if ( PluginInputMode() == EPluginInputModeFSQ
+&& iSharedData.ThemeEffectsEnabled())
+{
+User::After(1);//waiting for menu cancel effect
+}
+#endif
 ResetMenuState();
 			// If need to open setting app automatically,
 			// do not open Touch window again.
 			TBool langChange = iCurLanguage != iSharedData.InputTextLanguage();
 NotifyLayoutL( aOpenMode, aSuggestRange, aCleanContent );
 //    iPenInputServer.UpdateAppInfo(KNullDesC, EAppIndicatorMsg);
 iPluginInputMode =  (TPluginInputMode)iLangMan.CurrentImePlugin()->CurrentMode();
+iPenInputServer.SetDataQueryPopped(IsDisplayDataQuery());
 //adjust VKB window if data query dialog is displaying
 if(IsDisplayDataQuery())
 {
 RDrawableWindow* focusWin =
 eventUp.SetTip( ETrue );
 CCoeEnv::Static()->WsSession().SimulateRawEvent( eventUp );
 }
-else if ( keyEvent.iCode >= EKeyApplication27
+else if ( keyEvent.iCode >= EKeyApplication27 && !( (iLangMan.InputLanguage() == ELangFarsi) && EnableITIOnFSQ())
 || (iFepMan.IsFeatureSupportedJapanese()
 && iFepMan.InputMode() == EHiraganaKanji
 && edit
 && (EPtiKey0 <= keyEvent.iCode && keyEvent.iCode <= EPtiKey9)
 )
 // commit inline if necessary
 if ( iFepMan.UncommittedText().Length() > 0 )
 {
 iFepMan.CommitInlineEditL();
 iFepMan.PtiEngine()->CommitCurrentWord();
+iFepMan.TryCloseUiL();
+TKeyEvent keyEventUpdateCase = {EKeyF19, EStdKeyNull, 0, 0};
+env->SimulateKeyEventL(keyEventUpdateCase, EEventKey);
 }
 // set flag to ensure not to be handled by key catcher.
 iFepMan.SetFlag(CAknFepManager::EFlagPassNextKey);
 env->SimulateKeyEventL(keyEvent, EEventKey);
 		iFepMan.ClearFlag(CAknFepManager::EFlagPassNextKey);
 iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputFingerSpelling, 0);
 SetPromptText( aCleanContent );
 }
 else
 {
-if ( !iInSpellMode )
+			SetITUTSpellingStateL(ETrue);
-	{
-				SetITUTSpellingStateL(ETrue);
-				iInSpellMode = ETrue;
-	}
 iIndicatorImgID = 0;
 iIndicatorTextID = 0;
 }
 UpdateITUTIndicator();
 }
 	{
 iSpell = CAknFepUiSpellContainer::NewL(editorFlag, editorCase, editorSCTResId, IsEditorSupportSplitIme());
 	}
 else
 	{
+iSpell->InputPane()->InputWin()->SetAknEditorCurrentCase(editorCase);
+iSpell->InputPane()->InputWin()->SetAknEditorCurrentInputMode(EAknEditorTextInputMode);
 iSpell->MakeVisible( ETrue );
 iSpell->SetInputWinFocus( ETrue );
 	}
 iSpell->SetInputWinObserver(this);
 }
 }
 return resId;
 }
-void CAknFepPluginManager::SetInSpellModeFlag( TBool aFlag )
-	{
-	iInSpellMode = aFlag;
-	}
 void CAknFepPluginManager::SetPromptText( TBool aCleanContent )
 {
 if (IsDimed() && !iResourceChange)
 {
 {
 HBufC* unCommitedText = HBufC::NewL( unCommitedLen );
 TPtr unCommitedTextPtr = unCommitedText->Des();
 TInt startPos = iFepMan.UncommittedText().LowerPos();
 MCoeFepAwareTextEditor* edit = iFepMan.FepAwareTextEditor();
-edit->GetEditorContentForFep( unCommitedTextPtr,
+if ( edit )
-startPos, unCommitedLen );
+	{
+edit->GetEditorContentForFep( unCommitedTextPtr,
+startPos, unCommitedLen );
+	}
 		iFepMan.PtiEngine()->SetCurrentWord( *unCommitedText );
 		delete unCommitedText;
 		unCommitedText = NULL;
 }
 ( caps & CAknExtendedInputCapabilities::EInputEditorPartialScreen );
 }
 //Normal editors
 CAknEdwinState* state = iFepMan.EditorState();
+if (iCurEditor && state == NULL)
+		state = static_cast<CAknEdwinState *> (iCurEditor->Extension1()->State(KNullUid));
 if ( state )
 {
 return EAknEditorFlagEnablePartialScreen ==
 ( state->Flags() & EAknEditorFlagEnablePartialScreen );
 }

branch	RCL_3
changeset 18	c8fb4cf7b3ae
parent 14	e6a39382bb9c
child 19	5e18d8c489d6