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

equal deleted inserted replaced

-:eb1f2e154e89
+:3b79bedfdc20
 #include <AknFepPluginManager.h>
 #include <aknfeppeninputimeplugin.h>
 #include <UikonInternalPSKeys.h> // KUikGlobalNotesAllowed
 #include <AvkonInternalCRKeys.h>    // KAknQwertyInputModeActive
 #include <hlplch.h>
-#include <peninputgsinterface.h>
+//#include <peninputgsinterface.h>
 #include <AknFep.rsg>
 #include <avkon.rsg>
 #include <AknIndicatorContainer.h>  //CAknIndicatorContainer
 #include <StringLoader.h>
 #include <peninputgenericitutcustomization.h>
 #include <eikgted.h>
 #include <apgwgnam.h>
 #include <PtiKeyMappings.h>
-#include <aknpriv.hrh>
+#include <AknPriv.hrh>
 // Constants
 const TInt KCursorBlinkPerioid = 10000;//300000; // five tenth of a second * 2
 const TInt KMaxServerDataLength = 50;
 const TUint KVkbParagraphSeparator = 0x2029;
 // (other items were commented in a header)
 // ---------------------------------------------------------------------------
 //
 CAknFepPluginManager::~CAknFepPluginManager()
 {
-if ( iConnectAo )
-	{
-	iConnectAo->Cancel();
-	delete iConnectAo;
-	}
 delete iAdjustDataQueryTimer;
 iCurrentPluginInputFepUI = NULL; // why not delete????
 delete iPenInputMenu;
 iSendAllList.iCandidates.Reset();
 iOpenWindowList.Close();
 iEventData.Close();
 iPreCaption.Close();
-ClosePeninputSetting();
+	  ClosePeninputSetting();
 }
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::CAknFepPluginManager
 // (other items were commented in a header)
 RThread client;
 iHasSWEventCap = client.HasCapability(ECapabilitySwEvent);
 client.Close();
 iAvkonRepository = CRepository::NewL( KCRUidAvkon );
-iConnectAo = new (ELeave)CConnectAo(this);
 }
 // -----------------------------------------------------------------------------
 // CAknFepPluginManager::ActivatePenInputL
 // Change to default plugin input mode
 {
 if( !iPenInputSvrConnected || !iPenInputServer.IsVisible() || iPenInputServer.IsDimmed() )
 {
 if( iFepMan.FepAwareTextEditor() )
 {
+			iPreferredUiMode = ETrue;
 TryChangePluginInputModeByModeL((TPluginInputMode)(iSharedData.PluginInputMode()),
 EPenInputOpenManually,
 ERangeInvalid);
 }
 }
 iFepMan.PtiEngine()->CancelTimerActivity();
 }
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::DeactivatePenInputL
 // (other items were commented in a header)
 // ---------------------------------------------------------------------------
 //
 if (! ConnectServer() )
 {
 return EFalse;
 }
 if ((iPenInputServer.PreferredUiMode() != EPluginInputModeNone) && iPreferredUiMode )
 {
 aSuggestMode = iPenInputServer.PreferredUiMode();
 }
 iIndicatorTextID = 0;
 }
 iPluginInputMode = (TPluginInputMode)iLangMan.CurrentImePlugin()->CurrentMode();
+//following codes is used to tell MFNE editor the Touch Input
+//has been opened. Because MFNE editor has no editorstate, so
+//use this way to implement this.
+if ( iFepMan.IsMfneEditor() )
+{
+MCoeFepAwareTextEditor* mfne( iFepMan.FepAwareTextEditor() );
+iMfneChanged = ( iMfne != mfne );
+iMfne = mfne;
+InformMfneUiStatusL( ETrue );
+}
 // Addition for ITI features on FSQ
 // Before open touch window, need to set iPluginPrimaryRange = 0
 // which means use the default range.
 iPluginPrimaryRange = 0;
 InitializePluginInputL(aOpenMode, aSuggestRange, cleanContent);
-//following codes is used to tell MFNE editor the Touch Input
-//has been opened. Because MFNE editor has no editorstate, so
-//use this way to implement this.
-if ( iFepMan.IsMfneEditor() )
-{
-MCoeFepAwareTextEditor* mfne( iFepMan.FepAwareTextEditor() );
-iMfneChanged = ( iMfne != mfne );
-iMfne = mfne;
-InformMfneUiStatusL( ETrue );
-}
 //save plugin input mode to repository
 if( iPenInputServer.PreferredUiMode() == EPluginInputModeNone )
 {
 //do not remember application set input mode
 iSharedData.SetPluginInputMode(iPluginInputMode);
 }
 if (CurrentFepInputUI())
 	{
+	CurrentFepInputUI()->SetInputLanguageL((TLanguage)inputLang);
 	CurrentFepInputUI()->SetMode(iFepMan.InputMode(), ETrue, EFalse);
 	}
 if(!iOrientationChangedfromUI)
 		    {
 //
 void CAknFepPluginManager::ClosePluginInputUiL(TBool aResetState)
 {
 // For addition of ITI features on FSQ,
 // need to restore some values stored before opening FSQ
-iConnectAo->Cancel();
 ResetItiStateL();
 if( iPenInputSvrConnected )
 {
 if( iCurrentPluginInputFepUI )
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::LaunchPenInputLanguageSelectionL
 // (other items were commented in a header)
 // ---------------------------------------------------------------------------
 //
-void CAknFepPluginManager::LaunchPenInputLanguageSelectionL( TBool aLaunchedByTouchWin )
+void CAknFepPluginManager::LaunchPenInputLanguageSelectionL( TBool /*aLaunchedByTouchWin*/ )
 {
 //record langauge
-TInt oldLang = iSharedData.InputTextLanguage();
+//    TInt oldLang = iSharedData.InputTextLanguage();
-CPenInputGSInterface*  setting = CPenInputGSInterface::NewL();
+//    CPenInputGSInterface*  setting = CPenInputGSInterface::NewL();
-CleanupStack::PushL(setting);
+//    CleanupStack::PushL(setting);
-iFepMan.SetCancelPopupInQwerty( aLaunchedByTouchWin );
+//    iFepMan.SetCancelPopupInQwerty( aLaunchedByTouchWin );
-setting->ShowInputLanguagePageL();
+//    setting->ShowInputLanguagePageL();
-iFepMan.SetCancelPopupInQwerty( EFalse );
+//    iFepMan.SetCancelPopupInQwerty( EFalse );
-CleanupStack::PopAndDestroy(setting);
+//    CleanupStack::PopAndDestroy(setting);
-TInt inputLanguage = iSharedData.InputTextLanguage();
+//    TInt inputLanguage = iSharedData.InputTextLanguage();
-if( oldLang != inputLanguage)
+//    if( oldLang != inputLanguage)
-{
+//        {
-iSharedData.SetInputTextLanguage(inputLanguage);
+//        iSharedData.SetInputTextLanguage(inputLanguage);
-iFepMan.ChangeInputLanguageL(inputLanguage);
+//        iFepMan.ChangeInputLanguageL(inputLanguage);
-iFepMan.SetFlag( CAknFepManager::EFlagNewSharedDataInputLanguage
+//        iFepMan.SetFlag( CAknFepManager::EFlagNewSharedDataInputLanguage
-| CAknFepManager::EFlagNewSharedDataInputMode );
+//            | CAknFepManager::EFlagNewSharedDataInputMode );
+//
-}
+//        }
 }
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::LaunchPenInputRecognitionWithDictionarySelectionL
 // (other items were commented in a header)
 // ---------------------------------------------------------------------------
 //
 void CAknFepPluginManager::LaunchPenInputRecognitionWithDictionarySelectionL()
 {
 //record langauge
-CPenInputGSInterface*  setting = CPenInputGSInterface::NewL();
+//    CPenInputGSInterface*  setting = CPenInputGSInterface::NewL();
-CleanupStack::PushL(setting);
+//    CleanupStack::PushL(setting);
-setting->ShowRecognitionWithDictionaryL();
+//    setting->ShowRecognitionWithDictionaryL();
-CleanupStack::PopAndDestroy(setting);
+//    CleanupStack::PopAndDestroy(setting);
-TInt inputLanguage = iSharedData.InputTextLanguage();
+//    TInt inputLanguage = iSharedData.InputTextLanguage();
 }
 // ---------------------------------------------------------------------------
 // CAknFepPluginManager::LaunchPenInputSettingL
 // (other items were commented in a header)
 // ---------------------------------------------------------------------------
 //
 void CAknFepPluginManager::LaunchPenInputSettingL()
 {
 //record langauge
-TInt oldLang = iSharedData.InputTextLanguage();
+//    TInt oldLang = iSharedData.InputTextLanguage();
-if ( !iGsInterface )
+//    if ( !iGsInterface )
-{
+//        {
-iGsInterface = CPenInputGSInterface::NewL();
+//        iGsInterface = CPenInputGSInterface::NewL();
-}
+//        }
-iGsInterface->ShowMainViewL();
+//    iGsInterface->ShowMainViewL();
-TInt inputLanguage = iSharedData.InputTextLanguage();
+//    TInt inputLanguage = iSharedData.InputTextLanguage();
-if( oldLang != inputLanguage)
+//    if( oldLang != inputLanguage)
-{
+//        {
-iFepMan.ChangeInputLanguageL(inputLanguage);
+//        iFepMan.ChangeInputLanguageL(inputLanguage);
-}
+//        }
 }
 // -----------------------------------------------------------------------------
 // CAknFepManager::ParseInputContextContent
 //
 TBool CAknFepPluginManager::ConnectServer()
 {
 if(!iPenInputSvrConnected)
 {
-if(!iConnectAo->IsActive())
+TInt err = iPenInputServer.Connect();
-{
+//iPenInputServer.AddPeninputServerObserverL(this); //always add the handler
-iConnectAo->RequestConnect();
+if( KErrNone != err )
-iPenInputServer.ConnectAsyc(iConnectAo->RequestStatus());
+{
-}
+iFepMan.UiInterface()->TouchPaneSetInputMethodIconActivated(EFalse);
-// vv
 return EFalse;
+}
+TRAP_IGNORE(iPenInputServer.AddPeninputServerObserverL(this)); //always add the handler
+iPenInputSvrConnected = ETrue;
 }
 iPenInputServer.SetForeground(iOpenPenUiFlag);
 return ETrue;
 //read resource from resource
 HBufC* keymapRes = HBufC::NewL(2);
 TLocale locale;
 TChar decimalSep = locale.DecimalSeparator();
 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);
 }
 }
 return editingState;
 }
 void CAknFepPluginManager::ClosePeninputSetting()
 {
-if ( iGsInterface )
+//    if ( iGsInterface )
-{
+//        {
-delete iGsInterface;
+//        delete iGsInterface;
-iGsInterface = NULL;
+//        iGsInterface = NULL;
-}
+//        }
 }
 // ---------------------------------------------------------------------------
 // Show tooltip on FSQ to show the best guess word shown inline.
 // ---------------------------------------------------------------------------
 }
 return EFalse;
 }
-void CAknFepPluginManager::OnServerReady(TInt aErr)
-{
-if( KErrNone != aErr )
-{
-iFepMan.UiInterface()->TouchPaneSetInputMethodIconActivated(EFalse);
-return;
-}
-TRAP_IGNORE(iPenInputServer.AddPeninputServerObserverL(this)); //always add the handler
-iPenInputSvrConnected = ETrue;
-ActivatePenInputL();
-}
-CConnectAo::CConnectAo(CAknFepPluginManager* aClient)
-: CActive(CActive::EPriorityStandard),
-iClient(aClient)
-{
-CActiveScheduler::Add(this);
-//SetActive();
-}
-void CConnectAo::RunL()
-{
-iClient->OnServerReady(iStatus.Int());
-}
-void CConnectAo::DoCancel()
-{
-}
-TInt CConnectAo::RunError(TInt aError)
-{
-return KErrNone;
-}
-void CConnectAo::RequestConnect()
-{
-iStatus = KRequestPending;
-SetActive();
-}
-TRequestStatus& CConnectAo::RequestStatus()
-{
-return iStatus;
-}
 //End of File

changeset 13	3b79bedfdc20
parent 0	eb1f2e154e89
child 17	9ee990de1aa7
child 24	fc42a86c98e3