2007/03/05 13:47:05 thb 1.9.12.3: #i37778# Removed Activity::needsScreenUpdate() method - this is now handled by notifying ScreenUpdater explicitely; reorg of SlideShowImpl members, to align lifetime with mutual references; fixed (hopefully) last repaint issues with new LayerManager; added more tests 2007/02/25 01:10:23 thb 1.9.12.2: #i37778# Cleared up error handling a lot: no longer quenching RuntimeExceptions; reporting assertions in the debug case; ViewLayer now reports resized sprite (which needs re-render from all shapes); fixed missing subset area reduction for glyph-level animations; added return of resize state from Layer::commitLayerBounds(); adapted unit tests to corrected behaviour 2007/01/29 14:01:51 thb 1.9.12.1: Issue number: #i37778# Larger slideshow refactoring. Wrote design and coding style manifest, and adapted the code to actually conform to this. In detail: - cleaned up ownership/disposable/weak_ptr story. removed hacks and explicit Disposable implementations, where workaround were available - removed object mutices, where superfluous - reworked EventMultiplexer (using templatized listener class now), added more events. EventMultiplexer now serves as a true blackboard - reworked directory structure: disjunct parts are now physically separated into directories, instantiation happens via factories & abstract interfaces - added CursorManager, to make setting mouse cursor less hackish - reworked DrawShape, to implement SeparateListener pattern - reworked IntrinsicAnimationActivity, to avoid cyclic references - modified hyperlink & shape cursor handling to communicate via EventMultiplexer - renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx, etc.) - added first version of the z-order fix to layer/layermanager - cleaned up include guards and include syntax
219 lines
8.0 KiB
C++
219 lines
8.0 KiB
C++
/*************************************************************************
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* $RCSfile: activitiesqueue.cxx,v $
|
|
*
|
|
* $Revision: 1.10 $
|
|
*
|
|
* last change: $Author: obo $ $Date: 2007-07-17 14:33:38 $
|
|
*
|
|
* The Contents of this file are made available subject to
|
|
* the terms of GNU Lesser General Public License Version 2.1.
|
|
*
|
|
*
|
|
* GNU Lesser General Public License Version 2.1
|
|
* =============================================
|
|
* Copyright 2005 by Sun Microsystems, Inc.
|
|
* 901 San Antonio Road, Palo Alto, CA 94303, USA
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License version 2.1, as published by the Free Software Foundation.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_slideshow.hxx"
|
|
|
|
// must be first
|
|
#include <canvas/debug.hxx>
|
|
#include <canvas/verbosetrace.hxx>
|
|
|
|
#include <comphelper/anytostring.hxx>
|
|
#include <cppuhelper/exc_hlp.hxx>
|
|
|
|
#include "slideshowexceptions.hxx"
|
|
#include "activity.hxx"
|
|
#include "activitiesqueue.hxx"
|
|
|
|
#include <boost/bind.hpp>
|
|
#include <algorithm>
|
|
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
namespace slideshow
|
|
{
|
|
namespace internal
|
|
{
|
|
ActivitiesQueue::ActivitiesQueue(
|
|
const ::boost::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) :
|
|
mpTimer( pPresTimer ),
|
|
maCurrentActivitiesWaiting(),
|
|
maCurrentActivitiesReinsert(),
|
|
maDequeuedActivities()
|
|
{
|
|
}
|
|
|
|
ActivitiesQueue::~ActivitiesQueue()
|
|
{
|
|
// dispose all queue entries
|
|
try
|
|
{
|
|
std::for_each( maCurrentActivitiesWaiting.begin(),
|
|
maCurrentActivitiesWaiting.end(),
|
|
boost::mem_fn( &Disposable::dispose ) );
|
|
std::for_each( maCurrentActivitiesReinsert.begin(),
|
|
maCurrentActivitiesReinsert.end(),
|
|
boost::mem_fn( &Disposable::dispose ) );
|
|
}
|
|
catch (uno::Exception &)
|
|
{
|
|
OSL_ENSURE( false, rtl::OUStringToOString(
|
|
comphelper::anyToString(
|
|
cppu::getCaughtException() ),
|
|
RTL_TEXTENCODING_UTF8 ).getStr() );
|
|
}
|
|
}
|
|
|
|
bool ActivitiesQueue::addActivity( const ActivitySharedPtr& pActivity )
|
|
{
|
|
OSL_ENSURE( pActivity, "ActivitiesQueue::addActivity: activity ptr NULL" );
|
|
|
|
if( !pActivity )
|
|
return false;
|
|
|
|
// add entry to waiting list
|
|
maCurrentActivitiesWaiting.push_back( pActivity );
|
|
|
|
return true;
|
|
}
|
|
|
|
void ActivitiesQueue::process()
|
|
{
|
|
VERBOSE_TRACE( "ActivitiesQueue: outer loop heartbeat" );
|
|
|
|
// accumulate time lag for all activities, and lag time
|
|
// base if necessary:
|
|
ActivityQueue::const_iterator iPos(
|
|
maCurrentActivitiesWaiting.begin() );
|
|
const ActivityQueue::const_iterator iEnd(
|
|
maCurrentActivitiesWaiting.end() );
|
|
double fLag = 0.0;
|
|
for ( ; iPos != iEnd; ++iPos )
|
|
fLag = std::max<double>( fLag, (*iPos)->calcTimeLag() );
|
|
if (fLag > 0.0)
|
|
{
|
|
mpTimer->adjustTimer( -fLag );
|
|
}
|
|
|
|
// process list of activities
|
|
while( !maCurrentActivitiesWaiting.empty() )
|
|
{
|
|
// process topmost activity
|
|
ActivitySharedPtr pActivity( maCurrentActivitiesWaiting.front() );
|
|
maCurrentActivitiesWaiting.pop_front();
|
|
|
|
bool bReinsert( false );
|
|
|
|
try
|
|
{
|
|
// fire up activity
|
|
bReinsert = pActivity->perform();
|
|
}
|
|
catch( uno::RuntimeException& )
|
|
{
|
|
throw;
|
|
}
|
|
catch( uno::Exception& )
|
|
{
|
|
// catch anything here, we don't want
|
|
// to leave this scope under _any_
|
|
// circumstance. Although, do _not_
|
|
// reinsert an activity that threw
|
|
// once.
|
|
|
|
// NOTE: we explicitely don't catch(...) here,
|
|
// since this will also capture segmentation
|
|
// violations and the like. In such a case, we
|
|
// still better let our clients now...
|
|
OSL_ENSURE( false,
|
|
rtl::OUStringToOString(
|
|
comphelper::anyToString( cppu::getCaughtException() ),
|
|
RTL_TEXTENCODING_UTF8 ).getStr() );
|
|
}
|
|
catch( SlideShowException& )
|
|
{
|
|
// catch anything here, we don't want
|
|
// to leave this scope under _any_
|
|
// circumstance. Although, do _not_
|
|
// reinsert an activity that threw
|
|
// once.
|
|
|
|
// NOTE: we explicitely don't catch(...) here,
|
|
// since this will also capture segmentation
|
|
// violations and the like. In such a case, we
|
|
// still better let our clients now...
|
|
OSL_TRACE( "::presentation::internal::ActivitiesQueue: Activity threw a SlideShowException, removing from ring" );
|
|
}
|
|
|
|
if( bReinsert )
|
|
maCurrentActivitiesReinsert.push_back( pActivity );
|
|
else
|
|
maDequeuedActivities.push_back( pActivity );
|
|
|
|
VERBOSE_TRACE( "ActivitiesQueue: inner loop heartbeat" );
|
|
}
|
|
|
|
if( !maCurrentActivitiesReinsert.empty() )
|
|
{
|
|
// reinsert all processed, but not finished
|
|
// activities back to waiting queue. With swap(),
|
|
// we kill two birds with one stone: we reuse the
|
|
// list nodes, and we clear the
|
|
// maCurrentActivitiesReinsert list
|
|
maCurrentActivitiesWaiting.swap( maCurrentActivitiesReinsert );
|
|
}
|
|
}
|
|
|
|
void ActivitiesQueue::processDequeued()
|
|
{
|
|
// notify all dequeued activities from last round
|
|
::std::for_each( maDequeuedActivities.begin(),
|
|
maDequeuedActivities.end(),
|
|
::boost::mem_fn( &Activity::dequeued ) );
|
|
maDequeuedActivities.clear();
|
|
}
|
|
|
|
bool ActivitiesQueue::isEmpty() const
|
|
{
|
|
return maCurrentActivitiesWaiting.empty() && maCurrentActivitiesReinsert.empty();
|
|
}
|
|
|
|
void ActivitiesQueue::clear()
|
|
{
|
|
// dequeue all entries:
|
|
std::for_each( maCurrentActivitiesWaiting.begin(),
|
|
maCurrentActivitiesWaiting.end(),
|
|
boost::mem_fn( &Activity::dequeued ) );
|
|
ActivityQueue().swap( maCurrentActivitiesWaiting );
|
|
|
|
std::for_each( maCurrentActivitiesReinsert.begin(),
|
|
maCurrentActivitiesReinsert.end(),
|
|
boost::mem_fn( &Activity::dequeued ) );
|
|
ActivityQueue().swap( maCurrentActivitiesReinsert );
|
|
}
|
|
}
|
|
}
|