1.1 --- a/epoc32/include/bitdev.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/bitdev.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
1.5 // All rights reserved.
1.6 // This component and the accompanying materials are made available
1.7 -// 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
1.8 +// under the terms of "Eclipse Public License v1.0"
1.9 // which accompanies this distribution, and is available
1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.12 //
1.13 // Initial Contributors:
1.14 // Nokia Corporation - initial contribution.
1.15 @@ -21,20 +21,16 @@
1.16 #include <bitstd.h>
1.17 #include <graphicsaccelerator.h>
1.18
1.19 -/**
1.20 -Used by RectCompare()
1.21 -@internalComponent
1.22 -*/
1.23 -enum {EScanBufSize=0x80};
1.24 -
1.25 class CFbsDrawDevice;
1.26 class TSurfaceId;
1.27
1.28 -/**
1.29 -Screen device orientations.
1.30 -@internalTechnology
1.31 -@prototype
1.32 -*/
1.33 +/** Screen device orientations.
1.34 +
1.35 +WARNING: Enumeration for internal use ONLY. Compatibility is not guaranteed in future releases.
1.36 +
1.37 +@publishedAll
1.38 +@released
1.39 + */
1.40 enum TDeviceOrientation
1.41 {
1.42 EDeviceOrientationNormal = 1,
1.43 @@ -102,6 +98,8 @@
1.44 TInt aDivisorX, TInt aDivisorY);
1.45 IMPORT_C void GetDrawRect(TRect& aRect) const;
1.46 IMPORT_C TInt RegisterLinkedTypeface(const CLinkedTypefaceSpecification& aLinkedTypefaceSpec, TInt& aId);
1.47 + IMPORT_C TInt SetDrawDeviceOffset(const TPoint& aOrigin);
1.48 +
1.49 protected:
1.50 CFbsDevice();
1.51 virtual void DrawingBegin(TBool /*aAlways*/ = EFalse) {}
1.52 @@ -113,35 +111,45 @@
1.53 virtual void SetBits() {}
1.54
1.55 /**
1.56 - Cancels drawing the sprite.
1.57 + This method has been deprecated. Sprites are no longer supported in BitGDI.
1.58 + Calling this method has no effect.
1.59 + @deprecated
1.60 */
1.61 virtual void CancelSprite() const {}
1.62
1.63 /**
1.64 - Hides the sprite over the whole screen.
1.65 - @return TSpriteBase* A pointer to the hidden sprite. NULL in default implementation.
1.66 + This method has been deprecated. Sprites are no longer supported in BitGDI.
1.67 + Calling this method has no effect.
1.68 + @return TSpriteBase* NULL.
1.69 + @deprecated
1.70 */
1.71 virtual TSpriteBase* HideSprite() const {return(NULL);}
1.72
1.73 /**
1.74 - Hides the sprite within a particular region.
1.75 - @param aRect A rectangle within the clipping region.
1.76 - @param aClippingRegion The clipping region.
1.77 - @return TSpriteBase* A pointer to the hidden sprite. NULL in default implementation.
1.78 + This method has been deprecated. Sprites are no longer supported in BitGDI.
1.79 + Calling this method has no effect.
1.80 + @param aRect Ignored.
1.81 + @param aClippingRegion Ignored.
1.82 + @return TSpriteBase* NULL.
1.83 + @deprecated
1.84 */
1.85 virtual TSpriteBase* HideSprite(const TRect&,const TRegion*) const {return(NULL);}
1.86
1.87 /**
1.88 - Shows the specified sprite over the whole screen.
1.89 - @param aSprite The sprite which is to be shown.
1.90 + This method has been deprecated. Sprites are no longer supported in BitGDI.
1.91 + Calling this method has no effect.
1.92 + @param aSprite Ignored.
1.93 + @deprecated
1.94 */
1.95 virtual void ShowSprite(TSpriteBase*) const {}
1.96
1.97 /**
1.98 - Shows the specified sprite within a particular region.
1.99 - @param aSprite The sprite which is to be shown.
1.100 - @param aRect A rectangle within the clipping region.
1.101 - @param aClippingRegion The clipping region
1.102 + This method has been deprecated. Sprites are no longer supported in BitGDI.
1.103 + Calling this method has no effect.
1.104 + @param aSprite Ignored.
1.105 + @param aRect Ignored.
1.106 + @param aClippingRegion Ignored.
1.107 + @deprecated
1.108 */
1.109 virtual void ShowSprite(TSpriteBase*,const TRect&,const TRegion*) const {}
1.110 TInt GetNearestFbsFont(CFbsFont*& aFont,const TFontSpec& aFontSpec);
1.111 @@ -165,7 +173,6 @@
1.112 /** A graphics device interface that provides direct access to the screen, without
1.113 the mediation of the window server.
1.114
1.115 -The interface adds sprite support to the CFbsDevice base class.
1.116 @publishedAll
1.117 @released
1.118 */
1.119 @@ -183,13 +190,13 @@
1.120 IMPORT_C TInt HorizontalTwipsToPixels(TInt aTwips) const;
1.121 IMPORT_C TInt VerticalTwipsToPixels(TInt aTwips) const;
1.122 IMPORT_C void SetAutoUpdate(TBool aValue);
1.123 - IMPORT_C void DrawSpriteBegin();
1.124 - IMPORT_C void DrawSpriteEnd();
1.125 - IMPORT_C void CancelSprite() const;
1.126 - IMPORT_C TSpriteBase* HideSprite() const;
1.127 - IMPORT_C TSpriteBase* HideSprite(const TRect& aRect,const TRegion* aClippingRegion) const;
1.128 - IMPORT_C void ShowSprite(TSpriteBase* aSprite) const;
1.129 - IMPORT_C void ShowSprite(TSpriteBase* aSprite,const TRect& aRect,const TRegion* aClippingRegion) const;
1.130 + IMPORT_C void DrawSpriteBegin(); //< @deprecated
1.131 + IMPORT_C void DrawSpriteEnd(); //< @deprecated
1.132 + IMPORT_C void CancelSprite() const; //< @deprecated
1.133 + IMPORT_C TSpriteBase* HideSprite() const; //< @deprecated
1.134 + IMPORT_C TSpriteBase* HideSprite(const TRect& aRect,const TRegion* aClippingRegion) const; //< @deprecated
1.135 + IMPORT_C void ShowSprite(TSpriteBase* aSprite) const; //< @deprecated
1.136 + IMPORT_C void ShowSprite(TSpriteBase* aSprite,const TRect& aRect,const TRegion* aClippingRegion) const; //< @deprecated
1.137 IMPORT_C void ChangeScreenDevice(CFbsScreenDevice* aOldDevice);
1.138 IMPORT_C void PaletteAttributes(TBool& aModifiable,TInt& aNumEntries) const;
1.139 IMPORT_C void SetPalette(CPalette* aPalette);
1.140 @@ -201,16 +208,16 @@
1.141 IMPORT_C const TUint32* Bits() const;
1.142 IMPORT_C TInt Stride() const;
1.143 IMPORT_C TInt ScreenNo() const;
1.144 - IMPORT_C TUint DeviceOrientationsAvailable() const; //< @internalTechnology
1.145 - IMPORT_C TBool SetDeviceOrientation(TDeviceOrientation aOrientation) const; //< @internalTechnology
1.146 - IMPORT_C void GetSurface(TSurfaceId& aSurface) const; //< @internalTechnology
1.147 - IMPORT_C TDeviceOrientation DeviceOrientation() const; //< @internalTechnology
1.148 + IMPORT_C TUint DeviceOrientationsAvailable() const; /**< WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases. */
1.149 + IMPORT_C TBool SetDeviceOrientation(TDeviceOrientation aOrientation) const; /**< WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases. */
1.150 + IMPORT_C void GetSurface(TSurfaceId& aSurface) const; /**< WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases. */
1.151 + IMPORT_C TDeviceOrientation DeviceOrientation() const; /**< WARNING: Function for internal use ONLY. Compatibility is not guaranteed in future releases. */
1.152 private:
1.153 CFbsScreenDevice(TInt aScreenNo);
1.154 void ConstructL(TInt aScreenNo, TDisplayMode aDispMode);
1.155 private:
1.156 - TSpriteBase* iSprite;
1.157 - TBool iSpriteDraw;
1.158 + TInt iSpare1_CFbsScreenDevice;
1.159 + TInt iSpare2_CFbsScreenDevice;
1.160 TInt iScreenNo;
1.161 };
1.162
1.163 @@ -242,6 +249,7 @@
1.164 IMPORT_C virtual void DrawingBegin(TBool aAlways = EFalse);
1.165 IMPORT_C virtual void DrawingEnd(TBool aAlways = EFalse);
1.166 IMPORT_C TInt SwapWidthAndHeight();
1.167 +
1.168 private:
1.169 CFbsBitmapDevice();
1.170 virtual void SetBits();