diff -r 29ddb8a72f0e -r 9f1c3fea0f87 windowing/windowserver/nga/SERVER/openwfc/CLIENT.H --- a/windowing/windowserver/nga/SERVER/openwfc/CLIENT.H Tue Jul 06 15:45:57 2010 +0300 +++ b/windowing/windowserver/nga/SERVER/openwfc/CLIENT.H Wed Aug 18 11:05:09 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1999-2010 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" @@ -18,7 +18,7 @@ #ifndef __CLIENT_H__ #define __CLIENT_H__ -#include +#include #include "WSGRAPHICDRAWERARRAY.H" #include @@ -146,7 +146,7 @@ inline void PurgePointerEvents(); // Key events - inline void PriorityKeyPressed(TInt aHandle, const TKeyData &aKey, TInt aScanCode); + inline void PriorityKeyPressed(TInt aHandle, const TKeyEvent &aKeyEvent); // Notification of misc events void AddNotificationL(TInt aKey, const RMessage2& aClientMsg); @@ -168,6 +168,9 @@ TBool RetryEvent(TEventCode aEventCode); inline void WgMsgQueueOverflow();// Set flag window group message queue is overflow and has pending messages + + //Get orientation value that app indicated + TInt GetIndicatedAppOrientation(); private: // from MWsClient TInt SendMessage(const CWsGraphicDrawer* aOnBehalfOf, const TDesC8& aData); @@ -255,6 +258,10 @@ // Misc void SetComputeMode(RWsSession::TComputeMode aComputeMode); + + //Set orientation that application indicated + void IndicateAppOrientation(TRenderOrientation aOrientation); + public: static TWsCmdHeaderBase iCurrentCommand; private: @@ -293,6 +300,7 @@ RMessage2 iClientMessage; RHandleBase* iResponseHandle; TInt iMessageIdSeq; + TInt iIndicatedAppOrientation; //Members for procerssing command buffer static CWsClient* iCurrentClient; // Client who's buffer is currently being processed @@ -363,8 +371,8 @@ inline void CWsClient::HandleClientRequestForPriorityKeyData() {iPriorityKeyEvent->GetData();} -inline void CWsClient::PriorityKeyPressed(TInt aHandle, const TKeyData &aKey, TInt aScanCode) - {iPriorityKeyEvent->PriorityKey(aHandle,aKey,aScanCode);} +inline void CWsClient::PriorityKeyPressed(TInt aHandle, const TKeyEvent &aKeyEvent) + {iPriorityKeyEvent->PriorityKey(aHandle, aKeyEvent);} inline TInt CWsClient::ObjectHandle(const CWsObject* aThis) const {return(iObjectIndex->At(aThis));}