MCL/sf/mw/classicui: comparison uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 #include <AknFepInternalPSKeys.h>    // KAknFepFnKeyState
 #endif
 #include "avkoninternalpskeys.h"     // KAknIdleAppWindowGroupId
 #include <AknCapServerDefs.h>
-#include <activeidle2domainpskeys.h>
 #include <eikpriv.rsg>
 #include <coedef.h>
 #include <eiksvdef.h>
 #include <aknconsts.h>
 #include <AknsConstants.h>
 #ifdef RD_UI_TRANSITION_EFFECTS_LAYOUT_SWITCH
 #include <gfxtranseffect/gfxtranseffect.h>
 #include <akntranseffect.h> // for Transition effect enumerations
 #endif
-#ifdef SYMBIAN_BUILD_GCE
-#include <alf/alfclientbase.h>
-#endif
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 #include <AvkonInternalCRKeys.h>
 #include "akncapserverdiscreetpopuphandler.h"
 const TUid KPtiEnginePSUid = {0x101F8610}; // Same as PtiEngine dll
+const TUid KPhoneUid = { 0x100058B3 };
 enum TPtiEnginePSKeys
 {
 EKeyMapPropertyCount,
 EKeyMapPropertyData,
 EKeyMapPropertyCount2,
 const TInt KWgPriorityCoverEverything = 10000;
 const TInt KKeyEventICodeThreshold = 0x001f;
 const TInt KMaxLanguageCodeLength = 6; // 5 digits + separator
-const TInt KRemoveBlankDelay = 200000; // 0.2s
 _LIT(KEikSrvUIResFileName, "z:\\resource\\eiksrvui.rsc");
 _LIT_SECURITY_POLICY_PASS(KPassReadPolicy);
 _LIT_SECURITY_POLICY_C1(KWriteDDPolicy, ECapabilityWriteDeviceData);
 _LIT_SECURITY_POLICY_C1(KReadPolicy,    ECapability_None);
 }
 CAknCapAppServerAppUi::~CAknCapAppServerAppUi()
 {
 delete iAlternateFS;
-delete iTelephonyIdleUidSubscriber;
 delete iGlobalNotesAllowedSubscriber;
 if (iKeyCaptureControl)
 {
 RemoveFromStack(iKeyCaptureControl);   // ownership in stack
 delete iHiddenList;
 delete iMMCUnlock;
 delete iIdler;
 iEikSrv.Close(); // this shouldn't be connected here anyway
 delete iPtiEngine;
-iAlfClient.Close();
 }
 _LIT(KProductSpecificHalFile, "z:\\system\\data\\ProductSpecificHalParams.txt");
 void DoProductSpecificHalFunction()
 // we panic here if something goes wrong as startup will fail anyway.
 __ASSERT_ALWAYS(err==KErrNone, User::Invariant());
 me->iEikSrv.AllowNotifierAppServersToLoad();
 me->iEikSrv.Close(); // currently there is no use to keep this session alive.
-#ifdef SYMBIAN_BUILD_GCE
-TRAP(err, CAlfAsynchStartup::StartL());
-#endif
 return err;
 }
 void CAknCapAppServerAppUi::LoadAlternateFsPlugin()
 {
 void CAknCapAppServerAppUi::ConstructL()
 {
 User::SetCritical(User::ESystemCritical);
 InitiateOFNStatus();
-iEikonEnv->SetSystem( ETrue );
 // install default FEP if none set before
 if (iEikonEnv->FepUid() == KNullUid)
 {
 iEikonEnv->InstallFepL(TUid::Uid(0x101FD65A));
 iKeyCaptureControl->ConstructL(*this);
 TFileName fileName(KEikSrvUIResFileName);
 BaflUtils::NearestLanguageFile(iEikonEnv->FsSession(),fileName);
 iResourceFileOffset=iCoeEnv->AddResourceFileL(fileName);
+// Create FSW
+iFSControl= new (ELeave) CAknFastSwapWindowControl(*this);
+iFSControl->ConstructL();
 // MMC unlocker
 iMMCUnlock = CAknMMCPasswordRequester::NewL();
 // Boost our priority similar to eikon server.
 TCallBack(GlobalNotesAllowedCallBack, this),
 iGlobalNotesAllowedProperty);
 iGlobalNotesAllowedSubscriber->Subscribe();
-// Start listening "telephony idle uid" property.
-User::LeaveIfError(iTelephonyIdleUidProperty.Attach(
-KPSUidAiInformation,
-KActiveIdleUid));
-iTelephonyIdleUidSubscriber = new (ELeave) CPropertySubscriber(
-TCallBack(TelephonyIdleUidCallBack, this),
-iTelephonyIdleUidProperty);
-iTelephonyIdleUidSubscriber->Subscribe();
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 TInt err1 = 0;
 err1 = RProperty::Define(KPtiEnginePSUid, EKeyMapPropertyCount, RProperty::EInt,
 	 	}
 #endif
 // Create capserver discreetpopuphandler
 CAknCapServerDiscreetPopupHandler::CreateDiscreetPopupHandlerL();
+	LoadAlternateFsPlugin();
-LoadAlternateFsPlugin();
-// Create FSW
-if ( iAlternateFS == NULL )
-{
-iFSControl= new (ELeave) CAknFastSwapWindowControl(*this);
-iFSControl->ConstructL();
-}
 	ProcessInitFlipStatus();
 }
 TKeyResponse CAknCapAppServerAppUi::HandleKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType)
 {
 iAlternateFS->Dismiss();
 }
 }
 else
 {
-if ( iFSControl )
+if ( aMessage.Int0() )
-	{
+{
-if ( aMessage.Int0() )
+TInt err = KErrNone;
-{
+TRAP( err, iFSControl->InitializeWindowGroupListL( EFalse ));
-TInt err = KErrNone;
+if ( !err )
-TRAP( err, iFSControl->InitializeWindowGroupListL( EFalse ));
+{
-if ( !err )
+iFSControl->RunFastSwapL();
-{
-iFSControl->RunFastSwapL();
-}
 }
-else
+}
-{
+else
-iFSControl->CloseFastSwap();
+{
-}
+iFSControl->CloseFastSwap();
-	}
+}
 }
 }
 aMessage.Complete(KErrNone);
 break;
 }
 case EAknSRefreshTaskList:
 {
 TInt err = UpdateTaskListL( ETrue );
 if ( err != KErrNone )
 {
-if ( iFSControl )
+iFSControl->CloseFastSwap();
-	{
-iFSControl->CloseFastSwap();
-	}
 }
 aMessage.Complete(err);
 break;
 }
 default:
 if(iAlternateFS && iAlternateFS->IsReady() && iAlternateFS->IsVisible())
 {
 iAlternateFS->HandleShortAppKeyPress();
 return ETrue;
 }
-if ( iFSControl )
+if (iFSControl->IsVisible())
-	{
+{
-if (iFSControl->IsVisible())
+iFSControl->HandleShortAppsKeyPressL();
-{
+return ETrue;
-iFSControl->HandleShortAppsKeyPressL();
+}
-return ETrue;
-}
-	}
 return EFalse;
 }
 TBool CAknCapAppServerAppUi::HandleLongAppsKeyPressL()
 {
 ShowOrDismissAlternateFs();
 }
 else
 {
-if ( iFSControl )
+if (iFSControl->IsVisible())
-	{
+{
-if ( iFSControl->IsVisible())
+iFSControl->HandleLongAppsKeyPressL();
+}
+else
+{
+if (iFSControl->VisibleWindowGroupsCountL()<1)
 {
-iFSControl->HandleLongAppsKeyPressL();
+return EFalse;
 }
 else
 {
-if (iFSControl->VisibleWindowGroupsCountL()<1)
+iFSControl->RunFastSwapL();
-{
-return EFalse;
-}
-else
-{
-iFSControl->RunFastSwapL();
-}
 }
-	}
+}
 }
 }
 return ETrue;
 }
 {
 iStatusPane->SwitchLayoutL(aLayoutResId);
 }
 }
-TInt CAknCapAppServerAppUi::RemoveBlankCallBack( TAny* aThis )
+void CAknCapAppServerAppUi::BlankScreenL(TBool aBlank, TBool aToForeground)
-{
-static_cast<CAknCapAppServerAppUi*>( aThis )->DoRemoveBlank();
-return EFalse;
-}
-void CAknCapAppServerAppUi::BlankScreenL(TBool aBlank, TBool /* aToForeground */)
 {
 if (aBlank)
 {
 if (++iBlankWinRefCount == 1)
 {
-delete iRemoveBlankCallBack;
-iRemoveBlankCallBack = NULL;
-		    // We are ignoring the foreground parameter because we only have one
-// type of blanking behaviour in AlfClient. Act as if ETrue
-iAlfClient.BlankScreen(ETrue);
-iForegroundBlankScreen = ETrue; // always as if foreground blanking
-/*
 ASSERT(!iBlankWin);
 if (aToForeground)
 {
 iBackdropWindowGroup.SetOrdinalPosition(0, KWgPriorityCoverEverything);
 }
 {
 iBackdropWindowGroup.SetOrdinalPosition(1, ECoeWinPriorityNormal);
 }
 iBlankWin = CAknServBlankWin::NewL(iBackdropWindowGroup, iStatusPane);
 iForegroundBlankScreen = aToForeground;
-*/
 }
 }
 else if (--iBlankWinRefCount <= 0)
 {
 iBlankWinRefCount = 0;
+if (iForegroundBlankScreen)
-// Blanking IPC is delayed or restarted
+{
-delete iRemoveBlankCallBack;
-iRemoveBlankCallBack = NULL;
-iRemoveBlankCallBack = CPeriodic::NewL(CActive::EPriorityLow);
-iRemoveBlankCallBack->Start(
-KRemoveBlankDelay,
-KRemoveBlankDelay,
-TCallBack(RemoveBlankCallBack, this));
-/*        if (iForegroundBlankScreen)
-{
-*/
 #ifdef RD_UI_TRANSITION_EFFECTS_LAYOUT_SWITCH
+CWsScreenDevice* screen = iEikonEnv->ScreenDevice();
 /*
-CWsScreenDevice* screen = iEikonEnv->ScreenDevice();
 RWsSession& ws = iEikonEnv->WsSession();
 TInt wgId = ws.GetFocusWindowGroup();
 CApaWindowGroupName* wgName = CApaWindowGroupName::NewL(ws, wgId);
 CleanupStack::PushL( wgName );
 TUid appUid = wgName->AppUid();
 //        TRect( screen->SizeInPixels() ),
 //        AknTransEffect::EParameterType,
 //        AknTransEffect::GfxTransParam( KTfxServerUid )
 //        );
-//            GfxTransEffect::EndFullScreen();
+GfxTransEffect::EndFullScreen();
 #endif
-/*            iBackdropWindowGroup.SetOrdinalPosition(1, ECoeWinPriorityNormal);
+iBackdropWindowGroup.SetOrdinalPosition(1, ECoeWinPriorityNormal);
 }
 delete iBlankWin;
 iBlankWin = 0;
-*/
 iForegroundBlankScreen = EFalse;
 }
 }
-void CAknCapAppServerAppUi::DoRemoveBlank()
-{
-RDebug::Print( _L("CAknCapAppServerAppUi::DoRemoveBlank"));
-iAlfClient.BlankScreen(EFalse);
-delete iRemoveBlankCallBack;
-iRemoveBlankCallBack = NULL;
-}
 void CAknCapAppServerAppUi::SwapLayoutSwitchBlankScreenL()
 {
-	/*
 if (iBlankWin)
 {
 if (!iForegroundBlankScreen)
 {
 iBackdropWindowGroup.SetOrdinalPosition(0, KWgPriorityCoverEverything);
 CAknServBlankWin* newBlankWin = CAknServBlankWin::NewL(iBackdropWindowGroup, iStatusPane);
 newBlankWin->SetLayoutBlank(ETrue);
 delete iBlankWin;
 iBlankWin = newBlankWin;
 }
-*/
 }
 TBool CAknCapAppServerAppUi::IsDisplayingForegroundBlankScreen() const
 {
 return iForegroundBlankScreen;
 		}
 }
 void CAknCapAppServerAppUi::HandleWsEventL(const TWsEvent& aEvent,CCoeControl* aDestination)
 {
-if ( iMessageReaderLongPressDetector &&
+if ( iMessageReaderLongPressDetector && !IsAppsKeySuppressed() && !iFSControl->IsDisplayed() )
-	 !IsAppsKeySuppressed() &&
-	 ( iFSControl == NULL || !iFSControl->IsDisplayed() ) )
 {
 // Message Reader can be launched by long pressing left soft key
 // events need to be intercepted/consumed before they are forwarded to cba
 if ( iMessageReaderLongPressDetector->HandleWsEventL( aEvent, aDestination ) )
 {
 // ---------------------------------------------------------
 //
 TInt CAknCapAppServerAppUi::UpdateTaskListL( TBool aTaskListRefreshNeeded )
 {
 TInt err = KErrNone;
-if ( iFSControl && iFSControl->IsDisplayed() )
+if ( iFSControl->IsDisplayed() )
 {
 // update window group list (task list)
 TInt windowGroupListChanged = ETrue;
 TRAP( err, windowGroupListChanged = iFSControl->InitializeWindowGroupListL(
 {
 TChar::TBdCategory numCategory;
 TBool isNumber = EFalse;
 numCategory = (TChar(aChar)).GetBdCategory();
 isNumber = ((numCategory == TChar::EEuropeanNumber) || (numCategory == TChar::EArabicNumber) ||
-(numCategory == TChar::EEuropeanNumberTerminator) ||
+(numCategory == TChar::EEuropeanNumberTerminator) || (aChar == 0x2E) ||
-( numCategory == TChar::EEuropeanNumberSeparator ) ||
-(aChar == 0x2E) ||
 (aChar == 0x2A) || (aChar == 0x3D) || (aChar == 0x2F));
 return isNumber;
 }
 #endif
 self->HandlePropertyChange(KUikGlobalNotesAllowed);
 }
 return KErrNone;
 }
-TInt CAknCapAppServerAppUi::TelephonyIdleUidCallBack(TAny* aPtr)
-{
-CAknCapAppServerAppUi* self = static_cast<CAknCapAppServerAppUi*>(aPtr);
-if (self)
-{
-self->HandlePropertyChange(KActiveIdleUid);
-}
-return KErrNone;
-}
 void CAknCapAppServerAppUi::HandlePropertyChange(const TInt aProperty)
 {
 switch(aProperty)
 {
 case KUikGlobalNotesAllowed:
 {
-TInt globalNotesAllowed = 0;
+TUid uid = KPhoneUid;
-TInt err = iTelephonyIdleUidProperty.Get(globalNotesAllowed);
+TApaTaskList taskList ( CEikonEnv::Static ()->WsSession () );
-if(!err && globalNotesAllowed)
+TApaTask task = taskList.FindApp ( uid );
+if ( task.Exists() )
 {
-// Global notes allowed, so the boot is finished. Now the idle app uid and its
+TInt wgId = task.WgId ();
-// window group id can be fetched.
-HandlePropertyChange(KActiveIdleUid);
-}
-}
-break;
-case KActiveIdleUid:
-{
-TInt idleAppUid = 0;
-TInt err = iTelephonyIdleUidProperty.Get(idleAppUid);
-if(!err)
-{
-// Fetch the Idle application window group id.
-TApaTaskList taskList(CEikonEnv::Static()->WsSession());
-TApaTask task = taskList.FindApp(TUid::Uid(idleAppUid));
-TInt wgId = task.WgId();
 // Save the window group id to PubSub.
-RProperty::Set(KPSUidAvkonInternal, KAknIdleAppWindowGroupId, wgId);
+RProperty::Set ( KPSUidAvkonInternal, KAknIdleAppWindowGroupId,
+wgId );
 }
 }
 break;
 default:
 break;

branch	RCL_3
changeset 19	aecbbf00d063
parent 18	fcdfafb36fe7
child 20	d48ab3b357f1