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

equal deleted inserted replaced

-:6ceef9a83b1a
+:6defe5d1bd39
 _LIT(KVITU_HLP_MAIN_VIEW, "VITU_HLP_MAIN_VIEW");
 const TInt KDefaultCandidateArraySize = 16;
 const TInt KNumberOfCases = 6;
+const TInt KChineseSpellMode = 100;
+const TInt KWesternSpellMode = 101;
 _LIT_SECURE_ID(KPhoneSecureId, 0x100058b3);
 #define iAvkonAppUi ((CAknAppUi*)CEikonEnv::Static()->EikAppUi())
 TUid AppUidFromWndGroupIdL(TInt aWndGrpId)
 {
 iLastDataQueryWin = NULL;
 iDefaultOrientation = -1;
 iIsInEditWordQueryDlg = EFalse;
 iClosePluginInputMode = EFalse;
 iDimGainForeground = ETrue;
-	// Modify for bug ELZG-7WZC35 begin
 iAlignment = 0;
-// Modify for bug ELZG-7WZC35 end
 }
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::ConstructL
 // (other items were commented in a header)
 }
 else
 {
 curSor.iAnchorPos = iCharStartPostion;
 iLastSubmitCount = curSor.iCursorPos - iCharStartPostion;
-//Fixed bug ID SAHN-7JDDC8
 }
 }
 if (curSor.iAnchorPos<0 ||
 curSor.iAnchorPos>edit->DocumentLengthForFep())
 TBool landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
 if(iSharedData.AutoRotateEnabled())
 {
 if(landscape)
 {
-defaultMode = EPluginInputModeVkb;
+defaultMode = EPluginInputModeFSQ;
 }
 else
 {
 defaultMode = EPluginInputModeItut;
 }
 }
 else
 {
-defaultMode = EPluginInputModeItut;
+if(landscape)
+{
+defaultMode = EPluginInputModeFSQ;
+}
+else
+{
+defaultMode = EPluginInputModeItut;
+}
 }
 TryChangePluginInputModeByModeL(defaultMode,
 EPenInputOpenManually,
 ERangeInvalid);
 }
 break;
+case EPluginUpdatePenInputITIStatus:
+	{
+	if ( iCurrentPluginInputFepUI )
+		{
+iCurrentPluginInputFepUI->HandleCommandL( ECmdPeninputITIStatus,
+iFepMan.WesternPredictive() );
+		}
+	}
+	break;
 default:
 break;
 }
 }
 iAvkonAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationLandscape );
 iFepMan.SetNotifyPlugin( ETrue );
 iOrientationChanged = ETrue;
 }
-		    CCoeEnv::Static()->ScreenDevice()->GetDefaultScreenSizeAndRotation(size);
+		    /*CCoeEnv::Static()->ScreenDevice()->GetDefaultScreenSizeAndRotation(size);
 landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
 if( !landscape )
 {
 iPluginInputMode = tempInputMode;
 aSuggestMode = EPluginInputModeItut;
-}
+}*/
+//
 }
 }
 else if(aSuggestMode == EPluginInputModeFingerHwr
 && iSharedData.InputTextLanguage() == ELangArabic
 && !iSharedData.AutoRotateEnabled())
 &iPenInputServer);
 iCurrentPluginInputFepUI = fepUI;
 if ( iCurrentPluginInputFepUI )
 {
-// fix EVWG-7U73HS
 iPenInputServer.DimUiLayout(EFalse);
 AddCurrentWinToOpenListL();
 if (iPluginInputMode == EPluginInputModeItut)
 {
 if( aRestore && !iSharedData.QwertyInputMode() && iFepMan.InputMode() == ELatin)
 {
 	    RestorePredictStateL();
-// Fix bug EAHN-82C9M7, comment out the following code
+//  comment out the following code
 //if ( iFepMan.EditorType() == CAknExtendedInputCapabilities::EPhoneNumberEditor )
 //    {
 //    if( AknTextUtils::NumericEditorDigitType() == EDigitTypeEasternArabicIndic ||
 //        AknTextUtils::NumericEditorDigitType() == EDigitTypeDevanagari ||
 //        AknTextUtils::NumericEditorDigitType() == EDigitTypeArabicIndic )
 //        {
 //        iFepMan.TryChangeModeL( ENumber );
 //        }
 //    }
 }
-//iFepMan.UpdateCbaL( NULL ); //pls refer to bug ESZG-7G7CGF
+//iFepMan.UpdateCbaL( NULL );
 iFepMan.UiInterface()->TouchPaneSetInputMethodIconActivated(EFalse);
 	if ( iFepMan.EditorState() )
 	{
 if( aResetState )
 {
 iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputWindowClose);
 }
-//iFepMan.UpdateCbaL(NULL); //pls refer to bug ESZG-7G7CGF
+//iFepMan.UpdateCbaL(NULL);
 if (iPluginInputMode == EPluginInputModeItut)
 {
 iIndicatorImgID = 0;
 iIndicatorTextID = 0;
 if ( (iPluginInputMode == EPluginInputModeFSQ || (iPluginInputMode == EPluginInputModeFingerHwr
 	     && iSharedData.InputTextLanguage() == ELangArabic)) && iOrientationChanged
 	                                            && !iITISettingDialogOpen )
 {
-		// This TRAP_IGNORE is essential to fix bug ECJA-7JDCKR, never delete it
+		// This TRAP_IGNORE is essential , never delete it
 TRAP_IGNORE( iAvkonAppUi->SetOrientationL( (CAknAppUiBase::TAppUiOrientation)iDefaultOrientation ) );
 iOrientationChanged = EFalse;
 }
 // Notify editor the touch window has been closed
 break;
 case EKeyEscape:
 {
 			ClosePluginInputUiL( ETrue );
 			iFepMan.SetNotifyPlugin( EFalse );
-DestroySpellEditor();
+HideSpellEditor();
 }
 break;
 }
 }
 if( iInMenu && iCurEditor == iFepMan.FepAwareTextEditor() )
 {
 ResetMenuState();
 InformMfneUiStatusL( EFalse );
 			// If need to open setting app automatically,
-			// do not open Touch window again. Fix for ESCN-7NVAWF
+			// do not open Touch window again.
 			TBool langChange = iCurLanguage != iSharedData.InputTextLanguage();
 			TryChangePluginInputModeByModeL(
 							(TPluginInputMode)iSharedData.PluginInputMode(),
 				langChange?EPenInputOpenManually:EPenInputOpenAutomatically,
 return EFalse;
 }
 return ETrue;
 	}
+void CAknFepPluginManager::SetICFTextForSpellL()
+	{
+	MCoeFepAwareTextEditor* edit = iFepMan.FepAwareTextEditor();
+	if ( edit )
+		{
+		TInt length = edit->DocumentLengthForFep();
+		HBufC* icfTextBuf = HBufC::NewLC( length );
+	TPtr icfText = icfTextBuf->Des();
+		edit->GetEditorContentForFep( icfText, 0, length );
+		TCursorSelection curSel;
+		edit->GetCursorSelectionForFep( curSel );
+		TInt curPos = curSel.iCursorPos;
+		HBufC* titleStr = StringLoader::LoadL(R_AKNFEP_PROMPT_TEXT);
+		CleanupStack::PushL( titleStr );
+		TPtr16 promptText = titleStr->Des();
+		TFepSpellICFDisplayContent displayContent;
+		displayContent.iCurPos = curPos;
+		displayContent.iICFText.Set( icfText );
+		displayContent.iPromptText.Set( promptText );
+		iCurrentPluginInputFepUI->HandleCommandL(
+	ECmdPeninputSpellICFDisplayContent,
+reinterpret_cast<TInt>(&displayContent));
+CleanupStack::PopAndDestroy( titleStr );
+		CleanupStack::PopAndDestroy( icfTextBuf );
+		}
+	}
 TBool CAknFepPluginManager::SetSyncCurSelIcfDataL( TFepInputContextFieldData& aIcfData )
 	{
 	MCoeFepAwareTextEditor* edit = iFepMan.FepAwareTextEditor();
 	if ( ExistInlineText() ) // inline
 {
 CCoeEnv::Static()->WsSession().SimulateRawEvent( eventDown );
 TRawEvent eventUp;
 eventUp.Set( TRawEvent::EKeyUp, EStdKeyBackspace);
 eventUp.SetTip( ETrue );
 CCoeEnv::Static()->WsSession().SimulateRawEvent( eventUp );
+break;
 }
 else if ( keyEvent.iScanCode == EStdKeyEnter && iHasSWEventCap )
 {
 TRawEvent eventDown;
 eventDown.Set( TRawEvent::EKeyDown, EStdKeyEnter );
 }
 else if ( EnableITIOnFSQ() )
 {
 // For addition of ITI features on FSQ.
 // If FSQ is opened with ITI enabled, ensure keycatcher to handle key events
 // else, remain the old logic.
+// But, simulating raw key events is needed, as raw key down + raw key up is a complete key process,
+// then EEventDown, EEventKey, EEventUp will be generated, each event may be used differently.
 if ( IsITISupportedKey( keyEvent ) )
 {
 // check if need to change current text case
 TPtiTextCase textCase =
 CaseForMappedCharacter( TChar( keyEvent.iCode ) );
 						if ( !IsDeadKeyCode( keyEvent.iCode ) && IsNeedToChangeTextCase( textCase ) )
 {
 iFepMan.PtiEngine()->SetCase( textCase );
 }
-env->SimulateKeyEventL(keyEvent, EEventKey);
+TRawEvent eventDown;
-}
+eventDown.Set( TRawEvent::EKeyDown, keyEvent.iScanCode );
-else if ( keyEvent.iScanCode == EStdKeyBackspace
+iAvkonAppUi->DisableNextKeySound( keyEvent.iScanCode );
-|| keyEvent.iScanCode == EStdKeyEnter
+CCoeEnv::Static()->WsSession().SimulateRawEvent( eventDown );
-|| keyEvent.iScanCode == EStdKeySpace )
-{
+TRawEvent eventUp;
-// For these keys, clear the flag to make sure ptiengine handle this key.
+eventUp.Set( TRawEvent::EKeyUp, keyEvent.iScanCode );
-env->SimulateKeyEventL(keyEvent, EEventKey);
+CCoeEnv::Static()->WsSession().SimulateRawEvent( eventUp );
 }
 else
 {
 // When FSQ opened with ITI features enabled,
 // but key is not supported by ITI
 				}
 			}
 			break;
 case EPluginInputModeVkb:
 {
+// When in Capacitive hardware, there should be no MiniVKB.
+// So we use FSQ for Landscape mode and ITUT for Portrait instead.
+if( FeatureManager::FeatureSupported( KFeatureIdFfCapacitiveDisplay ))
+{
+TPixelsTwipsAndRotation size;
+CCoeEnv::Static()->ScreenDevice()->GetDefaultScreenSizeAndRotation(size);
+TBool landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
+if ( landscape ) // LandScape
+{
+aSuggestMode = EPluginInputModeFSQ;
+}
+else // Portrait
+{
+aSuggestMode = EPluginInputModeItut;
+}
+}
 }
 break;
 case EPluginInputModeFSQ:
 {
 if ((disableLayouts & aSuggestMode))
 }
 UpdateITUTIndicator();
 }
 else
 {
-DestroySpellEditor();
+HideSpellEditor();
 if (PluginInputMode() == EPluginInputModeFSQ ||
 PluginInputMode() == EPluginInputModeVkb ||
 PluginInputMode() == EPluginInputModeFingerHwr)
 {
 iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputCharacterPreview,
 TChar minusSign ='-';
 keymapRes->Des().Append(decimalSep);
 keymapRes->Des().Append(minusSign);
-if( keymapRes )
+CleanupStack::PushL(keymapRes);
-{
+iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputEditorCustomNumericKeyMap,
-CleanupStack::PushL(keymapRes);
-iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputEditorCustomNumericKeyMap,
 reinterpret_cast<TInt>(keymapRes) );
 CleanupStack::PopAndDestroy(keymapRes);
 return;
-}
 }
 iCurrentPluginInputFepUI->SetNumberModeKeyMappingL(EAknEditorPlainNumberModeKeymap);
 }
 }
 void CAknFepPluginManager::SetITUTSpellingStateL(TBool aState)
 {
 if (aState)
 {
+		SetICFTextForSpellL();
 iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputFingerSpelling, 1);
 HBufC* titleStr = StringLoader::LoadL(R_AKNFEP_PROMPT_TEXT);
 CleanupStack::PushL(titleStr);
 }
 void CAknFepPluginManager::DisplaySpellEditorL(const TInt aEditorFlag,
 const TDesC& aInitText,
 TCursorSelection aCurSel)
 {
+	TInt inputLang = iFepMan.InputLanguageCapabilities().iInputLanguageCode;
+	if ( inputLang == ELangPrcChinese || inputLang == ELangHongKongChinese ||
+		 inputLang == ELangTaiwanChinese )
+		{
+	    iCurrentPluginInputFepUI->HandleCommandL(
+	    		ECmdPeninputSpellLanguageMode, KChineseSpellMode );
+		}
+	else
+		{
+		iCurrentPluginInputFepUI->HandleCommandL(
+				ECmdPeninputSpellLanguageMode, KWesternSpellMode );
+		}
 TInt editorFlag = 0;
 TInt editorCase = 0;
 TInt editorSCTResId = 0;
 if (aEditorFlag)
 else if (!editorSCTResId)
 {
 editorSCTResId = R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG;
 }
-delete iSpell;
-iSpell = NULL;
 iSpellCba = ESpellCBACancelEmpty;
 iSpellOn = ETrue;
-iSpell = CAknFepUiSpellContainer::NewL(editorFlag, editorCase, editorSCTResId, IsEditorSupportSplitIme());
+if( !iSpell )
+	{
+iSpell = CAknFepUiSpellContainer::NewL(editorFlag, editorCase, editorSCTResId, IsEditorSupportSplitIme());
+	}
+else
+	{
+iSpell->MakeVisible( ETrue );
+iSpell->SetInputWinFocus( ETrue );
+	}
 iSpell->SetInputWinObserver(this);
 iSpell->InputPane()->SetInputWinTextL(&aInitText);
 iSpell->InputPane()->InputWin()->SetSelectionL(aCurSel.iCursorPos, aCurSel.iAnchorPos);
 AddWinToOpenListL( iSpell->DrawableWindow() );
 }
-void CAknFepPluginManager:: DestroySpellEditor()
+void CAknFepPluginManager::HideSpellEditor()
 {
 iSpellOn = EFalse;
 iSpellCba = ESpellCBANone;
-delete iSpell;
+// Hide spell container instead to delete spell container to avoid flicker
-iSpell = NULL;
+if( iSpell )
+	{
+iSpell->SetInputWinObserver( NULL );
+iSpell->SetInputWinFocus( EFalse );
+iSpell->MakeVisible( EFalse );
+	}
 }
 HBufC*  CAknFepPluginManager::SpellTextInput()
 {
 HBufC* textInput = NULL;
 reinterpret_cast<TInt>(&promptText)));
 }
 void CAknFepPluginManager::SetIcfAlignment()
 {
-	// Modify for bug ELZG-7WZC35 begin
+// spell editor is not really background editor.
-// fix TINA-7HNEKA, spell editor is not really background editor.
 //if ( iSpellOn )
 //    {
 //    return;
 //    }
-	// Modify for bug ELZG-7WZC35 end
 TUint cap = iFepMan.ExtendedInputCapabilities();
 TInt alignment = EAknEditorAlignNone;
 }
 else if (cap & CAknExtendedInputCapabilities::EInputEditorAlignLeft)
 {
 alignment = EAknEditorAlignLeft;
 }
-	// Modify for bug ELZG-7WZC35 begin
 else
 {
 alignment = iAlignment;
 }
-// Modify for bug ELZG-7WZC35 end
 TRAP_IGNORE(iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputSetTextAlignment,
 alignment));
-	// Modify for bug ELZG-7WZC35 begin
 iAlignment = alignment;
-// Modify for bug ELZG-7WZC35 end
 }
 void CAknFepPluginManager::HasNoFreeSpace()
 	{
 if ( iCurrentPluginInputFepUI &&
 aData.LowerCase();
 return;
 }
 for( TInt i = 0; i<aData.Length(); i++ )
 	   			{
-	   			if ( aData[i] != 0x03C2 ) //fix CSTI-7THJR2, final sigma exists in capslock mode
+	   			if ( aData[i] != 0x03C2 ) //final sigma exists in capslock mode
 	   				{
 	   				aData.UpperCase();
 	   				}
 			}
 		}
 iFepMan.PtiEngine()->SetInputMode( EPtiEngineQwertyPredictive );
 // Find scancode by keycode from qwerty keymapping
 TInt retKey = keymapping->KeyForCharacter( aKeyCode );
 // Restore the old input mode
 iFepMan.PtiEngine()->SetInputMode( oldInputMode );
+#if defined(__WINS__)
+// In Emulator, Window server will not handle EPtiKeyQwertyPlus key raw event
+// as normal, it will not produce EKeyEvent event for EPtiKeyQwertyPlus key.
+// And winodw server will handle EStdKeyNkpPlus key raw event as normal.
+if (retKey == EPtiKeyQwertyPlus)
+{
+retKey = EStdKeyNkpPlus;
+}
+#endif
 return retKey;
 }
 return EPtiKeyNone;
 #else
 return EPtiKeyNone;
 // ---------------------------------------------------------------------------
 //
 TBool CAknFepPluginManager::IsITISupportedKey( const TKeyEvent& aKeyEvent )
 {
 // ITI supported conditions
-// 1. scan code != EPtiKeyNone
+// 1. Not in keymapping: some function keys, space, enter, backspace
-// 2. Basic alpha characters
+// 2. In keymappings: keys on AB/Native range.
-// 3.
 #ifdef RD_INTELLIGENT_TEXT_INPUT
-if ( aKeyEvent.iScanCode != EPtiKeyNone
+if ( aKeyEvent.iScanCode == EStdKeySpace
-&& ( iPluginPrimaryRange == ERangeNative
+	 || aKeyEvent.iScanCode == EStdKeyEnter
-|| iPluginPrimaryRange == ERangeEnglish
+	 || aKeyEvent.iScanCode == EStdKeyBackspace
-|| ( iPluginPrimaryRange == 0 && iFepMan.InputMode() != ENumber
+	 || ( aKeyEvent.iScanCode != EPtiKeyNone
-&& iFepMan.InputMode() != ENativeNumber) ) )
+	      && ( iPluginPrimaryRange == ERangeNative
+	           || iPluginPrimaryRange == ERangeEnglish
+	           || ( iPluginPrimaryRange == 0 && iFepMan.InputMode() != ENumber
+	                   && iFepMan.InputMode() != ENativeNumber ) ) ) )
 {
 return ETrue;
 }
 return EFalse;
 #else

branch	RCL_3
changeset 10	6defe5d1bd39
parent 8	6ceef9a83b1a
child 12	4eb1ae11334f