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

equal deleted inserted replaced

-:4eb1ae11334f
+:e6a39382bb9c
 iDefaultOrientation = -1;
 iIsInEditWordQueryDlg = EFalse;
 iClosePluginInputMode = EFalse;
 iDimGainForeground = ETrue;
 iAlignment = 0;
+	iNeedFetchDimState = ETrue;
 }
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::ConstructL
 // (other items were commented in a header)
 {
 iFepMan.PluginUIManager()->SetFingerMatchSelectionState(EFalse);
 }
 }
 break;
+case ESignalShowCandidate:
+{
+// Get candidate list
+TInt activeIdx = 0;
+CDesCArray* candidates = new (ELeave) CDesCArrayFlat
+( KDefaultCandidateArraySize );
+		CleanupStack::PushL( candidates );
+		iFepMan.GetCandidatesL(*candidates, activeIdx);
+		TFepITICandidateList candidateListData;
+		candidateListData.iItemArray = candidates;
+		candidateListData.iActiveIndex
+		            = ( candidates->Count() >= 2 ) ? 1 : activeIdx;
+		candidateListData.iLangCode = iFepMan.CurrentInputLangCode();
+		ShowCandidateListL( candidateListData );
+		CleanupStack::PopAndDestroy( candidates );
+}
+break;
 case ESignalSelectMatchSelectionText:
 {
 TInt* ptrData = (TInt*)(pBuf.Ptr());
 TInt itemidx = *(ptrData);
 TBool commit = *(ptrData + 1);
 }
 else
 {
 iCharStartPostion = KInvalidValue;
 }
-}
-break;
-case ESignalShowCandidate:
-{
-// Get candidate list
-TInt activeIdx = 0;
-CDesCArray* candidates = new (ELeave) CDesCArrayFlat
-( KDefaultCandidateArraySize );
-		CleanupStack::PushL( candidates );
-		iFepMan.GetCandidatesL( *candidates, activeIdx );
-		TFepITICandidateList candidateListData;
-		candidateListData.iItemArray = candidates;
-		candidateListData.iActiveIndex
-		            = ( candidates->Count() >= 2 ) ? 1 : activeIdx;
-		ShowCandidateListL( candidateListData );
-		CleanupStack::PopAndDestroy( candidates );
 }
 break;
 case ESignalSelectCandidate:
 {
 // Select candidate word on fsq
 	if ( iCurrentPluginInputFepUI )
 		{
 iCurrentPluginInputFepUI->HandleCommandL( ECmdPeninputITIStatus,
 iFepMan.WesternPredictive() );
 		}
+	}
+	break;
+case EPluginEnableFetchDimState:
+	{
+	iNeedFetchDimState = ETrue;
 	}
 	break;
 default:
 break;
 }
 			&& !( disabledInputMode & EPluginInputModeItut ))
 	    {
 	    aMenuPane->SetItemDimmed(EPenInputCmdVITUT, EFalse);
 	    }
-	if ( iFepMan.IsArabicInputLanguage() && ( curInputMode != EPluginInputModeFingerHwr )
+	//if ( iFepMan.IsArabicInputLanguage() && ( curInputMode != EPluginInputModeFingerHwr )
-			&& !( disabledInputMode & EPluginInputModeFingerHwr ))
+	//		&& !( disabledInputMode & EPluginInputModeFingerHwr ))
-	    {
+	//    {
-	    aMenuPane->SetItemDimmed( EPeninputCmdHwr, EFalse );
+	//    aMenuPane->SetItemDimmed( EPeninputCmdHwr, EFalse );
-	    }
+	//    }
 //For arabic finger hwr input orientation.
 TInt index = 0;
 if(iPluginInputMode == EPluginInputModeFingerHwr
 && (ELangArabic == iSharedData.InputTextLanguage())
 && (!iSharedData.AutoRotateEnabled()))
 if (iLaunchHelp)
 {
 return;
 }
-if ( iFepMan.StopProcessFocus()  )
+if ( !iForegroundChange && iFepMan.StopProcessFocus()  )
 {
 if (iFepMan.CloseUiOnFocusChange())
 {
 ClosePluginInputUiL(ETrue);
 }
 {
 if(!iPenInputServer.IsDimmed())
 bOpen = EFalse;
 }*/
+// The state means: when current app with dim state lose foreground by non-capserver or notify server
+// Need to cancel dim state
+if ( iForegroundChange && !aGainForeground && !IsGlobalNotesApp( focusAppId ) && iInMenu )
+	{
+		ResetMenuState();
+	}
 if ( aGainForeground && iFepMan.FepAwareTextEditor() && IsCurrentWindInOpenList() )
 {
 if(!iPenInputSvrConnected)
 {
 HandleEventsFromFepL(EPluginEditorActivate,0);
 	    // if content is the same, sync cursor selection only
 if ( !iModeChanged &&
 aLastEditorContent.Compare( aCurrentEditorContent ) == 0 )
 	{
 if ( aIcfData.iCurSel.HigherPos() > edit->DocumentLengthForFep() ||
-aIcfData.iCurSel.LowerPos() < 0 )
+aIcfData.iCurSel.LowerPos() < 0 || IsDimed() )
 {
 return EFalse;
 }
 	return SetSyncCurSelIcfDataL( aIcfData );
 	}
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CAknFepPluginManager::LaunchPenInputMenuL(TInt aResourceId, TBool aRemeber)
 {
+	// when launch option menu, dim state changes,
+	// so need fetch the state next time.
+	iNeedFetchDimState = ETrue;
 TInt previousModes = iCurPermitModes;
 TBool previousSCT  = isLanuchSCT;
 TInt inputmode = PluginInputMode();
 if (R_AVKON_PENINPUT_OPTION_MENU_BAR == aResourceId &&
 if ( IsITISupportedKey( keyEvent ) )
 {
 // check if need to change current text case
 TPtiTextCase textCase =
 CaseForMappedCharacter( TChar( keyEvent.iCode ) );
-						if ( !IsDeadKeyCode( keyEvent.iCode ) && IsNeedToChangeTextCase( textCase ) )
+						if ( IsNeedToChangeTextCase( textCase ) )
 {
 iFepMan.PtiEngine()->SetCase( textCase );
 }
+						env->SimulateKeyEventL(keyEvent, EEventKeyDown);
+						env->SimulateKeyEventL(keyEvent, EEventKey);
+						env->SimulateKeyEventL(keyEvent, EEventKeyUp);
+}
+else if ( keyEvent.iScanCode == EStdKeySpace )
+{
 TRawEvent eventDown;
 eventDown.Set( TRawEvent::EKeyDown, keyEvent.iScanCode );
 iAvkonAppUi->DisableNextKeySound( keyEvent.iScanCode );
 CCoeEnv::Static()->WsSession().SimulateRawEvent( eventDown );
 // Handle key event sent from pen input server
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CAknFepPluginManager::OnPenInputServerKeyEventL(const TDesC& aData)
 {
+if ( !EnableITIOnFSQ() )
-iFepMan.PtiEngine()->CancelTimerActivity();
+	{
+iFepMan.PtiEngine()->CancelTimerActivity();
+	}
 if( aData.Length() <= 0 )
 {
 return;
 }
 }
 iCurrentPluginInputFepUI->HandleCommandL( ECmdPenInputDimArrowKeys,
 enableArrowBtn);
+if ( PluginInputMode() == EPluginInputModeFSQ )
+	{
+iCurrentPluginInputFepUI->HandleCommandL( ECmdPenInputDimEnterKey,
+		                                  iFepMan.IsFindPaneEditor() );
+	}
 SetIcfAlignment();
 iModeChanged = ETrue;
 SendIcfDataL( EPluginSyncAll );
 iModeChanged = EFalse;
 if (!iCandidateList.Count())
 return;
 for (TInt i = 0; i < iCandidateList.Count(); i++)
 iSendAllList.iCandidates.Append(iCandidateList[i]->Des());
+SendMatchListCmd(iSendAllList.iCandidates);
+}
+void CAknFepPluginManager::SendMatchListCmd(const RArray<TPtrC>& aList)
+	{
+TFepITICandidateList list;
+list.iActiveIndex = 0;
+list.iItemArray2 = &aList;
+list.iLangCode = iFepMan.CurrentInputLangCode();
 TRAP_IGNORE(iCurrentPluginInputFepUI->HandleCommandL(ECmdPenInputFingerMatchList,
-reinterpret_cast<TInt>(&iSendAllList)));
+reinterpret_cast<TInt>(&list)));
-}
+	}
 TBool CAknFepPluginManager::GetIndicatorImgID(const TInt IndicatorUID,TInt &aImage, TInt &aMask)
 {
 TBool ret = EFalse;
 TRAP_IGNORE(ret = GetIndicatorImgIDL(IndicatorUID, aImage, aMask));
 {
 if(!iPenInputSvrConnected )
 {
 return EFalse;
 }
-return iPenInputServer.IsDimmed();
+if( iNeedFetchDimState )
+{
+iCurrentDimState = iPenInputServer.IsDimmed();
+iNeedFetchDimState = EFalse;
+}
+return iCurrentDimState;
 }
 void CAknFepPluginManager::HandleiDimGainForeground(TBool aGain)
 {
 if (aGain)
 {
 {
 // ITI supported conditions
 // 1. Not in keymapping: some function keys, space, enter, backspace
 // 2. In keymappings: keys on AB/Native range.
 #ifdef RD_INTELLIGENT_TEXT_INPUT
-if ( aKeyEvent.iScanCode == EStdKeySpace
+if ( aKeyEvent.iScanCode != EPtiKeyNone
-	 || aKeyEvent.iScanCode == EStdKeyEnter
+	  && ( iPluginPrimaryRange == ERangeNative
-	 || aKeyEvent.iScanCode == EStdKeyBackspace
+	       || iPluginPrimaryRange == ERangeEnglish
-	 || ( aKeyEvent.iScanCode != EPtiKeyNone
+	       || ( iPluginPrimaryRange == 0 && iFepMan.InputMode() != ENumber
-	      && ( iPluginPrimaryRange == ERangeNative
+	               && iFepMan.InputMode() != ENativeNumber ) ) )
-	           || iPluginPrimaryRange == ERangeEnglish
-	           || ( iPluginPrimaryRange == 0 && iFepMan.InputMode() != ENumber
-	                   && iFepMan.InputMode() != ENativeNumber ) ) ) )
 {
 return ETrue;
 }
 return EFalse;
 #else
 }
 TBool CAknFepPluginManager::IsNeedToChangeTextCase( const TPtiTextCase& aTextCase )
 {
 #ifdef RD_INTELLIGENT_TEXT_INPUT
+	// Not need change case if it is supported in language
+	if ( iCaseMan.IsAbleChangeCase() )
+		{
+	    return EFalse;
+		}
 TPtiTextCase textCase = aTextCase;
 if( EPtiKeyboardHalfQwerty != iFepMan.PtiEngine()->KeyboardType() )
 		{
 		if ( textCase  == EPtiCaseChrLower )
 			{

branch	RCL_3
changeset 9	e6a39382bb9c
parent 8	4eb1ae11334f
child 11	c8fb4cf7b3ae