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

INTEGRATION: CWS canvas05 (1.5.24); FILE MERGED

Browse Source 
2008/06/09 12:51:47 thb 1.5.24.14: #i88081# Join from CWS impress144 (fixing the dxcanvas crash), extended for the other canvas impls
2008/05/13 14:51:48 thb 1.5.24.13: removed redundant extra surface from spritecanvas; removed silly conditional that always resolved to true from X11Surface ctor
2008/04/21 07:32:19 thb 1.5.24.12: RESYNC: (1.9-1.10); FILE MERGED
2008/04/09 14:33:12 thb 1.5.24.11: Gave back vclcanvas the window surface; made cairocanvas consistent with rest (regarding setWindow)
2008/04/09 09:35:12 thb 1.5.24.10: Improved log output, fixed wrong arg check for vclcanvas
2008/04/09 09:06:51 thb 1.5.24.9: cairo SpriteCanvasHelper was recursive in disposing; argument order changed for init
2008/04/07 14:34:06 thb 1.5.24.8: RESYNC: (1.7-1.9); FILE MERGED
2008/04/03 20:12:36 thb 1.5.24.7: Improved the system-dependent passing-around of the OS handles - now much more opaque
2008/04/02 22:56:28 thb 1.5.24.6: Reworked Surface class to abstract interface; changed all manual refcount handling to RAII
2008/03/18 22:00:57 thb 1.5.24.5: Implementing non-backbuffered canvas for cairocanvas as well - reworked to share most of the code
2008/01/22 00:50:49 thb 1.5.24.4: RESYNC: (1.5-1.7); FILE MERGED
2007/12/20 22:18:56 thb 1.5.24.3: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
2007/12/18 10:05:52 thb 1.5.24.2: #i84049# Applying patch from jnavrati to fix a crash when xrender is not available
2007/10/01 13:02:01 thb 1.5.24.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
This commit is contained in:
Kurt Zenker
2008-06-24 09:23:41 +00:00
parent 5e1608fc8a
commit e10fe92937
1 changed files with 89 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

211
canvas/source/cairo/cairo_spritecanvas.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: cairo_spritecanvas.cxx,v $ * $RCSfile: cairo_spritecanvas.cxx,v $
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -34,16 +34,16 @@
#include <canvas/debug.hxx> #include <canvas/debug.hxx>
#include <canvas/verbosetrace.hxx> #include <canvas/verbosetrace.hxx>
#include <canvas/canvastools.hxx> #include <canvas/canvastools.hxx>
#include <tools/diagnose_ex.h>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
#include <cppuhelper/factory.hxx> #include <toolkit/helper/vclunohelper.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <comphelper/servicedecl.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2dpoint.hxx>
@@ -51,76 +51,80 @@
#include <basegfx/numeric/ftools.hxx> #include <basegfx/numeric/ftools.hxx>
#include "cairo_spritecanvas.hxx" #include "cairo_spritecanvas.hxx"
#include "cairo_devicehelper.hxx"
using namespace ::cairo; using namespace ::cairo;
using namespace ::com::sun::star; using namespace ::com::sun::star;
#define SERVICE_NAME "com.sun.star.rendering.CairoCanvas"
namespace cairocanvas namespace cairocanvas
{ {
SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >& aArguments, SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >& aArguments,
const uno::Reference< uno::XComponentContext >& rxContext ) : const uno::Reference< uno::XComponentContext >& rxContext ) :
mxComponentContext( rxContext ), maArguments(aArguments),
mpBackgroundSurface( NULL ), mxComponentContext( rxContext )
mpBackgroundCairo( NULL )
{ {
// #i64742# Only call initialize when not in probe mode
if( aArguments.getLength() != 0 )
initialize( aArguments );
} }
void SpriteCanvas::initialize( const uno::Sequence< uno::Any >& aArguments ) void SpriteCanvas::initialize()
{ {
VERBOSE_TRACE("SpriteCanvas created %p\n", this); VERBOSE_TRACE("CairoSpriteCanvas created %p\n", this);
// At index 1, we expect a system window handle here, // #i64742# Only call initialize when not in probe mode
// containing a pointer to a valid window, on which to output if( maArguments.getLength() == 0 )
// At index 2, we expect the current window bound rect return;
// NOTE: type is derived from vcl/source/window/window.cxx (XCanvas setup)
#ifdef QUARTZ /* maArguments:
CHECK_AND_THROW( aArguments.getLength() >= 4 && 0: ptr to creating instance (Window or VirtualDevice)
aArguments[1].getValueTypeClass() == uno::TypeClass_UNSIGNED_HYPER, 1: SystemEnvData as a streamed Any (or empty for VirtualDevice)
"SpriteCanvas::initialize: wrong number of arguments, or wrong types" ); 2: current bounds of creating instance
#else 3: bool, denoting always on top state for Window (always false for VirtualDevice)
CHECK_AND_THROW( aArguments.getLength() >= 4 && 4: XWindow for creating Window (or empty for VirtualDevice)
aArguments[1].getValueTypeClass() == uno::TypeClass_LONG, 5: SystemGraphicsData as a streamed Any
"SpriteCanvas::initialize: wrong number of arguments, or wrong types" ); */
#endif ENSURE_ARG_OR_THROW( maArguments.getLength() >= 4 &&
maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER &&
maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE,
"CairoSpriteCanvas::initialize: wrong number of arguments, or wrong types" );
awt::Rectangle aRect; awt::Rectangle aRect;
aArguments[2] >>= aRect; maArguments[2] >>= aRect;
sal_Bool bIsFullscreen( sal_False ); sal_Bool bIsFullscreen( sal_False );
aArguments[3] >>= bIsFullscreen; maArguments[3] >>= bIsFullscreen;
sal_Int64 nWindowPtr = 0; uno::Reference< awt::XWindow > xParentWindow;
aArguments[0] >>= nWindowPtr; maArguments[4] >>= xParentWindow;
Window* pOutputWindow = reinterpret_cast<Window*>(nWindowPtr);
CHECK_AND_THROW( pOutputWindow != NULL, Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
"SpriteCanvas::SpriteCanvas: invalid Window pointer" ); if( !pParentWindow )
throw lang::NoSupportException(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"Parent window not VCL window, or canvas out-of-process!")),
NULL);
#if defined(CAIRO_HAS_XLIB_SURFACE) && !defined (QUARTZ) bool bHasXRender = IsCairoWorking(pParentWindow);
bool bHasXRender = HasXRender( cairocanvas::GetSysData(pOutputWindow) ); ENSURE_ARG_OR_THROW( bHasXRender == true,
CHECK_AND_THROW( bHasXRender == true, "CairoSpriteCanvas::SpriteCanvas: No RENDER extension" );
"SpriteCanvas::SpriteCanvas: No RENDER extension" );
#endif
Size aPixelSize( pOutputWindow->GetOutputSizePixel() ); Size aPixelSize( pParentWindow->GetOutputSizePixel() );
const ::basegfx::B2ISize aSize( aPixelSize.Width(), const ::basegfx::B2ISize aSize( aPixelSize.Width(),
aPixelSize.Height() ); aPixelSize.Height() );
ENSURE_ARG_OR_THROW( pParentWindow != NULL,
"CairoSpriteCanvas::initialize: invalid Window pointer" );
// setup helper // setup helper
maDeviceHelper.init( *pOutputWindow, maDeviceHelper.init( *pParentWindow,
*this, *this,
aSize, aSize,
bIsFullscreen ); bIsFullscreen );
setWindow(uno::Reference<awt::XWindow2>(xParentWindow, uno::UNO_QUERY_THROW));
maCanvasHelper.init( maRedrawManager, maCanvasHelper.init( maRedrawManager,
*this, *this,
aSize ); aSize );
maArguments.realloc(0);
} }
void SAL_CALL SpriteCanvas::disposing() void SAL_CALL SpriteCanvas::disposing()
@@ -129,38 +133,18 @@ namespace cairocanvas
mxComponentContext.clear(); mxComponentContext.clear();
if( mpBackgroundCairo ) {
cairo_destroy( mpBackgroundCairo );
mpBackgroundCairo = NULL;
}
if( mpBackgroundSurface ) {
mpBackgroundSurface->Unref();
mpBackgroundSurface = NULL;
}
// forward to parent // forward to parent
SpriteCanvasBaseT::disposing(); SpriteCanvasBaseT::disposing();
} }
::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException) ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException)
{ {
::osl::MutexGuard aGuard( m_aMutex ); return updateScreen( bUpdateAll );
// avoid repaints on hidden window (hidden: not mapped to
// screen). Return failure, since the screen really has _not_
// been updated (caller should try again later)
return !mbIsVisible ? false : SpriteCanvasBaseT::showBuffer( bUpdateAll );
} }
::sal_Bool SAL_CALL SpriteCanvas::switchBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException) ::sal_Bool SAL_CALL SpriteCanvas::switchBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException)
{ {
::osl::MutexGuard aGuard( m_aMutex ); return updateScreen( bUpdateAll );
// avoid repaints on hidden window (hidden: not mapped to
// screen). Return failure, since the screen really has _not_
// been updated (caller should try again later)
return !mbIsVisible ? false : SpriteCanvasBaseT::switchBuffer( bUpdateAll );
} }
sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException) sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException)
@@ -173,51 +157,55 @@ namespace cairocanvas
return !mbIsVisible ? false : maCanvasHelper.updateScreen( return !mbIsVisible ? false : maCanvasHelper.updateScreen(
::basegfx::unotools::b2IRectangleFromAwtRectangle(maBounds), ::basegfx::unotools::b2IRectangleFromAwtRectangle(maBounds),
bUpdateAll, bUpdateAll,
mbSurfaceDirty ); mbSurfaceDirty);
} }
::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException) ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException)
{ {
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ) ); return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SPRITECANVAS_SERVICE_NAME ) );
} }
Surface* SpriteCanvas::getSurface( const ::basegfx::B2ISize& rSize, Content aContent ) SurfaceSharedPtr SpriteCanvas::getSurface()
{
return maDeviceHelper.getSurface( rSize, aContent );
}
Surface* SpriteCanvas::getSurface( Content aContent )
{
return maDeviceHelper.getSurface( aContent );
}
Surface* SpriteCanvas::getSurface( Bitmap& rBitmap )
{
Surface *pSurface = NULL;
BitmapSystemData aData;
if( rBitmap.GetSystemData( aData ) ) {
const Size& rSize = rBitmap.GetSizePixel();
pSurface = maDeviceHelper.getSurface( aData, rSize );
}
return pSurface;
}
Surface* SpriteCanvas::getBufferSurface()
{ {
return maDeviceHelper.getBufferSurface(); return maDeviceHelper.getBufferSurface();
} }
Surface* SpriteCanvas::getWindowSurface() SurfaceSharedPtr SpriteCanvas::createSurface( const ::basegfx::B2ISize& rSize, Content aContent )
{ {
return maDeviceHelper.getWindowSurface(); return maDeviceHelper.createSurface( rSize, aContent );
} }
Surface* SpriteCanvas::getBackgroundSurface() SurfaceSharedPtr SpriteCanvas::createSurface( ::Bitmap& rBitmap )
{ {
return mpBackgroundSurface; BitmapSystemData aData;
if( rBitmap.GetSystemData( aData ) ) {
const Size& rSize = rBitmap.GetSizePixel();
return maDeviceHelper.createSurface( aData, rSize );
}
return SurfaceSharedPtr();
}
SurfaceSharedPtr SpriteCanvas::changeSurface( bool, bool )
{
// non-modifiable surface here
return SurfaceSharedPtr();
}
OutputDevice* SpriteCanvas::getOutputDevice()
{
return maDeviceHelper.getOutputDevice();
}
SurfaceSharedPtr SpriteCanvas::getBufferSurface()
{
return maDeviceHelper.getBufferSurface();
}
SurfaceSharedPtr SpriteCanvas::getWindowSurface()
{
return maDeviceHelper.getWindowSurface();
} }
const ::basegfx::B2ISize& SpriteCanvas::getSizePixel() const ::basegfx::B2ISize& SpriteCanvas::getSizePixel()
@@ -227,20 +215,10 @@ namespace cairocanvas
void SpriteCanvas::setSizePixel( const ::basegfx::B2ISize& rSize ) void SpriteCanvas::setSizePixel( const ::basegfx::B2ISize& rSize )
{ {
if( mpBackgroundSurface )
{
mpBackgroundSurface->Unref();
}
mpBackgroundSurface = maDeviceHelper.getSurface( CAIRO_CONTENT_COLOR );
if( mpBackgroundCairo )
{
cairo_destroy( mpBackgroundCairo );
}
mpBackgroundCairo = mpBackgroundSurface->getCairo();
maCanvasHelper.setSize( rSize ); maCanvasHelper.setSize( rSize );
maCanvasHelper.setSurface( mpBackgroundSurface, false ); // re-set background surface, in case it needed recreation
maCanvasHelper.setSurface( maDeviceHelper.getBufferSurface(),
false );
} }
void SpriteCanvas::flush() void SpriteCanvas::flush()
@@ -248,25 +226,10 @@ namespace cairocanvas
maDeviceHelper.flush(); maDeviceHelper.flush();
} }
bool SpriteCanvas::repaint( Surface* pSurface, bool SpriteCanvas::repaint( const SurfaceSharedPtr& pSurface,
const rendering::ViewState& viewState, const rendering::ViewState& viewState,
const rendering::RenderState& renderState ) const rendering::RenderState& renderState )
{ {
return maCanvasHelper.repaint( pSurface, viewState, renderState ); return maCanvasHelper.repaint( pSurface, viewState, renderState );
} }
namespace sdecl = comphelper::service_decl;
#if defined (__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)
sdecl::class_<SpriteCanvas, sdecl::with_args<true> > serviceImpl;
const sdecl::ServiceDecl cairoCanvasDecl(
serviceImpl,
#else
const sdecl::ServiceDecl cairoCanvasDecl(
sdecl::class_<SpriteCanvas, sdecl::with_args<true> >(),
#endif
"com.sun.star.comp.rendering.CairoCanvas",
SERVICE_NAME );
} }
// The C shared lib entry points
COMPHELPER_SERVICEDECL_EXPORTS1(cairocanvas::cairoCanvasDecl)