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

equal deleted inserted replaced

-:c8fb4cf7b3ae
+:5e18d8c489d6
 #include <aknfeppeninputimeplugin.h>
 #include <UikonInternalPSKeys.h> // KUikGlobalNotesAllowed
 #include <AvkonInternalCRKeys.h>    // KAknQwertyInputModeActive
 #include <hlplch.h>
 #include <peninputgsinterface.h>
-#include <AknFep.rsg>
+#include <aknfep.rsg>
 #include <avkon.rsg>
 #include <AknIndicatorContainer.h>  //CAknIndicatorContainer
 #include <StringLoader.h>
 #include <peninputgenericitutcustomization.h>
 #include <eikgted.h>
 SendIcfDataL(EPluginSyncUpdatedText);
 }
 break;
 case ESignalEnterSpellMode:
 {
+iCurrentPluginInputFepUI->HandleCommandL(ECmdPeninputDisableLayoutDrawing,ETrue);
 iFepMan.LaunchEditWordQueryL();
 }
 break;
 case ESignalExitSpellMode:
 {
 TInt* ptrData = (TInt*)(pBuf.Ptr());
 TBool exitbyok = *(ptrData);
+				//remove spell mode editor will cause focus change, so as pen UI is closed and opened again.
+				iFocuschangedForSpellEditor = ETrue;
+				iCurrentPluginInputFepUI->HandleCommandL(ECmdPeninputDisableLayoutDrawing,ETrue);
 exitbyok ? iFepMan.ExitPluginSpellModeByOk() :
 iFepMan.ExitPluginSpellModeByCancel();
 }
 break;
 case ESignalLaunchSCT:
 {
 // Commit autocompletion
 iFepMan.CommitInlineEditL();
 // Need to commit into engine, it will clear textbuffer in it.
 iFepMan.PtiEngine()->CommitCurrentWord();
+}
+break;
+case ESignalDeleteLastInput:
+{
+iFepMan.SetFlag( CAknFepManager::EFlagSupressAutoUpdate );
+//set selection
+MCoeFepAwareTextEditor* edit = iFepMan.FepAwareTextEditor();
+if( iFepMan.IsFepAwareTextEditor() && edit )
+{
+TCursorSelection curSor;
+edit->GetCursorSelectionForFep(curSor);
+if ( curSor.iAnchorPos == curSor.iCursorPos )
+{
+curSor.iAnchorPos = curSor.iCursorPos - iLastSubmitCount;
+if (curSor.iAnchorPos<0 ||
+curSor.iAnchorPos>edit->DocumentLengthForFep())
+{
+break;
+}
+if (curSor.iCursorPos > curSor.iAnchorPos)
+{
+edit->SetCursorSelectionForFepL(curSor);
+}
+}
+TBuf<1> backSpace;
+backSpace.Append(TChar(EKeyBackspace));
+SubmitUiPluginTextL(backSpace, EKeyEvent);
+}
+iFepMan.ClearFlag( CAknFepManager::EFlagSupressAutoUpdate );
+}
+break;
+case ESignalArabicSCTChar:
+{
+TPtrC ptr( const_cast<TUint16*>(pBuf.Ptr()), pBuf.Length());
+//                if(iFepMan.InputMode() == ELatin && (iPluginInputMode == EPluginInputModeVkb ||
+//                   iPluginInputMode == EPluginInputModeFSQ))
+//                    {
+//                    AdjustDataCase( ptr );
+//                    }
+iFepMan.StartInlineEditL(ptr);
+iFepMan.CommitInlineEditL();
+SendIcfDataL( EPluginSyncAll );
+//                OnPenInputServerKeyEventL(pBuf);
 }
 break;
 default:
 break;
 }
 case EPluginEnableFetchDimState:
 	{
 	iNeedFetchDimState = ETrue;
 	}
 	break;
+case EPluginArabicNumModeChanged:
+if(iCurrentPluginInputFepUI)
+{
+iCurrentPluginInputFepUI->HandleCommandL(
+ECmdPeninputArabicNumModeChanged,aEventData);
+}
+break;
 default:
 break;
 }
 }
 TBool landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
 TBool disableFSQ =
 (  aSuggestMode == EPluginInputModeFSQ &&
 ( iDefaultOrientation == CAknAppUiBase::EAppUiOrientationPortrait ||
 		     ( !landscape && !iAvkonAppUi->OrientationCanBeChanged() ) ) );
 if ( disableFSQ )
 {
 iPenInputServer.SetDisabledLayout( EPluginInputModeFSQ );
 }
-if ( aSuggestMode == EPluginInputModeFSQ || (aSuggestMode == EPluginInputModeFingerHwr
+TBool disableITUT =
-	     && iSharedData.InputTextLanguage() == ELangArabic
+( iDefaultOrientation == CAknAppUiBase::EAppUiOrientationLandscape ||
-	     && iSharedData.AutoRotateEnabled()))
+( landscape && !iAvkonAppUi->OrientationCanBeChanged() ) ) ;
+if( disableITUT )
+{
+//disable V-ITUT, and if current aSuggestMode is EPluginInputModeItut, replace it with EPluginInputModeFSQ;
+iPenInputServer.SetDisabledLayout( EPluginInputModeItut );
+if( aSuggestMode == EPluginInputModeItut )
+{
+aSuggestMode = EPluginInputModeFSQ;
+}
+}
+else
+{
+// if V-ITUT had been disabled before, enable it now;
+TInt disableMode = iPenInputServer.DisabledLayout();
+if( disableMode & EPluginInputModeItut )
+{
+			iPenInputServer.SetDisabledLayout( -1 );//reset
+			iPenInputServer.SetDisabledLayout( disableMode & ~EPluginInputModeItut );
+}
+}
+if ( aSuggestMode == EPluginInputModeFSQ)
 {
 TPluginInputMode tempInputMode = iPluginInputMode;
 iPluginInputMode = aSuggestMode;
 if (disableFSQ && (aSuggestMode != EPluginInputModeFingerHwr))
 aSuggestMode = EPluginInputModeItut;
 }
 else
 {
 if ( (!iSharedData.AutoRotateEnabled()
-&& aSuggestMode == EPluginInputModeFSQ) ||
+&& aSuggestMode == EPluginInputModeFSQ))
-(aSuggestMode == EPluginInputModeFingerHwr))
 {
 iFepMan.SetNotifyPlugin( EFalse );
 iAvkonAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationLandscape );
 iFepMan.SetNotifyPlugin( ETrue );
 iOrientationChanged = ETrue;
 	 inputLang == ELangTaiwanChinese ||
 	 inputLang == ELangHongKongChinese )
 {
 isSplit = EFalse;
 }
+if ( iLangMan.IsSplitView() && !isSplit )
+{
+NotifyAppUiImeTouchWndStateL( EFalse ); //restore layout
+}
 iLangMan.SetSplitView(isSplit);
 MAknFepManagerInterface* fepUI = iLangMan.GetPluginInputFepUiL(
 aSuggestMode,
 inputLang,
 uiLanguage,
 {
 //Change for finger support of MFNE editor, it is a requirement for Tube
 InformMfneUiStatusL( EFalse );
 iPenInputServer.ClearServerEvent();
-iCurrentPluginInputFepUI->CloseUI();
+			if(iFocuschangedForSpellEditor)
+				{
+				iFocuschangedForSpellEditor = EFalse;
+				//disable the redrawing, it will be redrawn in
+				//iCurrentPluginInputFepUI->HandleCommandL(ECmdPeninputDisableLayoutDrawing,ETrue);
+				return; //don't close the UI if this is caused by removing spell editor
+				}
+			else
+				{
+				iCurrentPluginInputFepUI->CloseUI();
+				}
 if( aResetState )
 {
 iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputWindowClose);
 }
 iPluginInputMode == EPluginInputModeNone )
 {
 return;
 }
-if ( iPluginInputMode == EPluginInputModeFSQ &&
+if ( (iPluginInputMode == EPluginInputModeFSQ || (iPluginInputMode == EPluginInputModeFingerHwr
-!iSharedData.AutoRotateEnabled() || (iPluginInputMode == EPluginInputModeFingerHwr
 	     && iSharedData.InputTextLanguage() == ELangArabic))
+	     && !iSharedData.AutoRotateEnabled() )
 {
 return;
 }
 TBool setResChange = EFalse;
 LaunchPenInputSettingL();
 }
 break;
 case EPenInputCmdVITUT:
 {
+//Here calling this function is to reset menu state when the focus change caused by
+//the screen orientation, in the normal circumstance the foucus change should not
+//occur while the screen orientation is handling. So directly resetting menu state
+//to avoid the above case, preconditon is that the option menu must be closed.
+ResetMenuState();
 					ClosePluginInputModeL(ETrue);
 iFepMan.TryCloseUiL();
 TryChangePluginInputModeByModeL(EPluginInputModeItut,
 EPenInputOpenManually,
 ERangeInvalid);
 }
 break;
 case EPeninputCmdFSQ:
 {
+//Here calling this function is to reset menu state when the focus change caused by
+//the screen orientation, in the normal circumstance the foucus change should not
+//occur while the screen orientation is handling. So directly resetting menu state
+//to avoid the above case, preconditon is that the option menu must be closed.
+ResetMenuState();
 					ClosePluginInputModeL(ETrue);
 iFepMan.TryCloseUiL();
 TryChangePluginInputModeByModeL(EPluginInputModeFSQ,
 EPenInputOpenManually,
 ERangeInvalid);
 }
 break;
 case EPeninputCmdHwr:
 	{
+//Here calling this function is to reset menu state when the focus change caused by
+//the screen orientation, in the normal circumstance the foucus change should not
+//occur while the screen orientation is handling. So directly resetting menu state
+//to avoid the above case, preconditon is that the option menu must be closed.
+	ResetMenuState();
 	ClosePluginInputModeL(ETrue);
 	iFepMan.TryCloseUiL();
 	TryChangePluginInputModeByModeL( EPluginInputModeFingerHwr,
 	                                 EPenInputOpenManually,
 	                                 ERangeInvalid );
 			&& !( disabledInputMode & EPluginInputModeItut ))
 	    {
 	    aMenuPane->SetItemDimmed(EPenInputCmdVITUT, EFalse);
 	    }
-	//if ( iFepMan.IsArabicInputLanguage() && ( curInputMode != EPluginInputModeFingerHwr )
+	if ( FeatureManager::FeatureSupported( KFeatureIdArabicHandwritingRecognitionInput )
-	//		&& !( disabledInputMode & EPluginInputModeFingerHwr ))
+&&iFepMan.IsArabicInputLanguage()
-	//    {
+&& ( curInputMode != EPluginInputModeFingerHwr )
-	//    aMenuPane->SetItemDimmed( EPeninputCmdHwr, EFalse );
+	    && !( disabledInputMode & EPluginInputModeFingerHwr ))
-	//    }
+	    {
-//For arabic finger hwr input orientation.
+	    aMenuPane->SetItemDimmed( EPeninputCmdHwr, EFalse );
-TInt index = 0;
+	    }
-if(iPluginInputMode == EPluginInputModeFingerHwr
-&& (ELangArabic == iSharedData.InputTextLanguage())
+		// check if this is the arabic finger hwr
-&& (!iSharedData.AutoRotateEnabled()))
+		TBool isArabicFingerHwr = (iPluginInputMode == EPluginInputModeFingerHwr
-{
+		                            && ELangArabic  == iSharedData.InputTextLanguage());
-TBool disableMenu = ETrue;
-TPixelsTwipsAndRotation size;
+// Initialize the menu item for Arabic Finger HWR
-CCoeEnv::Static()->ScreenDevice()->GetDefaultScreenSizeAndRotation(size);
+if(isArabicFingerHwr)
-TBool landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
+{
-if(landscape && aMenuPane->MenuItemExists(EPenInputCmdHwrInputToPortrait, index))
+InitMenuItemForArabicFingerHwrL(aMenuPane);
-{
+}
-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);
 }
+}
-}
+void CAknFepPluginManager::InitMenuItemForArabicFingerHwrL(CAknFepUiInterfaceMenuPane* aMenuPane)
+{
+	TInt index = 0;
+	TBool isAutoRotateEnabled = iSharedData.AutoRotateEnabled();
+	// add menu item to switch to landscape or protrait
+	if(!isAutoRotateEnabled)
+		{
+		TPixelsTwipsAndRotation size;
+		CCoeEnv::Static()->ScreenDevice()->GetDefaultScreenSizeAndRotation(size);
+		TBool landscape = size.iPixelSize.iWidth > size.iPixelSize.iHeight;
+		if(landscape)
+			{
+			index = 0;
+			// add switch to protrait
+			if(aMenuPane->MenuItemExists(EPenInputCmdHwrInputToPortrait, index))
+				{
+				aMenuPane->SetItemDimmed(EPenInputCmdHwrInputToPortrait,EFalse);
+				}
+			}
+		else
+			{
+			index = 0;
+			// add switch to landscape
+			if(aMenuPane->MenuItemExists(EPenInputCmdHwrInputToLandscape, index))
+				{
+				aMenuPane->SetItemDimmed(EPenInputCmdHwrInputToLandscape,EFalse);
+				}
+			}
+		}
+	// hide the setting menu
+//	index = 0;
+//	if(aMenuPane->MenuItemExists(EPenInputCmdSetting, index))
+//		{
+//		aMenuPane->SetItemDimmed(EPenInputCmdSetting, ETrue);
+//		}
+	//Show number mode menu item.
+	if(iFepMan.InputMode() == ENumber || iFepMan.InputMode() == ENativeNumber)
+	    {
+if(iSharedData.DefaultArabicNumberMode())
+{
+aMenuPane->SetItemDimmed(EAknCmdEditModeNumber, EFalse);
+}
+else
+{
+aMenuPane->SetItemDimmed(EAknCmdEditModeArabicIndicNumber, EFalse);
+}
+	    }
+	// add the writing speed menu
+	index = 0;
+	if(aMenuPane->MenuItemExists(EPenInputCmdWritingSpeed, index))
+		{
+		aMenuPane->SetItemDimmed(EPenInputCmdWritingSpeed,EFalse);
+		}
+	// add the guidingline menu
+	index = 0;
+	if(aMenuPane->MenuItemExists(EPenInputCmdGuidingLine, index))
+		{
+		aMenuPane->SetItemDimmed(EPenInputCmdGuidingLine,EFalse);
+		}
+	}
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::OnFocusChangedL
 // (other items were commented in a header)
 // ---------------------------------------------------------------------------
 //
 {
 iAvkonRepository->Get( KAknAvkonAdaptiveSearchEnabled, enableAdaptiveSearch );
 if ( enableAdaptiveSearch )
 {
 if(!(iInMenu && ( iPluginInputMode == EPluginInputModeItut ||
-iPluginInputMode == EPluginInputModeFSQ )))
+iPluginInputMode == EPluginInputModeFSQ ||
+iPluginInputMode ==EPluginInputModeFingerHwr)))
 {
 ClosePluginInputModeL(ETrue);
 if(iPenInputSvrConnected ) //lost foreground
 {
 iPenInputServer.LoseForeground();
 NotifyLayoutL( aOpenMode, aSuggestRange, aCleanContent );
 //    iPenInputServer.UpdateAppInfo(KNullDesC, EAppIndicatorMsg);
 iPluginInputMode =  (TPluginInputMode)iLangMan.CurrentImePlugin()->CurrentMode();
-iPenInputServer.SetDataQueryPopped(IsDisplayDataQuery());
+// Not only for data query, but also for other pop dialogs contain editor.
+//iPenInputServer.SetDataQueryPopped(IsDisplayDataQuery());
+iPenInputServer.SetDataQueryPopped(CCoeEnv::Static()->AppUi()->IsDisplayingDialog() &&
+											CCoeEnv::Static()->AppUi()->TopFocusedControl());
 //adjust VKB window if data query dialog is displaying
 if(IsDisplayDataQuery())
 {
 RDrawableWindow* focusWin =
 RepositionDataQuery(EFalse);
 }
 if ( !NotifyInGlobalNoteEditorL() )
 	{
+iFocuschangedForSpellEditor = EFalse; // restore the flag
 	iCurrentPluginInputFepUI->ActivateUI();
+iNeedFetchDimState = ETrue;
 	}
 iFepMan.UpdateIndicators();
 iCurrentPluginInputFepUI->SetNextFepUI(
 iLangMan.GetFepUI(iFepMan.InputMode(), ENoneWidthChar,
 	}
 else
 	{
 iSpell->InputPane()->InputWin()->SetAknEditorCurrentCase(editorCase);
 iSpell->InputPane()->InputWin()->SetAknEditorCurrentInputMode(EAknEditorTextInputMode);
+if ( iLangMan.IsSplitView() )
+{
+iSpell->InputPane()->InputWin()->SetAknEditorFlags(
+iSpell->InputPane()->InputWin()->AknEdwinFlags() |
+aEditorFlag | EAknEditorFlagNoT9 |
+EAknEditorFlagEnablePartialScreen );
+}
+else
+{
+iSpell->InputPane()->InputWin()->SetAknEditorFlags(
+iSpell->InputPane()->InputWin()->AknEdwinFlags() |
+aEditorFlag | EAknEditorFlagNoT9 );
+}
 iSpell->MakeVisible( ETrue );
 iSpell->SetInputWinFocus( ETrue );
 	}
 iSpell->SetInputWinObserver(this);
 void CAknFepPluginManager::SetMenuState(TBool aUpdateEditor)
 {
 if(!iPenInputSvrConnected )
 {
 return;
 }
 if (!(PluginInputMode() == EPluginInputModeItut ||
 PluginInputMode() == EPluginInputModeFSQ ||
 PluginInputMode() == EPluginInputModeFingerHwr))
 {
 //save current Fep aware editor
 if (aUpdateEditor && !iInMenu)
 {
 if(iFepMan.FepAwareTextEditor())
-iCurEditor = iFepMan.FepAwareTextEditor();
+{
+iCurMFNECap = iFepMan.IsMfneEditor() ? iFepMan.ExtendedInputCapabilities() : 0;
+iCurEditor = iFepMan.FepAwareTextEditor();
+}
 else
-iCurEditor = NULL;
+{
+iCurMFNECap = 0;
+iCurEditor = NULL;
+}
 }
 iInMenu = ETrue;
 TUid curApp = GetCurAppUid();
 void CAknFepPluginManager::ResetMenuState(TBool aUnDim)
 {
 if(!iPenInputSvrConnected )
 {
 return;
 }
 iInMenu = EFalse;
+iCurMFNECap = 0;
 iCurEditor = NULL;
 if (aUnDim)
 {
 iPenInputServer.SetInternalPopUp(EFalse);
 iPenInputServer.DimUiLayout(EFalse);
 }
 #endif // RD_SCALABLE_UI_V2
 void CAknFepPluginManager::InformMfneUiStatusL( TBool aOpened )
 {
-if ( iMfne && iMfneChanged )
+if ( iMfne && ( iMfneChanged || !aOpened ))
 {
 //make the selection longer than maximum length of current
 //text, so it won't change the behavior of MFNE editor which
 //doesn't support finger touch.
 TInt cursor( iMfne->DocumentLengthForFep() + 1 );
 		    ECmdPenInputEnableSettingBtn, !iInGlobleNoteEditor);
 		}
 //if it's in global notes, show it.
 if(EPluginInputModeItut == PluginInputMode() ||
-EPluginInputModeFSQ == PluginInputMode() )
+EPluginInputModeFSQ == PluginInputMode() ||
+EPluginInputModeFingerHwr == PluginInputMode())
 		{
 		if(iInGlobleNoteEditor && iPenInputSvrConnected)
 			{
 			iPenInputServer.ActivatePeninputInNotesL();
 	        return ETrue;
 // Do some configuration to make FSQ support ITI features.
 // -----------------------------------------------------------------------------
 //
 void CAknFepPluginManager::SetItiStateL()
 {
-if ( iIsITIConfigured || !IsSupportITIOnFSQ() )
+if ( !IsSupportITIOnFSQ() )
 	{
 	return;
+	}
+if ( iIsITIConfigured )
+	{
+// if fep state has been configed to iti status before,
+// there is no need to config fep state again,
+// but sending command to fsq to update iti status flag is needed.
+iCurrentPluginInputFepUI->HandleCommandL( ECmdPeninputITIStatus,
+iFepMan.WesternPredictive() );
+		return;
 	}
 // 1. Config keyboard layout type
 SetItiKeyboardLayoutL();
 // 2. Change FEP to qwerty mode.
 }
 //Normal editors
 CAknEdwinState* state = iFepMan.EditorState();
 if (iCurEditor && state == NULL)
-		state = static_cast<CAknEdwinState *> (iCurEditor->Extension1()->State(KNullUid));
+{
+if( iCurMFNECap )
+{
+return CAknExtendedInputCapabilities::EInputEditorPartialScreen ==
+( iCurMFNECap & CAknExtendedInputCapabilities::EInputEditorPartialScreen );
+}
+else
+{
+MCoeFepAwareTextEditor_Extension1* extension = iCurEditor->Extension1();
+if( extension )
+{
+state = static_cast<CAknEdwinState *>( extension->State(KNullUid) );
+}
+}
+}
 if ( state )
 {
 return EAknEditorFlagEnablePartialScreen ==
 ( state->Flags() & EAknEditorFlagEnablePartialScreen );
 }

branch	RCL_3
changeset 12	5e18d8c489d6
parent 11	c8fb4cf7b3ae
child 13	1bbdde98cc2d