MCL/sf/mw/inputmethods: comparison textinput/peninputarc/src/peninputserverapp/peninputserver.cpp

equal deleted inserted replaced

-:ac7e4d1d9209
+:ebd48d2de13c
 #include <AknDef.h>
 #include <aknfeppeninputenums.h>
 #include <aknappui.h>
 #include "peninputcrpclient.h"
-#include <avkondomainpskeys.h>
 //#define __WND_TEST_
 // CONSTANTS
 const TSize KInitialPeninputSize= TSize( 10, 10 );
 const TInt KMsgQueueLen = 1000;
 const TInt KMsgResponseQueueLen = 10;
 const TInt KWsSessionFlushPerioid = 50000;//50ms
 const TInt KInvalidValue = -1;
-// Layout UID for portrait FSQ.  Used for distinguish between
-// landscape and portrait FSQ for EPluginInputModeFSQ, which
-// is used for both orientation in Pen Input server side code.
-const TInt KPenInputSrvPrtFsqUiId = 0x20026837;
 enum TActivationFlag
 	{
 	ECmdDeactivate = EFalse,
 	ECmdActivate = ETrue,
 iSpriteSize = KInitialPeninputSize;
 iSpritePosition = TPoint(0,0);
 //iDispMode = iDispModeForMask= CCoeEnv::Static()->WsSession().GetDefModeMaxNumColors(col,grey);
 iPreNonGloebalNotesWndGrpId = -1;
 iNoNeedClean = EFalse;
-	iEnablePriorityChangeOnOriChange = ETrue;
 }
 // ---------------------------------------------------------------------------
 // CPeninputServer::NewL
 // ---------------------------------------------------------------------------
 //
 void CPeninputServer::ConstructL( )
 {
 #ifdef RD_TACTILE_FEEDBACK
+	//KS: QUICK FIX FOR EGSN-7BCBWS
 	FeatureManager::InitializeLibL();
+	//KS: QUICK FIX FOR EGSN-7BCBWS
 	iSupportFeedback = FeatureManager::FeatureSupported( KFeatureIdTactileFeedback );
 #endif //RD_TACTILE_FEEDBACK
 // start server, leaves if server already running
 #endif
 iCurScrMode = CCoeEnv::Static()->ScreenDevice()->CurrentScreenMode();
 iCrpService = CPenInputCrpServiceClient::NewL();
 iSensorRepository = CRepository::NewL(KCRUidSensorSettings);
-User::LeaveIfError(iDiscreetPopProperty.Attach(KPSUidAvkonDomain,
-KAknGlobalDiscreetPopupNumChanged));
-iDiscreetPopSubscriber = new (ELeave) CSubscriber(
-TCallBack( DiscreetPopChangeNotification, this),
-iDiscreetPopProperty);
-iDiscreetPopSubscriber->SubscribeL();
-// Get the pop area
-User::LeaveIfError(iAknUiSrv.Connect());
-iDiscreetPopArea = iAknUiSrv.GetInUseGlobalDiscreetPopupRect();
-if(iDiscreetPopArea.Size().iWidth > 0)
-{
-HandleDiscreetPopNotification();
-}
 }
 void CPeninputServer::CleanAll()
 {
 if(iNoNeedClean)
 delete iFlushTimer;
 }
 #ifdef RD_TACTILE_FEEDBACK
+	//KS: QUICK FIX FOR EGSN-7BCBWS
 	FeatureManager::UnInitializeLib();
+	//KS: QUICK FIX FOR EGSN-7BCBWS
 iFeedbackAreaArray.Close();
 #endif // RD_TACTILE_FEEDBACK
 delete iPenUiCtrl;
 delete iInternalBackgroundCtrl;
 iClientProcess.Close();
 iClientLayouts.Close();
 #ifdef __LOG_WNDGROU__
 iLogFile.Close();
 #endif
-if (iDiscreetPopSubscriber)
-	    {
-	    iDiscreetPopSubscriber->StopSubscribe();
-	    }
-iDiscreetPopProperty.Close();
-delete iDiscreetPopSubscriber;
-iAknUiSrv.Close();
 delete iAnimObj;
 iAnimObj = NULL;
 iNoNeedClean = ETrue;
 // Activate sprite
 // ---------------------------------------------------------------------------
 //
 void CPeninputServer::ActivateSpriteInGlobalNotesL()
 {
-TBool notDraw = EFalse;
-if(iUiLayout)
-{
-iUiLayout->HandleCommand( ECmdPeninputDisableLayoutDrawing,
-(unsigned char*)&notDraw );
-}
-// [[[ temporary solution for Virtual keyboard becomes corrupted after several rotations
-if(!iUiLayout)
-	{
-return;
-	}
-// we should not be able to activate and show pen ui if this mode is disabled currently
-TInt inputType = iUiLayout->PenInputType();
-if( inputType == EPluginInputModeFSQ && iLayoutId.iUid == KPenInputSrvPrtFsqUiId )
-{
-inputType = EPluginInputModePortraitFSQ;
-}
-if( inputType & DisabledByOrientation() )
-{
-// we have activate the animation otherwise we will see the penui but not reponse
-// when clicking on it in the case we rotating the screen quickly and continously
-if(iAnimObj)
-{
-iAnimObj->AddActivationCmd(ECmdActivate,EFalse);
-}
-return;
-}
-// ]]] temporary solution for Virtual keyboard becomes corrupted after several rotations
 if(iActive)
 {
-if(iUseWindowCtrl)
+	    if(iUseWindowCtrl)
-{
+	        {
 /*            RWsSession &ws = CCoeEnv::Static()->WsSession();
 TInt wgId =ws.GetFocusWindowGroup();
 //TInt wgHandle = ws.GetWindowGroupHandle(wgId);
-TInt priority;
+		TInt priority;
-//TInt pos;
+		//TInt pos;
 //wg.Construct(wgHandle);
 //pos = wg.FullOrdinalPosition();
 priority = ws.GetWindowGroupOrdinalPriority(wgId);*/
 //wg.Close();
 //iPenUiCtrl->ShowPenUi();
 ActivatePenUiLayout(EFalse);
 iDimmed = EFalse;
 iPenUiCtrl->ShowPenUiL(iDimmed);
-}
+	        }
-return;
+	    return;
 }
 TBool bNeedWait = AnimOpNeedWaiting(ESignalPenUiActivated);
 //add animation command
 /*
 if(iAnimObj->AddActivationCmd(ECmdActivate,bNeedWait))
-{
+	{
-if(bNeedWait)
+	if(bNeedWait)
-iForegroundUiHandler->AddDelayedCmd();
+		iForegroundUiHandler->AddDelayedCmd();
-//iUiLayout->OnActivate();
+	        //iUiLayout->OnActivate();
 ActivatePenUiLayout();
-DrawSprite();
+	        DrawSprite();
-iEventBufferQueue->GetEvent();
+	        iEventBufferQueue->GetEvent();
-iActive = ETrue;
+	        iActive = ETrue;
-if(iUseWindowCtrl)
+	        if(iUseWindowCtrl)
 iPenUiCtrl->ShowPenUi();
 }
 */
 if(ActivatePenUiLayout(bNeedWait))
 {
-if(bNeedWait)
+	if(bNeedWait)
-iForegroundUiHandler->AddDelayedCmd();
+		iForegroundUiHandler->AddDelayedCmd();
-DrawSprite();
+	        DrawSprite();
-iActive = ETrue;
+	        iActive = ETrue;
-if(iUseWindowCtrl)
+	        if(iUseWindowCtrl)
-{
+	            {
 /*RWsSession &ws = CCoeEnv::Static()->WsSession();
 TInt wgId =ws.GetFocusWindowGroup();
 //TInt wgHandle = ws.GetWindowGroupHandle(wgId);
-TInt priority;
-//TInt pos;
+		TInt priority;
-//wg.Construct(wgHandle);
+		//TInt pos;
-//pos = wg.FullOrdinalPosition();
+//wg.Construct(wgHandle);
-priority = ws.GetWindowGroupOrdinalPriority(wgId);*/
+//pos = wg.FullOrdinalPosition();
-//wg.Close();
+priority = ws.GetWindowGroupOrdinalPriority(wgId);*/
-iPenUiCtrl->ShowPenUiL(iDimmed);
+//wg.Close();
-}
+iPenUiCtrl->ShowPenUiL(iDimmed);
-}
+	            }
 }
+}
 // ---------------------------------------------------------------------------
 // CPeninputServer::ActivateSprite
 // Activate sprite
 // ---------------------------------------------------------------------------
 //
 iPreNonGloebalNotesWndGrpId = focusApp.iUid;
 if(!iUiLayout)
 return;
-// [[[ temporary solution for Virtual keyboard becomes corrupted after several rotations
-// we should not be able to activate and show pen ui if this mode is disabled currently
-TInt inputType = iUiLayout->PenInputType();
-if( inputType == EPluginInputModeFSQ && iLayoutId.iUid == KPenInputSrvPrtFsqUiId )
-{
-inputType = EPluginInputModePortraitFSQ;
-}
-if( inputType & DisabledByOrientation() )
-{
-// we have activate the animation otherwise we will see the penui but not reponse
-// when clicking on it in the case we rotating the screen quickly and continously
-if(iAnimObj)
-{
-iAnimObj->AddActivationCmd(ECmdActivate,EFalse);
-}
-return;
-}
-// ]]] temporary solution for Virtual keyboard becomes corrupted after several rotations
-TBool notDraw = EFalse;
-iUiLayout->HandleCommand(ECmdPeninputDisableLayoutDrawing,(unsigned char*)&notDraw);
 // move it out from if(!iActive) to make sure that msg bubble can be
 // shown if fast swap from other application to msg application.
 TBool bNeedWait = AnimOpNeedWaiting(ESignalPenUiActivated);
 if(!iActive)
 //TBool bNeedWait = AnimOpNeedWaiting(ESignalPenUiActivated);
 //add animation command
 /*
 if(iAnimObj->AddActivationCmd(ECmdActivate,bNeedWait))
-{
+	{
-if(bNeedWait)
+	if(bNeedWait)
-iForegroundUiHandler->AddDelayedCmd();
+		iForegroundUiHandler->AddDelayedCmd();
-//iUiLayout->OnActivate();
+	        //iUiLayout->OnActivate();
 ActivatePenUiLayout();
-DrawSprite();
+	        DrawSprite();
-iEventBufferQueue->GetEvent();
+	        iEventBufferQueue->GetEvent();
-iActive = ETrue;
+	        iActive = ETrue;
-if(iUseWindowCtrl)
+	        if(iUseWindowCtrl)
 iPenUiCtrl->ShowPenUi();
 }
 */
 if(ActivatePenUiLayout(bNeedWait, ETrue))
 {
-if(bNeedWait)
+	if(bNeedWait)
-iForegroundUiHandler->AddDelayedCmd();
+		iForegroundUiHandler->AddDelayedCmd();
-DrawSprite();
+	        DrawSprite();
-iActive = ETrue;
+	        iActive = ETrue;
-if(iUseWindowCtrl)
+	        if(iUseWindowCtrl)
-{
+	            {
 TRAP_IGNORE( iPenUiCtrl->ShowPenUiL(iDimmed) );
-if (iPreNonGloebalNotesWndGrpId != focusApp.iUid &&
+		        if (iPreNonGloebalNotesWndGrpId != focusApp.iUid &&
-IsGlobalNotesApp(focusApp) && !iInGlobalEditorState )
+		            IsGlobalNotesApp(focusApp) && !iInGlobalEditorState )
-{
+		            {
-iDimmed = ETrue;
+	                iDimmed = ETrue;
-DimPenUi();
+	                DimPenUi();
-}
+		            }
-}
+	            }
 }
-iIsLayoutReDrawAllowWhenActive = EFalse;
 }
 else
 {
 //actived but dimmed by global notes
 if(iUseWindowCtrl)
 {
-/**
+ActivatePenUiLayout(EFalse);
-* 1. IF THE GLOBAL NOTES HAS BEEN OPENED UP, WE NEED TO REDRAW THE LAYOUT
-* 2. IF iIsLayoutReDrawAllowWhenActive was set to be ETrue.
-*    if we did not put this condition guard, the layout
-*    redraw will be executed even if the layout is active. But if this flag is
-*    set to be ture, layout redraw will be carried out even if the layout is active, so
-*    it will leave this for layout to decide if it need set this flag to be ture or false
-*    in some special cases: for example for entering and exiting the spell mode.
-*
-*/
-if(iInGlobalNotesApp || iInGlobalEditorState || iIsLayoutReDrawAllowWhenActive )
-{
-ActivatePenUiLayout(EFalse);
-if(iIsLayoutReDrawAllowWhenActive)
-{
-iIsLayoutReDrawAllowWhenActive = EFalse;
-}
-}
-else
-{
-ActivatePenUiLayout(EFalse,ETrue);
-}
 if (iDimmed && (iInGlobalNotesApp || iInGlobalEditorState))
 {
 DeactivatePenUiLayout(EFalse);
 return;
 }
 TRAP_IGNORE( iPenUiCtrl->ShowPenUiL(iDimmed) );
 iDimmed = EFalse;
 }
 }
 }
 // ---------------------------------------------------------------------------
 // CPeninputServer::ActivatePenUiLayout
 // ---------------------------------------------------------------------------
 {
 RecoverSimulatedKeyEventState();
 if(aFlag)
 {
 iEventBufferQueue->Cancel();
-if( iUiLayout )
+iUiLayout->OnDeActivate();
-	{
-			iUiLayout->OnDeActivate();
-	}
 if(iUseWindowCtrl)
 iPenUiCtrl->OnDeactivate(); //disable non fading
 }
 else
 {
 iEventBufferQueue->GetEvent();
-if( iUiLayout )
+iUiLayout->OnActivate();
-	{
-			iUiLayout->OnActivate();
-	}
 if(iUseWindowCtrl)
 iPenUiCtrl->OnActivate(CPenUiWndCtrl::ENoremalEditor); //disable non fading
 }
 }
 iPenUiCtrl->SetResourceChange(iResourceChange);
 }
 break;
 	case EPeninputRequestSupportInputMode:
 	    {
-	    TInt language = 0;
+TInt supportMode = GetSupportModeL();
-	    TPckg<TInt> msgLanguage( language );
-	    aMessage.ReadL( 1, msgLanguage );
+TPckg<TInt> msg(supportMode);
-	    TInt supportMode = GetSupportModeByLanguageL( language );
-TPckg<TInt> msg(supportMode);
 aMessage.WriteL(0,msg);
 	    }
 	    break;
-	case EPeninputRequestSetInputLanguage:
-		{
-			TPckg<TInt> msg(iInputLanguage);
-			aMessage.ReadL(0,msg);
-			if(iUiLayout)
-				{
-				iUiLayout->HandleCommand(ECmdPenInputLanguage,
-						                 (unsigned char*)&iInputLanguage);
-				}
-	    }
-	    break;
-case EPeninputEnablePriorityChangeOnOriChange:
-{
-			TPckg<TBool> enablePriority( iEnablePriorityChangeOnOriChange );
-aMessage.ReadL( 0, enablePriority );
-			}
 default: //Let user pluging handling the user command
 break;
 }
 return err;
 }
 //clear sprite before delete ui layout
 iUILayoutReady = EFalse;
 if(iUiLayout)
 {
-//if(!iUseWindowCtrl)
+		ClearSpriteGc();
-	//{
-			//ClearSpriteGc();
-	//}
 DeactivateSprite();
 iDestroyingLayout = ETrue;
-if(iUseWindowCtrl)
-		   {
-		   if(iPenUiCtrl)
-		       {
-			   iPenUiCtrl->Clean();
-			   }
-		   }
 iUiLayout->Destroy();
 iUiLayout = NULL;
 iDestroyingLayout = EFalse;
 if(iAnimObj)
 {
 {
 iOpaqueUi = ETrue;
 iUseWindowCtrl = ETrue;
 if(iUseWindowCtrl)
 {
-#ifdef FIX_FOR_NGA
+iPenUiCtrl->SetExtent(layoutRect.iTl,layoutSize);
-TBool flag = ETrue;
-iUiLayout->HandleCommand(ECmdPeninputEnableOwnBitmap,reinterpret_cast<TUint8*>(&flag));
-#endif
-iPenUiCtrl->SetExtent(layoutRect.iTl,layoutSize);
 if(iAnimObj)
 {
 iAnimObj->AddEnalbeSpriteCmd(EFalse);
 }
 //must swap back when using window background
 // ---------------------------------------------------------------------------
 //
 void CPeninputServer::DrawSprite()
 {
-if(!iUiLayout || iActive)
+if(!iUiLayout)
 return;
 ClearSpriteGc();
 iUiLayout->Draw();
 if (!iActive) //only update when sprite is active
 return;
 if(iUseWindowCtrl)
 {
-#ifdef FIX_FOR_NGA
+iPenUiCtrl->Invalidate(aRect,EFalse);
-		iPenUiCtrl->Invalidate(TRect( TPoint(0,0), LayoutRect().Size()),EFalse);
-#else
-		iPenUiCtrl->Invalidate(aRect,EFalse);
-#endif
 return;
 }
 	        TRect rect;
 if(aRect.IsEmpty())
 {
 DeactivateSprite();
 }
 else
 {
-if(!iActive)
+ActivateSprite();
-{
-ActivateSprite();
-}
 }
 }
 // ---------------------------------------------------------------------------
 // CPeninputServer::LayoutSizeChanged
 	    iPenUiCtrl->ShowPopup( rectInScreen, rectInLayout, rectTrimLayout );
 	    }
 	    }
 	    break;
-case ESignalEnableLayoutRedrawWhenActive:
-{
+	case ESignalPopupWndClosed:
-				TUint16* buf = const_cast<TUint16* >( aEventData.Ptr() );
+	    {
-TBool* retVal = reinterpret_cast< TBool* > ( buf );
+	    if(iUseWindowCtrl)
-				iIsLayoutReDrawAllowWhenActive = *retVal;
+	        {
-				}
+	        iPenUiCtrl->ClosePopup();
-				break;
+	        }
+	    }
+	    break;
 	default:
-	    if(iUseWindowCtrl)
-	        {
-iPenUiCtrl->HandleNGASpecificSignal(aEventType, aEventData);
-	        }
 		break;
 	}
 }
 }
 // CPeninputServer::HandleResourceChange
 // Handle application resource change
 // ---------------------------------------------------------------------------
 //
 void CPeninputServer::HandleResourceChange(TInt aType)
 {
-	// Update the cursor color when resource is changed
+if(iUiLayout && !(iUiLayout->PenInputType() & DisabledByOrientation()) )
-	iPenUiCtrl->SetCursorColor();
+{
+//hide the layout if it's already shown
-	#ifdef FIX_FOR_NGA
-	// iEnablePriorityChangeOnOriChange will be set to be EFalse, if some dialog in FEP end were opened and
-	// not close after rotation for example: Symbol Table, Writing Language list and Match Dialog on ITI
-	if(iUiLayout && iActive && iEnablePriorityChangeOnOriChange && aType == KEikDynamicLayoutVariantSwitch)
-{
-TPixelsTwipsAndRotation size;
-CCoeEnv::Static()->ScreenDevice()->GetDefaultScreenSizeAndRotation(size);
-TBool isPortrait = ( size.iPixelSize.iWidth < size.iPixelSize.iHeight );
-TBool needToLiftUp = EFalse;
-TInt inputMode = 0;
-inputMode = iUiLayout->PenInputType();
-// If input mode is either ITU-T or portrait FSQ, and if orientation
+iUiLayout->OnResourceChange(aType);
-// is changed to landscape, highest priority is given to Pen UI to avoid
-// flickering problem while drawing landscape FSQ layout.
-if( inputMode == EPluginInputModeItut ||
-( inputMode == EPluginInputModeFSQ &&
-iLayoutId.iUid == KPenInputSrvPrtFsqUiId ) )
-{
-if(!isPortrait)
-{
-needToLiftUp = ETrue;
-}
-}
-else if(inputMode == EPluginInputModeFSQ)
-{
-if(isPortrait)
-{
-needToLiftUp = ETrue;
-}
-}
-else if(inputMode == EPluginInputModeFingerHwr)
-{
-ClearSpriteGc();
-//Close the UI immediately, without notify UI handler
-DeactivateSprite(ETrue, ETrue);
-}
-if(needToLiftUp)
-{
-if(iPenUiCtrl)
-{
-// must lift up the wnd group priority otherwise when rotating screen, the underling application will show first and then
-// our PEN UI, but we should keep an eye on this issue. If NGA will fix the fliker assigned on them, we will check if it will
-// work if we remove this line of code.
-iPenUiCtrl->LiftUpPriority();
-}
-}
-}
-	#endif
-if( iUiLayout )
-{
-TInt inputType = iUiLayout->PenInputType();
-if( inputType == EPluginInputModeFSQ && iLayoutId.iUid == KPenInputSrvPrtFsqUiId )
-{
-inputType = EPluginInputModePortraitFSQ;
-}
-if( !( inputType & DisabledByOrientation() ) )
-{
-//hide the layout if it's already shown
-if ( iActive )
-{
-iUiLayout->OnActivate();
-}
-iUiLayout->OnResourceChange(aType);
-if(iUseWindowCtrl)
-{
-iPenUiCtrl->DrawNow();
-}
-}
 //show the layout if it's active
 }
 }
 // ---------------------------------------------------------------------------
 iPenUiCtrl->ClosePenUi(ETrue);
 iActive = EFalse;
 }
 return;
 }
-*/
+*/    if(iActive && !iPrevActive &&
-TInt inputMode = iUiLayout ? iUiLayout->PenInputType() : EPluginInputModeNone;
+iUiLayout->PenInputType() != EPluginInputModeFSQ &&
+iBackgroudDefaultOri == CAknAppUiBase::EAppUiOrientationUnspecified )
-TBool isArabicFingerInput = (inputMode == EPluginInputModeFingerHwr && iInputLanguage == ELangArabic);
+{
-if(isArabicFingerInput)
-{
-return;
-}
-// Both landscape and portrait FSQs are handled as EPluginInputModeFSQ
-// in Pen Input server. iLayoutId can be used to check it's landscape or
-// portrait.
-TBool isLandscapeFSQ =
-( inputMode == EPluginInputModeFSQ &&
-iLayoutId.iUid != KPenInputSrvPrtFsqUiId )
-? ETrue : EFalse;
-if ( iActive && !iPrevActive && !isLandscapeFSQ &&
-iBackgroudDefaultOri == CAknAppUiBase::EAppUiOrientationUnspecified )
-{
-#ifdef FIX_FOR_NGA
-if(inputMode == EPluginInputModeFingerHwr)
-{
-iPrevActive = ETrue;
-ClearSpriteGc();
-//Close the UI immediately, without notify UI handler
-DeactivateSprite(ETrue, ETrue);
-}
-else
-{// for other input mode: we are not going to cose UI, since it will cause
-// serious fliker: which will have the mixed ui(with other app ui) on pen input ui
-			if(iUiLayout)
-			    {
-				//TBool notDraw = ETrue;
-	            //iUiLayout->HandleCommand(ECmdPeninputDisableLayoutDrawing,(unsigned char*)&notDraw);
-	            iUiLayout->OnDeActivate();
-			    }
-}
-#else
 iPrevActive = ETrue;
 ClearSpriteGc();
-//Close the UI immediately, without notify UI handler
+	    //Close the UI immediately, without notify UI handler
-DeactivateSprite(ETrue, ETrue);
+	    DeactivateSprite(ETrue, ETrue);
-#endif
 }
 }
 // ---------------------------------------------------------------------------
 // CPeninputServer::SetDisabledLayouts
 //
 TInt CPeninputServer::SetDisabledLayouts( TInt aDisabledLayouts )
 {
 // No spcified logic now, so just store the disabled layout in the CFepUiLayoutBase class.
 TInt allowedPlugin = EPluginInputModeNone;// EPluginInputModeHwr | EPluginInputModeVkb | EPluginInputModeItut | EPluginInputModeFSc;
-TInt curLanguage = iInputLanguage;
+CRepository* repository = NULL;
+TRAPD(ret, repository = CRepository::NewL(KCRUidAknFep));
+if (ret != KErrNone)
+{
+return EPluginInputModeAll;
+}
+TInt curLanguage ;
+repository->Get(KAknFepInputTxtLang, curLanguage);
+delete repository;
 if (curLanguage == 401) curLanguage = 102;
 if (curLanguage == 402) curLanguage = 103;
 void CPeninputServer::HandleRawEventL(const TRawEvent& aEvent)
 {
 if(iActive)
 {
 if( aEvent.Type() == TRawEvent::ENone &&
-	aEvent.IsTip()
+	aEvent.IsTip() &&
-	&& iCrpService && iCrpService->IsDsaActive() )
+	iCrpService->IsDsaActive() )
 {
 SignalOwner( ESignalLayoutClosed, KNullDesC );
 }
-TBool handled = iUiLayout ? iUiLayout->HandleEventL(ERawEvent,&aEvent)
+TBool handled = iUiLayout->HandleEventL(ERawEvent,&aEvent);
-		        : EFalse;
 if (TRawEvent::EButton1Down == aEvent.Type())
 {
 iLastRawEvent = aEvent;
 }
 DeactivatePenUiLayout(EFalse);
 iPenUiCtrl->DimPenUiForMenu();
 break;
 }
 */
-if( IsGlobalNotesApp(focusApp) )
+if(IsGlobalNotesApp(focusApp))
 {
 iInGlobalNotesState = ETrue;
-// add this to enable global dim
+break;
-DeactivatePenUiLayout(EFalse);
+}
-break;
-}
 /*                else if (focusApp.iUid == 0x102750f0)
 {
 DeactivateSprite();
 }
-*/               else
+*/                else
 {
 if(iInGlobalNotesState)
 {
 //fix for fast swap case
 iInGlobalNotesState = EFalse;
-if(iPreNonGloebalNotesWndGrpId != focusApp.iUid )
+if(iPreNonGloebalNotesWndGrpId != focusApp.iUid)
 {
 iPreNonGloebalNotesWndGrpId = focusApp.iUid;
 DeactivateSprite(ETrue);//hide pen ui immediately if switched to another application
-// Notify FEP to close touch input window.
+iForegroundSession = NULL;
-// Under this case, touch input window can't be closed without norifying FEP side.
-// After close touch input window, FEP must change some states.
-SignalOwner( ESignalDeactivateSprite, KNullDesC );
 }
 }
 else
 {
 DeactivateSprite(ETrue);
 }
 }
 break;
 }
 DeactivateSprite(ETrue);//hide pen ui immediately
 	    }
 break;
 default:
 {
 return EFalse;
 }
 if(iForegroundUiHandler)
 {
-		TInt uiType = iUiLayout  ? iUiLayout->PenInputType() : EPluginInputModeNone;
+TInt uiType = iUiLayout->PenInputType();
 bNeedWait = iForegroundUiHandler->SignalUiActivationObserver(
 			aSignalCode,uiType);
 }
 return bNeedWait;
 	}
 }
 }
 void CPeninputServer::RecoverButtonEventState()
 {
-	if(!iUiLayout)
-		{
-		return;
-		}
 if (TRawEvent::EButton1Down == iLastRawEvent.Type())
 {
 iLastRawEvent.Set(TRawEvent::EButton1Up);//,iLastSimulatedKeyEvent.ScanCode()
 TRAP_IGNORE( iUiLayout->HandleEventL(ERawEvent,&iLastRawEvent) );
 }
 {
 return disabled |= EPluginInputModeFSQ;
 }
 if( size.iPixelSize.iWidth > size.iPixelSize.iHeight )
 {
-// Portrait input modes which are ITU-T and Portrait FSQ
+return disabled |= EPluginInputModeItut;
-// should be disabled in portrait orientation.
-// Note: no need to check feature flag because if it is not
-// turned on, EPluginInputModePortraitFSQ will not be handled
-// at all so adding it to "disabled" will take no effect.
-disabled |= EPluginInputModeItut | EPluginInputModePortraitFSQ;
-return disabled;
 }
 }
 }
 }
 return disabled;
 }
 TInt CPeninputServer::GetSupportModeL()
 {
-TInt curLanguage = iInputLanguage;
+CRepository* repository = NULL;
+TRAPD(ret, repository = CRepository::NewL(KCRUidAknFep));
+if (ret != KErrNone)
+{
+return ret;
+}
+TInt curLanguage ;
+repository->Get(KAknFepInputTxtLang, curLanguage);
+delete repository;
+repository = NULL;
 if (curLanguage == 401) curLanguage = 102;
 if (curLanguage == 402) curLanguage = 103;
 }
 tempMode<<=1;
 }
 return supportMode;
 }
-TInt CPeninputServer::GetSupportModeByLanguageL( TInt aInputLanguage )
-	{
-TInt curLanguage = aInputLanguage;
-if ( curLanguage == 401 )
-	{
-curLanguage = 102;
-	}
-if (curLanguage == 402)
-	{
-curLanguage = 103;
-	}
-TInt supportMode = EPluginInputModeNone;
-TInt tempMode = EPluginInputModeHwr;
-iLayoutEng->InitializeL();
-while ( tempMode < EPluginInputModeAll )
-{
-if ( iLayoutEng->IsSupportPluginMode( ( TLanguage )curLanguage,
-( TPluginInputMode )tempMode ) )
-{
-supportMode |= tempMode;
-}
-tempMode<<=1;
-}
-return supportMode;
-	}
-// ---------------------------------------------------------------------------
-// CPeninputServer::DiscreetPopChangeNotification
-// handle notification of discreept pop changing
-// ---------------------------------------------------------------------------
-//
-TInt CPeninputServer::DiscreetPopChangeNotification(TAny* aObj)
-{
-if (aObj)
-{
-static_cast<CPeninputServer*>(aObj)->HandleDiscreetPopNotification();
-return KErrNone;
-}
-else
-{
-return KErrArgument;
-}
-}
-// ---------------------------------------------------------------------------
-// CPeninputServer::HandleDiscreetPopNotification
-// handle notification of discreept pop changing
-// ---------------------------------------------------------------------------
-//
-void CPeninputServer::HandleDiscreetPopNotification()
-{
-	iDiscreetPopArea = iAknUiSrv.GetInUseGlobalDiscreetPopupRect();
-	iAnimObj->SetDiscreetPopArea(iDiscreetPopArea);
-}
 // ======== class CEventQueue========
 //
 // ---------------------------------------------------------------------------
 // CEventQueue::CEventQueue
 // Constructor. Adds the active object to the active scheduler
 //
 GLDEF_C void PanicServer(TPeninputServerPanic aPanic)
 {
 User::Panic( KPeninputServerName, aPanic );
 }
-// ======== class CSubscriber========
-//
-CSubscriber::CSubscriber(TCallBack aCallBack, RProperty& aProperty)
-:
-CActive(EPriorityNormal), iCallBack(aCallBack), iProperty(aProperty)
-{
-CActiveScheduler::Add(this);
-}
-CSubscriber::~CSubscriber()
-{
-Cancel();
-}
-void CSubscriber::SubscribeL()
-{
-if (!IsActive())
-{
-iProperty.Subscribe(iStatus);
-SetActive();
-}
-}
-void CSubscriber::StopSubscribe()
-{
-Cancel();
-}
-void CSubscriber::RunL()
-{
-if (iStatus.Int() == KErrNone)
-{
-iCallBack.CallBack();
-SubscribeL();
-}
-}
-void CSubscriber::DoCancel()
-{
-iProperty.Cancel();
-}
 // End of File

branch	RCL_3
changeset 20	ebd48d2de13c
parent 19	ac7e4d1d9209
child 21	ecbabf52600f