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

equal deleted inserted replaced

-:f5a1e66df979
+:a47de9135b21
 _LIT(KVQWERTY_HLP_MAIN_VIEW, "VQWERTY_HLP_MAIN_VIEW");
 _LIT(KVITU_HLP_MAIN_VIEW, "VITU_HLP_MAIN_VIEW");
 const TInt KDefaultCandidateArraySize = 16;
 const TInt KNumberOfCases = 6;
+_LIT_SECURE_ID(KPhoneSecureId, 0x100058b3);
 #define iAvkonAppUi ((CAknAppUi*)CEikonEnv::Static()->EikAppUi())
 TUid AppUidFromWndGroupIdL(TInt aWndGrpId)
 {
 RWsSession &ws = CCoeEnv::Static()->WsSession();
 TInt subrange = *(TInt* )( (TInt8* )(pBuf.Ptr()) + sizeof(TInt) );
 iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputJapaneseSetSubRange,
 subrange);
 }
 SyncIndicatorWithPluginRangeL();
+if ( PluginInputMode() == EPluginInputModeFSQ )
+{
+					UpdateFSQIndicator();
+}
 }
 break;
 case ESignalLayoutUIChanged:
 {
 TInt8 *ptrData = (TInt8* )(pBuf.Ptr());
 {
 if( iPluginInputMode == EPluginInputModeNone &&
 aEventType != EPluginEditorActivate &&
 aEventType != EPluginActivate &&
-aEventType != EPluginResourceChanged )
+aEventType != EPluginResourceChanged &&
+aEventType != EPluginSwitchMode &&
+aEventType != EPluginSwitchToPortrait &&
+aEventType != EPluginSwitchToLandscape)
 {
 return;
 }
 switch ( aEventType )
 }
 break;
 case EPluginUpdateIndicator:
 {
 UpdateITUTIndicator();
+if ( PluginInputMode() == EPluginInputModeFSQ )
+{
+				UpdateFSQIndicator();
+}
 }
 break;
 case EPluginPreview:
 {
 iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputCharacterPreview,
 case EPluginHideTooltip:
 	{
 	HideTooltipOnFSQL();
 	}
 	break;
+case EPluginSwitchToPortrait:
+{
+iSharedData.SetDefaultArabicFingerHwrOrientation(0);
+TryChangePluginInputModeByModeL(EPluginInputModeFingerHwr,
+EPenInputOpenManually,
+ERangeInvalid);
+}
+break;
+case EPluginSwitchToLandscape:
+{
+iSharedData.SetDefaultArabicFingerHwrOrientation(1);
+TryChangePluginInputModeByModeL(EPluginInputModeFingerHwr,
+EPenInputOpenManually,
+ERangeInvalid);
+}
+break;
+case EPluginSwitchMode:
+{
+iPreferredUiMode = EFalse;
+TPluginInputMode defaultMode = EPluginInputModeNone;
+TPixelsTwipsAndRotation size;
+CCoeEnv::Static()->ScreenDevice()->GetDefaultScreenSizeAndRotation(size);
+TBool landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
+if(iSharedData.AutoRotateEnabled())
+{
+if(landscape)
+{
+defaultMode = EPluginInputModeVkb;
+}
+else
+{
+defaultMode = EPluginInputModeItut;
+}
+}
+else
+{
+defaultMode = EPluginInputModeItut;
+}
+TryChangePluginInputModeByModeL(defaultMode,
+EPenInputOpenManually,
+ERangeInvalid);
+}
+break;
 default:
 break;
 }
 }
 if ( disableFSQ )
 {
 iPenInputServer.SetDisabledLayout( EPluginInputModeFSQ );
 }
-if ( aSuggestMode == EPluginInputModeFSQ )
+if ( aSuggestMode == EPluginInputModeFSQ || (aSuggestMode == EPluginInputModeFingerHwr
+	     && iSharedData.InputTextLanguage() == ELangArabic
+	     && iSharedData.AutoRotateEnabled()))
 {
 TPluginInputMode tempInputMode = iPluginInputMode;
-iPluginInputMode = EPluginInputModeFSQ;
+iPluginInputMode = aSuggestMode;
-if (disableFSQ )
+if (disableFSQ && (aSuggestMode != EPluginInputModeFingerHwr))
 {
 iPluginInputMode = tempInputMode;
 aSuggestMode = EPluginInputModeItut;
 }
 else
 {
-if ( !iSharedData.AutoRotateEnabled() )
+if ( (!iSharedData.AutoRotateEnabled()
+&& aSuggestMode == EPluginInputModeFSQ) ||
+(aSuggestMode == EPluginInputModeFingerHwr))
 {
 iFepMan.SetNotifyPlugin( EFalse );
 iAvkonAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationLandscape );
 iFepMan.SetNotifyPlugin( ETrue );
 iOrientationChanged = ETrue;
 landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
 if( !landscape )
 {
 iPluginInputMode = tempInputMode;
 aSuggestMode = EPluginInputModeItut;
+}
+}
+}
+else if(aSuggestMode == EPluginInputModeFingerHwr
+&& iSharedData.InputTextLanguage() == ELangArabic
+&& !iSharedData.AutoRotateEnabled())
+{
+TInt hOrient = iSharedData.DefaultArabicFingerHwrOrientation();
+if(landscape)
+{
+if(!hOrient)
+{
+iAvkonAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationPortrait );
+iOrientationChanged = ETrue;
+}
+}
+else
+{
+if(hOrient)
+{
+iAvkonAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationLandscape );
+iOrientationChanged = ETrue;
 }
 }
 }
 else if ( iOrientationChanged )
 {
 		    {
 		    iFepMan.UpdateCbaL( NULL );
 		    }
 // Notify application touch window state
-NotifyAppUiImeTouchWndState( ETrue );
+NotifyAppUiImeTouchWndStateL( ETrue );
 rtn = ETrue;
 }
 else
 {
 }
 if( aRestore && !iSharedData.QwertyInputMode() && iFepMan.InputMode() == ELatin)
 {
 	    RestorePredictStateL();
-if ( iFepMan.EditorType() == CAknExtendedInputCapabilities::EPhoneNumberEditor )
-{
+// Fix bug EAHN-82C9M7, comment out the following code
-if( AknTextUtils::NumericEditorDigitType() == EDigitTypeEasternArabicIndic ||
+//if ( iFepMan.EditorType() == CAknExtendedInputCapabilities::EPhoneNumberEditor )
-AknTextUtils::NumericEditorDigitType() == EDigitTypeDevanagari ||
+//    {
-AknTextUtils::NumericEditorDigitType() == EDigitTypeArabicIndic )
+//    if( AknTextUtils::NumericEditorDigitType() == EDigitTypeEasternArabicIndic ||
-{
+//        AknTextUtils::NumericEditorDigitType() == EDigitTypeDevanagari ||
-iFepMan.TryChangeModeL( ENativeNumber );
+//        AknTextUtils::NumericEditorDigitType() == EDigitTypeArabicIndic )
-}
+//        {
-else
+//        iFepMan.TryChangeModeL( ENativeNumber );
-{
+//        }
-iFepMan.TryChangeModeL( ENumber );
+//    else
-}
+//        {
-}
+//        iFepMan.TryChangeModeL( ENumber );
+//        }
+//    }
 }
 //iFepMan.UpdateCbaL( NULL ); //pls refer to bug ESZG-7G7CGF
 iFepMan.UiInterface()->TouchPaneSetInputMethodIconActivated(EFalse);
 iIndicatorTextID = 0;
 }
 }
 }
-if ( iPluginInputMode == EPluginInputModeFSQ  && iOrientationChanged
+if ( (iPluginInputMode == EPluginInputModeFSQ || (iPluginInputMode == EPluginInputModeFingerHwr
+	     && iSharedData.InputTextLanguage() == ELangArabic)) && iOrientationChanged
 	                                            && !iITISettingDialogOpen )
 {
 		// This TRAP_IGNORE is essential to fix bug ECJA-7JDCKR, never delete it
 TRAP_IGNORE( iAvkonAppUi->SetOrientationL( (CAknAppUiBase::TAppUiOrientation)iDefaultOrientation ) );
 iOrientationChanged = EFalse;
 }
 // Notify editor the touch window has been closed
-NotifyAppUiImeTouchWndState( EFalse );
+NotifyAppUiImeTouchWndStateL( EFalse );
 iCharStartPostion = KInvalidValue;
 }
 // ---------------------------------------------------------------------------
 {
 return;
 }
 if ( iPluginInputMode == EPluginInputModeFSQ &&
-!iSharedData.AutoRotateEnabled())
+!iSharedData.AutoRotateEnabled() || (iPluginInputMode == EPluginInputModeFingerHwr
+	     && iSharedData.InputTextLanguage() == ELangArabic))
 {
 return;
 }
 TBool setResChange = EFalse;
 ClosePluginInputUiL( ETrue );
 }
 break;
 case EKeyEscape:
 {
 			ClosePluginInputUiL( ETrue );
+			iFepMan.SetNotifyPlugin( EFalse );
 DestroySpellEditor();
 }
 break;
 }
 }
 aMenuPane->SetItemDimmed(
 EPenInputCmdRecognitionWithDictionary, disableDic);
 }
 // add some input mode in option menu
-TBool isSplitView = IsEditorSupportSplitIme();
-	if(isSplitView)
+	TInt disabledInputMode = iPenInputServer.DisabledLayout();
+	TInt curInputMode = iLangMan.CurrentImePlugin()->CurrentMode();
+	TBool isChinese = iFepMan.IsChineseInputLanguage();
+	if ( !isChinese && ( curInputMode == EPluginInputModeItut ) &&
+	        !( disabledInputMode & EPluginInputModeFSQ ))
 	    {
-	    TInt disabledMode = iPenInputServer.DisabledLayout();
+	    aMenuPane->SetItemDimmed( EPeninputCmdFSQ, EFalse );
-	    TInt curMode =  iLangMan.CurrentImePlugin()->CurrentMode();
-	    if(!(disabledMode & EPluginInputModeFSQ) && curMode != EPluginInputModeFSQ )
-	        {
-	        aMenuPane->SetItemDimmed(EPeninputCmdFSQ, EFalse);
-	        }
-	    if(!(disabledMode & EPluginInputModeItut) && curMode != EPluginInputModeItut)
-	        {
-	        aMenuPane->SetItemDimmed(EPenInputCmdVITUT, EFalse);
-	        }
 	    }
+	if ( !isChinese && ( curInputMode == EPluginInputModeFSQ ) &&
+	        !( disabledInputMode & EPluginInputModeItut ))
+	    {
+	    aMenuPane->SetItemDimmed(EPenInputCmdVITUT, EFalse);
+	    }
+//For arabic finger hwr input orientation.
+TInt index = 0;
+if(iPluginInputMode == EPluginInputModeFingerHwr
+&& (ELangArabic == iSharedData.InputTextLanguage())
+&& (!iSharedData.AutoRotateEnabled()))
+{
+TBool disableMenu = ETrue;
+TPixelsTwipsAndRotation size;
+CCoeEnv::Static()->ScreenDevice()->GetDefaultScreenSizeAndRotation(size);
+TBool landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
+if(landscape && aMenuPane->MenuItemExists(EPenInputCmdHwrInputToPortrait, index))
+{
+disableMenu = EFalse;
+aMenuPane->SetItemDimmed(EPenInputCmdHwrInputToPortrait,disableMenu);
+}
+index = 0;
+if(!landscape && aMenuPane->MenuItemExists(EPenInputCmdHwrInputToLandscape, index))
+{
+disableMenu = EFalse;
+aMenuPane->SetItemDimmed(EPenInputCmdHwrInputToLandscape,disableMenu);
+}
+}
+//For arabic finger hwr switch to key based input.
+index = 0;
+if(aMenuPane->MenuItemExists(
+EPenInputCmdSwitchToVkeyBasedInput, index))
+{
+TBool disableMenu = ETrue;
+if(iPluginInputMode == EPluginInputModeFingerHwr
+&& (ELangArabic == iSharedData.InputTextLanguage()))
+{
+disableMenu = EFalse;
+}
+aMenuPane->SetItemDimmed(EPenInputCmdSwitchToVkeyBasedInput,disableMenu);
+}
+//For arabic finger hwr writing speed.
+index = 0;
+if(aMenuPane->MenuItemExists(
+EPenInputCmdWritingSpeed, index))
+{
+TBool disableMenu = ETrue;
+if(iPluginInputMode == EPluginInputModeFingerHwr
+&& (ELangArabic == iSharedData.InputTextLanguage()))
+{
+disableMenu = EFalse;
+}
+aMenuPane->SetItemDimmed(EPenInputCmdWritingSpeed,disableMenu);
+}
+//For arabic finger hwr guide line.
+index = 0;
+if(aMenuPane->MenuItemExists(
+EPenInputCmdGuidingLine, index))
+{
+TBool disableMenu = ETrue;
+if(iPluginInputMode == EPluginInputModeFingerHwr
+&& (ELangArabic == iSharedData.InputTextLanguage()))
+{
+disableMenu = EFalse;
+}
+aMenuPane->SetItemDimmed(EPenInputCmdGuidingLine,disableMenu);
+}
 iLangMan.CurrentImePlugin()->DynInitMenuPaneL(aMenuPane);
 }
 setting->ShowRecognitionWithDictionaryL();
 CleanupStack::PopAndDestroy(setting);
 TInt inputLanguage = iSharedData.InputTextLanguage();
 }
+// ---------------------------------------------------------------------------
+// CAknFepPluginManager::LaunchPenInputWritingSpeedSelectionL
+// (other items were commented in a header)
+// ---------------------------------------------------------------------------
+//
+void CAknFepPluginManager::LaunchPenInputWritingSpeedSelectionL()
+{
+//record langauge
+CPenInputGSInterface*  setting = CPenInputGSInterface::NewL();
+CleanupStack::PushL(setting);
+setting->ShowWritingSpeedPageL();
+CleanupStack::PopAndDestroy(setting);
+TInt inputLanguage = iSharedData.InputTextLanguage();
+}
+// ---------------------------------------------------------------------------
+// CAknFepPluginManager::LaunchPenInputGuideLineSelectionL
+// (other items were commented in a header)
+// ---------------------------------------------------------------------------
+//
+void CAknFepPluginManager::LaunchPenInputGuidingLineSelectionL()
+{
+//record langauge
+CPenInputGSInterface*  setting = CPenInputGSInterface::NewL();
+CleanupStack::PushL(setting);
+setting->ShowGuideLinePageL();
+CleanupStack::PopAndDestroy(setting);
+TInt inputLanguage = iSharedData.InputTextLanguage();
+}
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::LaunchPenInputSettingL
 // (other items were commented in a header)
 // ---------------------------------------------------------------------------
 //
 		case EPluginInputModeFingerHwr:
 case EPluginInputModeFSc:
 case EPluginInputModeHwr:
 			{
 		    if( iFepMan.IsSupportsSecretText() ||
-		    	( ( aSuggestMode == EPluginInputModeFSc ||
+		    	(( ( aSuggestMode == EPluginInputModeFSc ||
 		    		aSuggestMode == EPluginInputModeFingerHwr) &&
-		    	    iSharedData.InputTextLanguage() != ELangPrcChinese &&
+		    	  !(iSharedData.InputTextLanguage() == ELangPrcChinese ||
-iSharedData.InputTextLanguage() != ELangTaiwanChinese &&
+		    	          iSharedData.InputTextLanguage() == ELangTaiwanChinese ||
-iSharedData.InputTextLanguage() != ELangHongKongChinese ))
+		    	          iSharedData.InputTextLanguage() == ELangHongKongChinese)) &&
+		    	  ((aSuggestMode == EPluginInputModeFingerHwr &&
+		    	          iSharedData.InputTextLanguage() != ELangArabic))))
 				{
 				aSuggestMode = EPluginInputModeItut;
 				if ((disableLayouts & aSuggestMode))
 					{
 					aSuggestMode = EPluginInputModeFSQ;
 break;
 }
 testMode<<=1;
 }
-if ((testMode == EPluginInputModeFSc ||
+if (((testMode == EPluginInputModeFSc ||
-testMode == EPluginInputModeFingerHwr ) &&
+testMode == EPluginInputModeFingerHwr) &&
-iSharedData.InputTextLanguage() != ELangPrcChinese &&
+!(iSharedData.InputTextLanguage() == ELangPrcChinese ||
-iSharedData.InputTextLanguage() != ELangTaiwanChinese &&
+iSharedData.InputTextLanguage() == ELangTaiwanChinese ||
-iSharedData.InputTextLanguage() != ELangHongKongChinese )
+iSharedData.InputTextLanguage() == ELangHongKongChinese)) &&
+((testMode == EPluginInputModeFingerHwr &&
+iSharedData.InputTextLanguage() != ELangArabic)))
 {
 return EFalse;
 }
 aSuggestMode = TPluginInputMode(testMode);
 || PluginInputMode() == EPluginInputModeFSQ
 	   || PluginInputMode() == EPluginInputModeFingerHwr)
 {
 iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputInEditWordQueryDlg, iIsInEditWordQueryDlg);
 }
+if ( PluginInputMode() == EPluginInputModeFSQ )
+{
+UpdateFSQIndicator();
+}
 }
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::IsEnableModeSwitchBtn
 CleanupStack::PopAndDestroy(); // reader
 return ret;
 }
-void CAknFepPluginManager::UpdateITUTIndicator()
+void CAknFepPluginManager::UpdateFSQIndicator()
 {
-if ( EPluginInputModeItut != PluginInputMode() )
+if ( EPluginInputModeFSQ != PluginInputMode() )
 {
 return;
 }
 TInt indicatorImgID;
 indicator.iIndicatorTextMaskID = textMaskid;
 TRAP_IGNORE(iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputFingerMatchIndicator,
 reinterpret_cast<TInt>(&indicator)));
 }
 }
+void CAknFepPluginManager::UpdateITUTIndicator()
+{
+if ( EPluginInputModeItut != PluginInputMode() )
+{
+return;
+}
+TInt indicatorImgID;
+TInt indicatorTextID;
+if (iFepMan.GetIndicatorImgID(indicatorImgID, indicatorTextID))
+{
+iIndicatorImgID = indicatorImgID;
+iIndicatorTextID = indicatorTextID;
+}
+TInt indImgid = 0;
+TInt indMaskid = 0;
+TInt textImgid = 0;
+TInt textMaskid = 0;
+if (iIndicatorImgID > 0)
+{
+GetIndicatorImgID(iIndicatorImgID ,indImgid, indMaskid);
+}
+if (iIndicatorTextID > 0)
+{
+GetIndicatorImgID(iIndicatorTextID ,textImgid, textMaskid);
+}
+if (iIndicatorImgID != 0 || iIndicatorTextID != 0)
+{
+TFepIndicatorInfo indicator;
+indicator.iIndicatorImgID = indImgid;
+indicator.iIndicatorMaskID = indMaskid;
+indicator.iIndicatorTextImgID = textImgid;
+indicator.iIndicatorTextMaskID = textMaskid;
+TRAP_IGNORE(iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputFingerMatchIndicator,
+reinterpret_cast<TInt>(&indicator)));
+}
+}
 void CAknFepPluginManager::SetITUTSpellingStateL(TBool aState)
 {
 if (aState)
 {
 delete iSpell;
 iSpell = NULL;
 iSpellCba = ESpellCBACancelEmpty;
 iSpellOn = ETrue;
-iSpell = CAknFepUiSpellContainer::NewL(editorFlag, editorCase, editorSCTResId);
+iSpell = CAknFepUiSpellContainer::NewL(editorFlag, editorCase, editorSCTResId, IsEditorSupportSplitIme());
 iSpell->SetInputWinObserver(this);
 iSpell->InputPane()->SetInputWinTextL(&aInitText);
 iSpell->InputPane()->InputWin()->SetSelectionL(aCurSel.iCursorPos, aCurSel.iAnchorPos);
 			}
 		TRAP_IGNORE(iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputCaseMode,
 		                                                     iCaseMan.CurrentCase()));
 		UpdateITUTIndicator();
+	    if ( PluginInputMode() == EPluginInputModeFSQ )
+	        {
+			UpdateFSQIndicator();
+	        }
 		}
 	}
 void CAknFepPluginManager::AdjustDataCase( TDes& aData )
 		{
 void CAknFepPluginManager::DimAllModeAndCase(CAknFepUiInterfaceMenuPane* aMenuPane)
 {
 aMenuPane->SetItemDimmed(EChinFepCmdModeStroke, ETrue);
 aMenuPane->SetItemDimmed(EChinFepCmdModeZhuyin, ETrue);
 aMenuPane->SetItemDimmed(EChinFepCmdModePinyin, ETrue);
+aMenuPane->SetItemDimmed(EChinFepCmdModeStrokePhrase, ETrue);
+aMenuPane->SetItemDimmed(EChinFepCmdModeZhuyinPhrase, ETrue);
+aMenuPane->SetItemDimmed(EChinFepCmdModePinyinPhrase, ETrue);
 aMenuPane->SetItemDimmed(EAknCmdEditModeLatinText, ETrue);
 aMenuPane->SetItemDimmed(EChinFepCmdModeLatinUpper, ETrue);
 aMenuPane->SetItemDimmed(EChinFepCmdModeLatinLower, ETrue);
 }
 || iPluginPrimaryRange == ERangeEnglish
 // iPluginPrimaryRange == 0 is the default range,
 // default range couldn't be accent.
 || !iPluginPrimaryRange )
 && iFepMan.InputLanguageCapabilities().iSupportsWesternQwertyPredictive
-&& !iSharedData.QwertyInputMode() )
+&& !iSharedData.QwertyInputMode()
+// No need to support in dialer application.
+&& RProcess().SecureId().iId != KPhoneSecureId )
 {
 return ETrue;
 }
 #endif
 return EFalse;
 // -----------------------------------------------------------------------------
 // Notify app touch input window closed or open.
 // -----------------------------------------------------------------------------
 //
-void CAknFepPluginManager::NotifyAppUiImeTouchWndState( const TBool aTouchState )
+void CAknFepPluginManager::NotifyAppUiImeTouchWndStateL( const TBool aTouchState )
 {
 if ( iLangMan.IsSplitView() )
 {
 CEikonEnv* eikEnv = CEikonEnv::Static();
 TUint param = aTouchState ? KAknSplitInputEnabled : KAknSplitInputDisabled;
 return;
 }
 TRAP_IGNORE(iPenInputServer.AddPeninputServerObserverL(this)); //always add the handler
 iPenInputSvrConnected = ETrue;
-ActivatePenInputL();
+TRAP_IGNORE(ActivatePenInputL());
 }
 CConnectAo::CConnectAo(CAknFepPluginManager* aClient)
 : CActive(CActive::EPriorityStandard),
 iClient(aClient)

branch	RCL_3
changeset 5	a47de9135b21
parent 3	f5a1e66df979
child 6	6ceef9a83b1a