FCL/sf/mw/uiaccelerator: comparison uiacceltk/hitchcock/plugins/alftranseffect/alftranseffectplugin/src/alfserverdrawer.cpp

equal deleted inserted replaced

-:f93c875b566e
+:3a60ebea00d0
 #include "alfmoduletest.h"
 // This sets the maximum time for an effect. Even if the fxml file has specified a longer duration,
 // this will stop the effect.
 const TInt KAlfShortEffectTimeout     = 4000000;
+// Note, The timeouts are DIFFERENT for EMULATOR AND ARMV5
+#ifdef __WINS__
+const TInt KAlfAppStartEffectTimeout  = 800000;
+const TInt KAlfLongEffectTimeout      = 10000000;
+#else
 const TInt KAlfAppStartEffectTimeout  = 300000;
 const TInt KAlfLongEffectTimeout      = 5000000;
+#endif
 const TInt KAlfActiveControlFxGranularity = 4;
 const TInt KAlfLongApplicationStartContext = 20;
 //const TInt KAlfLongEffectTimeout  = 500000;
 // Timer to send finish full screen effect
 bufferSize += fileName.Length() * 2;
 // I don't think we need this
 TInt index = 0;
-IncreaseFullScreenHandle();
+iCurrentFullScreenHandle = iToSid.iId;
 iFullScreenTransitionEndObserver->Cancel();
 iFinishFullScreen->Cancel();
 iFullScreenTimeout->Cancel();
 if ( bridgeBuffer )
 {
 RMemWriteStream stream( bridgeBuffer, bufferSize );
 // The writes should not leave if we have calculated our buffer length correctly.
 stream.WriteInt32L( MAlfGfxEffectPlugin::EBeginFullscreen );
-stream.WriteInt32L(  iToSid.iId ); //iCurrentFullScreenHandle );
+stream.WriteInt32L(  iToSid.iId );
 stream.WriteInt32L( iType );
-stream.WriteInt32L( 0 ); // timeout triggered
+stream.WriteInt32L( 0 ); // timeout? 0 always in BeginFullScreen
+stream.WriteInt32L( 0 );
 	if ( iType == AknTransEffect::EParameterType && isExit )
 	    {
 stream.WriteInt32L( iToWg );
 stream.WriteInt32L( 0 );
 // endfullscreen signals.
 // It appears that folder open and close never send endfullscreen, so for them the effect
 // must be started as soon as we get beginfullscreen
-isAppStartEffect = EFalse; // disable different timeout effect for appstart effects
+// isAppStartEffect = EFalse; // disable different timeout effect for appstart effects
 if (isAppStartEffect)
 {
 		// The shorter timeout can be disabled here!
 iFullScreenTimeout->Start( KAlfAppStartEffectTimeout, TCallBack( FullScreenTimeout, this ) );
 if ( iFullScreenEndSent )
 {
 __ALFFXLOGSTRING("CAlfServerDrawer::SendEndFullscreen END no need");
 return KErrNone;
 }
-iFullScreenEndSent = ETrue;
 __ALFFXLOGSTRING("CAlfServerDrawer::SendEndFullscreen");
 iFullScreenTransitionEndObserver->Cancel();
 iFullScreenTimeout->Cancel();
 iFinishFullScreen->Cancel();
+TBool timeout = iFullScreenTimeout->iTimeoutTriggered;
 TBool triggerStartEffectTimeout= iFullScreenTimeout->iTimeoutTriggered && iFullScreenTimeout->iIsStartEffect;
+iFullScreenEndSent = !triggerStartEffectTimeout;
 iFullScreenTimeout->iTimeoutTriggered = EFalse;
 iFullScreenTimeout->iIsStartEffect = EFalse;
 // This is where the second part of the effect should start
 // The new window should already have something on the screen.
 // We must make a stream of the data as the length may vary.
 // At the moment we only send some numbers, but we should probably include
 // also the effect file name or something else to identify the effect
 // that is going to be used
-TInt bufferSize = 12 * sizeof(TInt); // operation, type, 2 wg ids, 2 app uids, flags and rect, timeoutTriggered
+TInt bufferSize = 13 * sizeof(TInt); // operation, type, 2 wg ids, 2 app uids, flags and rect, timeoutTriggered
 bufferSize += sizeof(TPtrC);
 bufferSize += resourceDir.Length() * 2;
 bufferSize += sizeof(TPtrC);
 bufferSize += fileName.Length() * 2;
 {
 stream.WriteInt32L( MAlfGfxEffectPlugin::EEndFullscreen );
 stream.WriteInt32L( iCurrentFullScreenHandle );
 stream.WriteInt32L( iType );
 stream.WriteInt32L( triggerStartEffectTimeout );
+stream.WriteInt32L( timeout );
 stream.WriteInt32L( iToWg );
 stream.WriteInt32L( iFromWg );
 // AppUid for the future. alfbridge can figure out the windog groups based on that
 stream.WriteInt32L( iToUid.iUid );
 iFullScreenTransitionEndObserver->StartObserving( TCallBack( FullScreenTransitionFinished, this ), iCurrentFullScreenHandle  );
 }
 iFullScreenFinished = EFalse;
 iFullScreenTimeout->iIsStartEffect = EFalse;
+if (triggerStartEffectTimeout)
+{
+return KErrNone;
+}
 if ( iAction == AknTransEffect::EApplicationExit /*||
 iAction == 1001*/  )
 {
 		// no more events expected
 iFinishFullScreen->Start( KAlfShortEffectTimeout, TCallBack( FinishFullScreenTimeout, this ) );
 {
 return KErrNone;
 }
 iFullScreenTransitionEndObserver->Cancel();
+iFinishFullScreen->Cancel();
+iFullScreenTimeout->Cancel();
 iFullScreenFxSent = EFalse;
 iFullScreenEndSent = ETrue;
 // Send the data to CAlfAppUI via bridge
 TAlfBridgerData bridgerData;
 // handles must be unique, but increasing control handle should not change fullscreen handle
 TInt highestHandle = iCurrentControlHandle > iCurrentFullScreenHandle ? iCurrentControlHandle : iCurrentFullScreenHandle;
 highestHandle++;
 iCurrentControlHandle = highestHandle;
 	}
-void CAlfServerDrawer::IncreaseFullScreenHandle()
-{
-TInt highestHandle = iCurrentControlHandle > iCurrentFullScreenHandle ? iCurrentControlHandle : iCurrentFullScreenHandle;
-highestHandle++;
-iCurrentFullScreenHandle = highestHandle;
-}
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 TInt CAlfServerDrawer::CurrentControlHandle()
 if ( iFullScreenTimeout->iStatus.Int() != KErrCancel )
 {
 iFullScreenTimeout->Cancel();
 // If we don't get an EndFullScreen in a timely manner,
 // we generate an EndFullScreen signal by ourselves
-EndFullscreen();
+EndFullscreen(ETrue);
 }
 }
 TInt CAlfServerDrawer::FinishFullScreenTimeout( TAny* aServerDrawer )
 {

branch	RCL_3
changeset 34	3a60ebea00d0
parent 24	f93c875b566e
child 41	cd0ae4656946