yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix kwin-composite lockup at time of day == 00:00:00. also note that compositeRate is misnamed, it is an interval. CCMAIL:l.lunak@kde.org

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=859300
This commit is contained in:
Andreas Hartmetz 2008-09-09 23:14:52 +00:00
parent e500e37abb
commit 56a323877e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
composite.cpp
View file

@ -183,7 +183,7 @@ void Workspace::setupCompositing()
if( rate <= 0 ) if( rate <= 0 )
rate = 50; rate = 50;
// QTimer gives us 1msec (1000Hz) at best, so we ignore anything higher; // QTimer gives us 1msec (1000Hz) at best, so we ignore anything higher;
// however, additional throttling makes prevents very high rates from taking place anyway // however, additional throttling prevents very high rates from taking place anyway
else if( rate > 1000 ) else if( rate > 1000 )
rate = 1000; rate = 1000;
kDebug( 1212 ) << "Refresh rate " << rate << "Hz"; kDebug( 1212 ) << "Refresh rate " << rate << "Hz";
@ -406,9 +406,9 @@ void Workspace::setCompositeTimer()
{ {
if( !compositing()) // should not really happen, but there may be e.g. some damage events still pending if( !compositing()) // should not really happen, but there may be e.g. some damage events still pending
return; return;
// Last paint set nextPaintReference as a reference time from which multiples of compositeRate // The last paint set nextPaintReference as a reference time to which multiples of compositeRate
// should be added for the next paint. // should be added for the next paint. qMax() is a guard against negative moduli when the day changes.
compositeTimer.start( nextPaintReference.msecsTo( QTime::currentTime()) % compositeRate ); compositeTimer.start( qMax ( 0, nextPaintReference.msecsTo( QTime::currentTime()) % compositeRate ) );
} }
bool Workspace::createOverlay() bool Workspace::createOverlay()