mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS canvas02 (1.7.2); FILE MERGED

Browse Source 
2005/10/08 12:54:05 thb 1.7.2.6: RESYNC: (1.7-1.8); FILE MERGED
2005/09/22 21:00:53 thb 1.7.2.5: #i48939# Employing faster XOR masking for the special case nontransparent, non-alpha bitmap redraw in backbuffer (incidently, that matches the typical slide transition sprite update)
2005/07/22 00:11:57 thb 1.7.2.4: #i48939# Factored out stubby corner sprite bound rect rendering to canvastools; finished removal of actual redraw methods from ::canvas::Sprite
2005/07/21 14:52:48 thb 1.7.2.3: #i48939# Factored out round up/down to integer; removed backend specific methods from base Sprite interface; removed updateScreen overwrite from SpriteCanvasBase (too much backend specifics need to be passed to HW canvases); now passing the target OutputDevice directly via Sprite::redraw() method in VCL canvas; made XFont -> impl font conversion dynamic cast, too; removed the getSpriteTargetSurface crap from SpriteCanvas
2005/07/03 20:25:15 thb 1.7.2.2: #i48939# Reworked ParametricPolyPolygon, to extract state in an atomic operation; added more state checking 'isXDirty()' methods to canvascustomspritehelper; added various comments and notes
2005/06/17 23:49:49 thb 1.7.2.1: #i48939# Huge refactoring of canvas; as much functionality as possible is now common in a bunch of shared base classes (input checking, locking, sprite redraw, etc.); added scroll update optimization, transparently to all canvas implementations
This commit is contained in:
Kurt Zenker
2005-11-02 11:59:27 +00:00
parent ba57f8148d
commit 5ea7ce72e1
1 changed files with 57 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
canvas/source/vcl/canvascustomsprite.hxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: canvascustomsprite.hxx,v $ * $RCSfile: canvascustomsprite.hxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 23:18:42 $ * last change: $Author: kz $ $Date: 2005-11-02 12:59:27 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -36,98 +36,82 @@
#ifndef _VCLCANVAS_CANVASCUSTOMSPRITE_HXX #ifndef _VCLCANVAS_CANVASCUSTOMSPRITE_HXX
#define _VCLCANVAS_CANVASCUSTOMSPRITE_HXX #define _VCLCANVAS_CANVASCUSTOMSPRITE_HXX
#ifndef _CPPUHELPER_COMPBASE3_HXX_ #include <cppuhelper/compbase4.hxx>
#include <cppuhelper/compbase3.hxx>
#endif
#ifndef _COMPHELPER_UNO3_HXX
#include <comphelper/uno3.hxx> #include <comphelper/uno3.hxx>
#endif
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#endif #include <com/sun/star/lang/XComponent.hpp>
#ifndef _COM_SUN_STAR_RENDERING_XCUSTOMSPRITE_HPP_
#include <com/sun/star/rendering/XCustomSprite.hpp> #include <com/sun/star/rendering/XCustomSprite.hpp>
#endif #include <com/sun/star/rendering/XIntegerBitmap.hpp>
#ifndef _COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP_
#include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
#endif
#ifndef _BGFX_POINT_B2DPOINT_HXX
#include <basegfx/point/b2dpoint.hxx>
#endif
#ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
#include <basegfx/matrix/b2dhommatrix.hxx>
#endif
#ifndef _SV_VIRDEV_HXX
#include <vcl/virdev.hxx> #include <vcl/virdev.hxx>
#endif
#include <canvas/vclwrapper.hxx> #include <canvas/vclwrapper.hxx>
#include <canvas/bitmapcanvasbase.hxx> #include <canvas/base/basemutexhelper.hxx>
#include <canvas/base/canvascustomspritebase.hxx>
#include "sprite.hxx"
#include "canvashelper.hxx" #include "canvashelper.hxx"
#include "spritehelper.hxx"
#include "backbuffer.hxx" #include "backbuffer.hxx"
#include "impltools.hxx" #include "impltools.hxx"
#include "spritecanvas.hxx" #include "spritecanvas.hxx"
#include "sprite.hxx"
#include "repainttarget.hxx" #include "repainttarget.hxx"
#define CANVASCUSTOMSPRITE_IMPLEMENTATION_NAME "VCLCanvas::CanvasCustomSprite"
namespace vclcanvas namespace vclcanvas
{ {
typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::rendering::XCustomSprite, typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XCustomSprite,
::com::sun::star::rendering::XBitmapCanvas, ::com::sun::star::rendering::XBitmapCanvas,
::com::sun::star::lang::XServiceInfo > CanvasCustomSpriteBase_Base; ::com::sun::star::rendering::XIntegerBitmap,
typedef ::canvas::internal::BitmapCanvasBase< CanvasCustomSpriteBase_Base, CanvasHelper, tools::LocalGuard > CanvasCustomSprite_Base; ::com::sun::star::lang::XServiceInfo > CanvasCustomSpriteBase_Base;
/** Mixin Sprite
Have to mixin the Sprite interface before deriving from
::canvas::CanvasCustomSpriteBase, as this template should
already implement some of those interface methods.
The reason why this appears kinda convoluted is the fact that
we cannot specify non-IDL types as WeakComponentImplHelperN
template args, and furthermore, don't want to derive
::canvas::CanvasCustomSpriteBase directly from
::canvas::Sprite (because derivees of
::canvas::CanvasCustomSpriteBase have to explicitely forward
the XInterface methods (e.g. via DECLARE_UNO3_AGG_DEFAULTS)
anyway). Basically, ::canvas::CanvasCustomSpriteBase should
remain a base class that provides implementation, not to
enforce any specific interface on its derivees.
*/
class CanvasCustomSpriteSpriteBase_Base : public ::canvas::BaseMutexHelper< CanvasCustomSpriteBase_Base >,
public Sprite
{
};
typedef ::canvas::CanvasCustomSpriteBase< CanvasCustomSpriteSpriteBase_Base,
SpriteHelper,
CanvasHelper,
tools::LocalGuard,
::cppu::OWeakObject > CanvasCustomSpriteBaseT;
/* Definition of CanvasCustomSprite class */ /* Definition of CanvasCustomSprite class */
class CanvasCustomSprite : public Sprite, class CanvasCustomSprite : public CanvasCustomSpriteBaseT,
public CanvasCustomSprite_Base,
public RepaintTarget public RepaintTarget
{ {
public: public:
CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize,
const WindowGraphicDevice::ImplRef& rDevice, const SpriteCanvasRef& rSpriteCanvas,
const SpriteCanvas::ImplRef& rSpriteCanvas ); bool bShowSpriteBounds );
// XInterface
// Need to employ this macro, because Sprite comes with an
// unimplemented version of XInterface.
// Forwarding the XInterface implementation to the
// cppu::ImplHelper templated base, which does the refcounting and
// queryInterface for us: Classname Base doing refcount and handling queryInterface
// | |
// V V
DECLARE_UNO3_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base );
virtual void SAL_CALL disposing(); virtual void SAL_CALL disposing();
// XCanvas: selectively override base's method here, for opacity tracking // Forwarding the XComponent implementation to the
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL // cppu::ImplHelper templated base
drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, // Classname Base doing refcount Base implementing the XComponent interface
const ::com::sun::star::rendering::ViewState& viewState, // | | |
const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // V V V
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase );
// XSprite
virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clip( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPriority( double nPriority ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL show( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL hide( ) throw (::com::sun::star::uno::RuntimeException);
// XCustomSprite
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL
getContentCanvas( ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
@@ -135,12 +119,11 @@ namespace vclcanvas
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
// Sprite // Sprite
virtual void redraw( OutputDevice& rTargetSurface ) const; virtual void redraw( OutputDevice& rOutDev,
virtual void redraw( OutputDevice& rTargetSurface, bool bBufferedUpdate ) const;
const Point& rOutputPos ) const; virtual void redraw( OutputDevice& rOutDev,
virtual bool isAreaUpdateOpaque( const Rectangle& rUpdateArea ) const; const ::basegfx::B2DPoint& rPos,
virtual ::basegfx::B2DPoint getSpritePos() const; bool bBufferedUpdate ) const;
virtual ::basegfx::B2DSize getSpriteSize() const;
// RepaintTarget // RepaintTarget
virtual bool repaint( const GraphicObjectSharedPtr& rGrf, virtual bool repaint( const GraphicObjectSharedPtr& rGrf,
@@ -148,66 +131,11 @@ namespace vclcanvas
const ::Size& rSz, const ::Size& rSz,
const GraphicAttr& rAttr ) const; const GraphicAttr& rAttr ) const;
protected:
~CanvasCustomSprite(); // we're a ref-counted UNO class. _We_ destroy ourselves.
private: private:
// default: disabled copy/assignment /** MUST hold here, too, since CanvasHelper only contains a
CanvasCustomSprite(const CanvasCustomSprite&); raw pointer (without refcounting)
CanvasCustomSprite& operator=( const CanvasCustomSprite& ); */
SpriteCanvasRef mpSpriteCanvas;
Rectangle getSpriteRect( const ::basegfx::B2DRectangle& rBounds ) const;
Rectangle getFullSpriteRect() const;
Rectangle getSpriteRect() const;
// for the integrated bitmap canvas implementation
BackBufferSharedPtr mpBackBuffer;
BackBufferSharedPtr mpBackBufferMask;
SpriteCanvas::ImplRef mpSpriteCanvas;
mutable ::canvas::vcltools::VCLObject<BitmapEx> maContent;
/** Currently active clip area.
This member is either empty, denoting that the current
clip shows the full sprite content, or contains a
rectangular subarea of the sprite, outside of which
the sprite content is fully clipped.
@see mbIsCurrClipRectangle
*/
::basegfx::B2DRectangle maCurrClipBounds;
// sprite state
::basegfx::B2DPoint maPosition;
Size maSize;
::basegfx::B2DHomMatrix maTransform;
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D > mxClipPoly;
double mfAlpha;
bool mbActive;
/** If true, denotes that the current sprite clip is a true
rectangle, i.e. maCurrClipBounds <em>exactly</em>
describes the visible area of the sprite.
@see maCurrClipBounds
*/
bool mbIsCurrClipRectangle;
/** OutDev render speedup.
When true, this flag denotes that the current
mpBackBufferMask content is fully opaque, thus, that blits
to the screen can use a plain Bitmap instead of the
BitmapEx.
*/
mutable bool mbIsContentFullyOpaque;
/// True, iff maTransform has changed
mutable bool mbTransformDirty;
}; };
} }