MCL/sf/os/graphics: comparison windowing/windowserver/nga/CLIENT/RWINDOW.CPP

equal deleted inserted replaced

-:bbf46f59e123
+:25ffed67c7ef
-// Copyright (c) 1994-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1994-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <e32std.h>
 #include "../SERVER/w32cmd.h"
 #include "CLIENT.H"
 #include "w32comm.h"
 #include <graphics/surface.h>
-#include "rtfxeffect.h"
 RWindowTreeNode::RWindowTreeNode()
 /** Protected default constructor.
 This creates a sessionless, uninitialised window tree node handle. This class
 	    {
 	    if (WindowSizeCacheEnabled())
 	         {
 	         DestroyWindowSizeCacheEntry();
 	         }
+#ifdef SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
+	    if (WindowNativeSizeCacheEnabled())
+	         {
+	         DestroyWindowNativeSizeCacheEntry();
+	         }
+#endif // SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
 Write(EWsWinOpFree);
 	    }
 	iWsHandle=NULL;
 	}
 return size;
 }
 }
 	}
+EXPORT_C TSize RWindowBase::SizeForEgl() const
+#ifdef SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
 /**
 @internalAll
 Disclaimer - this API is internal and is subject to change
-@deprecated */
+@prototype */
-EXPORT_C TSize RWindowBase::SizeForEgl() const
+	{
+	TSize size;
+	if (WindowNativeSizeCacheEnabled() && WindowNativeSize(size) == KErrNone)
+		{
+		return size;
+		}
+	else
+		{
+		return Size();
+		}
+	}
+#else
 {
-return Size();
+// API should not be used if macro undefined.
+ASSERT(0);
+return TSize();
 }
+#endif // SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
 EXPORT_C void RWindowBase::SetPosition(const TPoint &aPos)
 /** Sets the position of a window relative to its parent.
 The co-ordinates given in aPos specify the position of the top left-hand
 corner of the window, relative to the top left-hand corner of its parent.
 (for example a touch screen that is able to determine coordinates of more than
 one finger touching it at the same time), then this method will enable delivering
 events from all detected pointers to this window.
 This method must be called before the window is activated by calling RWindowBase::Activate().
-Otherwise the client is panicked with the code EWservPanicUnableToEnableAdvPointer.
+Otherwise this will be ignored (release build), or panic (debug build).
 If this method is not called for the window, it is assumed that the window is not
 able to receive events from multiple pointers, and thus only events from a single
 emulated pointer are sent to it. Emulated pointer ensures that code written for a single
 pointer environment works properly in a multiple pointer environment: there is only
 	}
 /**
 @internalAll
 Disclaimer - this API is internal and is subject to change
-@deprecated */
+@prototype */
 EXPORT_C TInt RWindowBase::FixNativeOrientation()
+#if !defined(SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION) || defined (SYMBIAN_GRAPHICS_BUILD_OPENWF_WSERV) || defined (__WINS__)
 {
 return KErrNotSupported;
 }
+#else
+	{
+TInt err = KErrNone;
+	if (!WindowNativeSizeCacheEnabled())
+		{
+		TRAP(err, EnableWindowNativeSizeCacheL());
+		if (err != KErrNone)
+		    {
+return err;
+		    }
+		}
+	const CFbsBitGc::TGraphicsOrientation orientation = static_cast<CFbsBitGc::TGraphicsOrientation>(WriteReply(EWsWinOpFixNativeOrientation));
+	switch (orientation)
+		{
+	case CFbsBitGc::EGraphicsOrientationNormal:
+case CFbsBitGc::EGraphicsOrientationRotated180:
+		err = SetWindowNativeSize(Size());
+break;
+	case CFbsBitGc::EGraphicsOrientationRotated90 :
+case CFbsBitGc::EGraphicsOrientationRotated270:
+{
+	    TSize size = Size();
+	    err = SetWindowNativeSize(TSize(size.iHeight, size.iWidth));
+}
+		break;
+	default:
+	    Assert(EW32AssertInvalidOrientation);
+		}
+	return err;
+	}
+#endif // SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION
 EXPORT_C TInt RWindowBase::AllocPointerMoveBuffer(TInt aMaxNumPoints, TUint aFlags)
 /** Allocates a buffer for storing pointer movements.
 The pointer move buffer is used by applications that need to process every
 	argb.SetInternal(WriteReply(EWsWinOpKeyColor));
 	return argb;
 	}
-EXPORT_C void RWindowBase::SetPurpose(TInt aPurpose)
+// RDrawableWindow //
-/**
-Sets specific window  purpose to the TFX layer. The purpose passed
-by the client API will be directed to MWsTfxLayer::SetPurpose.
-@param aPurpose The window purpose information.
-@see MWsTfxLayer
-@publishedPartner
-@prototype
-*/
-	{
-	WriteInt(aPurpose,EWsWinOpSetPurpose);
-	}
-EXPORT_C void RWindowBase::SendEffectCommand(TInt aTfxCmd,const TDesC8& aTfxCmdData)
-/**
-Sets specific effect data or execute commands to the TFX layer.
-The data or command passed by the client API will be directed to MWsTfxLayer::SendEffectCommand.
-MWsTfxLayer will accept only window specific commands and data.
-@param aTfxCmd TFX layer command.
-@param aTfxCmdData Data structure related to the specified value of aTfxCmd. The default value is KNullDesC8.
-@publishedPartner
-*/
-{
-__ASSERT_ALWAYS(aTfxCmdData.Length()<=KMaxWservStringSize, Panic(EW32PanicStringTooLong));
-TWsClCmdSendEffectCommand params(aTfxCmd,aTfxCmdData.Size(),this->iWsHandle);
-Write(&params,sizeof(params),aTfxCmdData.Ptr(),aTfxCmdData.Size(),EWsWinOpSendEffectCommand);
-}
-EXPORT_C void RWindowBase::OverrideEffects(TInt aAction, const TFileName& aResourceDir, const TFileName& aFilenameOutgoing, const TFileName& aFilenameIncoming, TBitFlags aFlags)
-/**
-Overides the default animation for current window's transition effect by sent animation description.
-Please refer RWsSession::RegisterEffect() comments for more information on animation description.
-@param aAction The particular transition to set the animation for.
-@param aResourceDir The name of the directory that contains the animation description files.
-@param aFilenameOutgoing The file containing the description of the animation for the outgoing phase of the transition.
-						 Specify KNullDesC for no outgoing phase effect.
-@param aFilenameIncoming The file containing the description of the animation for the incoming phase of the transition.
-						 Specify KNullDesC for no incoming phase effect.
-@param aFlags Flag for the effect. Please see TTfxFlags for values this flag parameter can use.
-@publishedPartner
-*/
-	{
-	RTFXEffect tfxEffect(iWsHandle, iBuffer);
-	tfxEffect.OverrideTFXEffect(RTFXEffect::ETFXWindow, aAction, 0, aResourceDir, aFilenameOutgoing, aFilenameIncoming, aFlags);
-	}
-//////////////////////////// RDrawableWindow ////////////////////////////////
 void RDrawableWindow::doScroll(const TRect &aClipRect, const TPoint &aOffset, const TRect &aRect, TInt aOpcode)
 	{
 	TWsWinCmdScroll scroll(aClipRect,aOffset,aRect);
 	Write(&scroll,sizeof(scroll),aOpcode);
 @param aModifiers Bitmask that identifies which of the modifier keys in
 aModifierMask need to be set and which need to be unset. For example, see the
 description above.
 @param aPriority A priority value - if more than one window group has requested
 capture for the same key event, the one with the highest priority will capture it.
-The value must be greater than KMinTInt.
 @return A handle identifying the capture key, or one of the system-wide error
 codes (if <0). KErrPermissionDenied indicates that the requested key cannot be
 captured by this window group, because it has been protected by another window group.
 For more information, see the PROTECTEDKEY parameter in wsini.ini. Handles should be
 kept in order to be passed to CancelCaptureKey() later.
 Possible values are defined in TEventModifier.
 @param aModifiers Bitmask that identifies which of the modifier keys in
 aModifierMask need to be set and which need to be unset.
 @param aPriority A priority value - if more than one window group has requested
 capture for the same key event, the one with the highest priority will capture it.
-The value must be greater than KMinTInt.
 @return A handle identifying the capture key, or one of the system-wide error
 codes (if < 0). KErrPermissionDenied indicates that the requested key cannot be captured by this
 window group, because it has been protected by another window group. For more information, see
 the PROTECTEDKEY parameter in wsini.ini. Handles should be kept in order to be passed to
 CancelCaptureKeyUpAndDowns() later.
 @param aModifiers The key is captured only when the modifier keys specified
 in aModifierMask match these states, where 1 = modifier set, and 0 = modifier
 not set. Modifier key states are defined in TEventModifier.
 @param aPriority If more than one window group has requested capture for the
 same long key event, the one with the highest priority will capture the event.
-The value must be greater than KMinTInt.
 @param aFlags Configures the long key capture behaviour. See the TLongCaptureFlags
 enum.
 @return Identifying value for the long key capture. For use with the CancelCaptureLongKey()
 function.
 @see TLongCaptureFlags
 @param aModifiers The key is captured only when the modifier keys specified
 in aModifierMask match these states, where 1 = modifier set, and 0 = modifier
 not set. Modifier key states are defined in TEventModifier.
 @param aPriority If more than one window group has requested capture for the
 same long key event, the one with the highest priority will capture the event.
-The value must be greater than KMinTInt.
 @param aFlags Configures the long key capture behaviour. See the TLongCaptureFlags
 enum.
 @return Identifying value for the long key capture. For use with the CancelCaptureLongKey()
 function.
 @see TLongCaptureFlags

branch	RCL_3
changeset 20	25ffed67c7ef
parent 19	bbf46f59e123