MCL/sf/mw/inputmethods: comparison fep/aknfep/src/AknFepManager.cpp

equal deleted inserted replaced

-:e6a39382bb9c
+:c8fb4cf7b3ae
 // When go into this section,
 // touch ui won't be closed by ClosePluginInputUiL,
 // but need to restore fep state here
 if ( iFepPluginManager )
 	{
-	iFepPluginManager->ResetItiStateL();
+TRAP_IGNORE(iFepPluginManager->ResetItiStateL());
 	}
 #endif
 // Close UI
 if ( FepUI())
 {
 SendEventsToPluginManL( EPluginEditorActivate );
 break;
 case EAknClosePenInputRequest:
 if ( iFepPluginManager )
 {
-// Fix bug ou1cimx1#225126, editor team asks that the parameter is EFalse.
 iFepPluginManager->ClosePluginInputModeL( EFalse );
 }
 break;
 case EAknEdwinStatePromptUpdate:
 SendEventsToPluginManL( EPluginPromptChanged );
 // whenever focus cahnged happen, internally
 // editor treat cursorposition change.
 // In between, if editor context not in inline edit state.
 // Try to update the case editor gets the focus, and editor
 // context come in inline state.
-				//iCaseMan->UpdateCase(ENullNaviEvent);
+				iCaseMan->UpdateCase( ENullNaviEvent );
 break;
 default:
 break;
 }
 CCoeEnv* env = CCoeEnv::Static();
 TKeyEvent keyEvent = {EKeyCBA2, EStdKeyNull, 0, 0};
 env->SimulateKeyEventL(keyEvent,EEventKey);
 iFepPluginManager->ResetMenuState();
 iFepPluginManager->RemoveLastFocusedWinFromOpenList();
-// Fix bug ou1cimx1#225126, editor team asks that the parameter is EFalse.
 iFepPluginManager->ClosePluginInputModeL( EFalse );
 }
 }
 #endif // RD_SCALABLE_UI_V2
 }
 {
 CommitInlineEditL();
 HBufC* spell = iFepPluginManager->SpellTextInput();
 iFepPluginManager->SetITUTSpellingStateL(EFalse);
 iFepPluginManager->HideSpellEditor();
-iFepPluginManager->SetInSpellModeFlag( EFalse );
 if (spell)
 {
 CleanupStack::PushL(spell);
 TPtr text = spell->Des();
 */
 #ifdef RD_SCALABLE_UI_V2
 if (iFepPluginManager->IsSpellVisible())
 {
 TRAP_IGNORE(iFepPluginManager->SetITUTSpellingStateL(EFalse));
 iFepPluginManager->HideSpellEditor();
-iFepPluginManager->SetInSpellModeFlag( EFalse );
 TRAP_IGNORE(UpdateCbaL(NULL));
 if (iFepPluginManager->CaseUpdatesSupressed())
 {
 SetFlag(EFlagSupressAutoUpdate);
 	}
 void CAknFepManager::HandleChangeInFocusL()
 {
 // Closing SCT has done focus change, so here just reset the flag.
-#ifdef RD_SCALABLE_UI_V2
-if(iDisalbleFocusChangeForSCT)
-{
-iDisalbleFocusChangeForSCT = EFalse;
-return;
-}
-#endif
 // dim state changed, need fetch it again.
 SendEventsToPluginManL(EPluginEnableFetchDimState);
 //The CCPU flag ECcpuStateShiftkeyWasPressedBeforeLosingFocus suggests that the candidate list was closed
 //with a long key press of shift key. If so then, FEP needs to set the EFlagShiftKeyDepressed for the CCPU mode to work
 break;
 }
 case ELangVietnamese:
 {
-validInlineCharacter = (aCharacter.IsAlpha() &&
+// For full screen qwerty, validInlineCharacter is true
-!((category & TChar::ELetterOtherGroup))) ||
+if( !( iFepPluginManager && iFepPluginManager->EnableITIOnFSQ() ) )
-((category == TChar::EMarkGroup) &&
+{
-(bdCategory == TChar::ENonSpacingMark));
+validInlineCharacter = (aCharacter.IsAlpha() &&
+!((category & TChar::ELetterOtherGroup))) ||
+((category == TChar::EMarkGroup) &&
+(bdCategory == TChar::ENonSpacingMark));
+}
 break;
 }
 case ELangThai:
 {
 validInlineCharacter = (!(aCharacter.IsSpace() || (aCharacter == 0x2029))) &&
 #else
 InternalFepUI()->SetMode(iMode, IsPredictive(), iQwertyInputMode);
 #endif
 iHashKeyMan->SetMode(iMode, IsPredictive());
 // ensure editor is aware of new fep mode
+TCursorSelection curSel;
 if ( IsFepAwareTextEditor() )
 {
 EditorState()->SetCurrentInputMode(EditorModeFromFepMode(aMode));
-iInputCapabilities.FepAwareTextEditor()->GetCursorSelectionForFep(iUncommittedText);
+iInputCapabilities.FepAwareTextEditor()->GetCursorSelectionForFep(curSel);
 AdjustCursorTypeForCurrentPosition();
 }
 // when cursor is in between two words and SCT is launched and
 // cancel key is pressed, dont move the cursor at the end of
 // second word.
-if (WesternPredictive(aMode) && !iUncommittedText.Length()
+if (WesternPredictive(aMode) && !curSel.Length()
 && CursorInsideWord() && !IsCcpuFlagSet(ECcpuStateSupressCursorMoveToEnd)
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 && (!iSupressCursorMoveToEndChrKeyPressed)
 #endif //RD_INTELLIGENT_TEXT_INPUT
 )
 }
 else
 {
 if ( iLanguageCapabilities.iInputLanguageCode == ELangArabic )
 {
-//iLanguageCapabilities.iLocalDigitType = EDigitTypeArabicIndic;
+iLanguageCapabilities.iLocalDigitType = EDigitTypeArabicIndic;
 aNewState=EArabicIndicNumeric;
 }
 else if ( iLanguageCapabilities.iInputLanguageCode == ELangFarsi
 || iLanguageCapabilities.iInputLanguageCode == ELangUrdu )
 {
-//iLanguageCapabilities.iLocalDigitType = EDigitTypeEasternArabicIndic;
+iLanguageCapabilities.iLocalDigitType = EDigitTypeEasternArabicIndic;
 aNewState=EArabicIndicNumeric;
 }
 else if ( iLanguageCapabilities.iInputLanguageCode == ELangHindi )
 {
 //iLanguageCapabilities.iLocalDigitType = EDigitTypeDevanagari;
 {
 iSharedDataInterface->ResetPredictiveTextOn();
 }
 if ( iFepPluginManager && iFepPluginManager->IsSupportITIOnFSQ() )
 	{
-SendEventsToPluginManL( EPluginUpdatePenInputITIStatus );
+TRAP_IGNORE(SendEventsToPluginManL( EPluginUpdatePenInputITIStatus ));
 	}
 }
 }
 void CAknFepManager::SetWesternAutoComplete( const TBool aWesternAutoComplete )
 sctChars |= EAknCharMapEmotionUse;
 }
 }
 ClearExtendedFlag(EExtendedFlagEdwinEditorDestroyed);
+if ( iFepPluginManager && iFepPluginManager->IsSpellVisible() )
+	{
+iFepPluginManager->SetLaunchSCTInSpell( ETrue );
+	}
 		if (iUiInterface->CharMapDialogL(
 			sctChars,
 			specialChars,
 			charMap,
 			lockNumericKeys,
 TKeyEvent delKey = {8, EStdKeyBackspace, 1, 0};
 CCoeEnv::Static()->SimulateKeyEventL(delKey, EEventKey);
 }
 //There may be several char to be inserted, need disable Focus change to avoid multi-focus change.
 #ifdef RD_SCALABLE_UI_V2
-iDisalbleFocusChangeForSCT = ETrue;
 #endif
 InsertTextFromDialogL(charAsDesc, cursorSelection);
 }
 // Clear dead key, vowel sequence and vietnamese tone mark states.
 iPtiEngine->HandleCommandL(EPtiCommandGetAndClearLastVietnameseChar,
 }
 }
 }
 }
 #ifdef RD_SCALABLE_UI_V2
+iNotifyPlugin = EFalse;
 if( iFepFullyConstructed && iFepPluginManager)
 {
 if (iFepPluginManager->PluginInputMode() == EPluginInputModeItut ||
 iFepPluginManager->PluginInputMode() == EPluginInputModeFSQ ||
 iFepPluginManager->PluginInputMode() == EPluginInputModeFingerHwr)
 else
 {
 HandleChangeInFocus();
 }
 // Set the flag, not change focus for next.
-iDisalbleFocusChangeForSCT = ETrue;
+iNotifyPlugin = ETrue;
 #endif
 }
 else
 {
 iClosePeninputUi = EFalse;
 iStopProcessFocus = EFalse;
 }
 PrepareFepAfterDialogExitL(fepUid);
 }
 }
 /**

branch	RCL_3
changeset 11	c8fb4cf7b3ae
parent 9	e6a39382bb9c
child 12	5e18d8c489d6