API_REF/Public_API: comparison epoc32/include/e32event.h

equal deleted inserted replaced

-:e1b950c65cb4
+:837f303aceeb
 // Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
 //
 // Contributors:
 //
 #ifndef __E32EVENT_H__
 #define __E32EVENT_H__
 #include <e32cmn.h>
+#ifdef BTRACE_TRAWEVENT
+#include <e32btrace.h>
+#endif
 /**
 @publishedAll
 @released
 */
 		{iDeviceNumber = TUint8(aDeviceNumber+1);}
 	IMPORT_C TPoint Pos() const;
 	IMPORT_C TInt ScanCode() const;
 IMPORT_C TInt Modifiers() const;
+	IMPORT_C TInt Repeats() const;
 /**
 Gets the Cartesian coordinates of the 3D pointer end that is closer to the screen.
 @return The Cartesian coordinates of the point defined by the end of the 3D pointing device that is closer to the screen.
 	Sets the information on which end of the pointing device is closer to the screen
 	@param aTip A Boolean indicating which end of the pointing device is closer to the screen.
 	*/
 	inline void SetTip(TBool aTip)
-		{iTip = TUint8(aTip);}
+		{iTip = TUint8(aTip);
+#ifdef BTRACE_TRAWEVENT
+		BTraceContext4(BTrace::ERawEvent, BTrace::ESetTipEvent,(TUint32)aTip);
+#endif
+		}
 	IMPORT_C void Set(TType aType,TInt aScanCode);
 	IMPORT_C void Set(TType aType,TInt aX,TInt aY);
 	IMPORT_C void Set(TType aType);
 	IMPORT_C void Set(TType aType,TInt aX,TInt aY,TInt aZ);
 	IMPORT_C void Set(TType aType,TInt aX,TInt aY,TInt aZ,TInt aPhi,TInt aTheta,TInt aAlpha);
 	IMPORT_C void SetTilt(TType aType,TInt aPhi,TInt aTheta);
 	IMPORT_C void SetRotation(TType aType,TInt aAlpha);
+	IMPORT_C void SetRepeat(TType aType,TInt aScanCode,TInt aRepeats);
+	/**
+	@return the pointer number of the the event
+	*/
+	inline TUint8 PointerNumber() const
+		{
+		return iPointerNumber;
+		}
+	/**
+	The pointer number for the event is set
+	The pointer  number should be more or equal 0 and should be less than HALData::EPointerMaxPointers,
+	otherwise WSERV would ignore the event,ie 	0 <= aPointerNumber < HALData::EPointerMaxPointers
+	@param	aPointerNumber
+	Error conditions: None.
+	*/
+	inline void SetPointerNumber(const TUint8 aPointerNumber)
+		{
+		iPointerNumber=aPointerNumber;
+#ifdef BTRACE_TRAWEVENT
+		BTraceContext4(BTrace::ERawEvent, BTrace::ESetPointerNumberEvent,(TUint32)aPointerNumber);
+#endif
+		}
+/**
+	Initialises the event with the supplied information
+	@param	aType	The event type.
+	@param	aX		The X position.
+	@param	aY		The Y position.
+	@param	aZ		The Z position.
+	@param  aPointerNumber   The pointer number for the event
+	*/
+	IMPORT_C void Set (TType aType, TInt aX, TInt aY, TInt aZ, TUint8 aPointerNumber);
 protected:
 	TUint8 iType;
 	TUint8 iTip;	/**< Indicates whether the tip or head of pointing device is closer to screen.*/
-	TUint8 iSpare2;
+	TUint8 iPointerNumber; //
 	TUint8 iDeviceNumber;
 	TUint iTicks;
 	union
 		{
 		struct {TInt x;TInt y;} pos;
 		struct {TInt x;TInt y;TInt z;TInt phi;TInt theta;TInt alpha;} pos3D;
-		TInt scanCode;
+		struct {TInt scanCode;TInt repeats;} key;
 		TInt modifiers;
 		} iU;
 	};
 @return The hardware event object.
 */
 	inline TRawEvent &Event() const {return(*((TRawEvent *)&iBuf[0]));}
 	};
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <e32event_private.h>
-/**
-@publishedPartner
-@released
-Encapsulates information about a device's display screen.
-*/
-class TScreenInfoV01
-	{
-public:
-	TBool iWindowHandleValid; /**< Indicates whether the window handle is valid.*/
-	TAny *iWindowHandle;      /**< The window handle.*/
-	TBool iScreenAddressValid;/**< Indicates whether the screen address is valid.*/
-	TAny *iScreenAddress;     /**< The linear address of the screen.*/
-	TSize iScreenSize;        /**< The size of the screen.*/
-	};
-//
 #endif
+#endif

branch	Symbian3
changeset 4	837f303aceeb
parent 2	2fe1408b6811