Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply patch from Caitlin Shaw to allow for smaller screensaver tick times that 50 ms.

Browse Source 
This fixes #4628.

I added the TODO because I think this code is getting hairy.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33431 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ryan Leavengood 2009-10-05 01:01:35 +00:00
parent a02fe27649
commit d159cdcf4e
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/kits/screensaver/ScreenSaverRunner.cpp
View File

@ -172,7 +172,8 @@ ScreenSaverRunner::_CleanUp()
void void
ScreenSaverRunner::_Run() ScreenSaverRunner::_Run()
{ {
const uint32 kTickBase = 50000; static const uint32 kInitialTickRate = 50000;
if (fWindow->Lock()) { if (fWindow->Lock()) {
fView->SetViewColor(0, 0, 0); fView->SetViewColor(0, 0, 0);
fView->SetLowColor(0, 0, 0); fView->SetLowColor(0, 0, 0);
@ -181,10 +182,13 @@ ScreenSaverRunner::_Run()
fWindow->Unlock(); fWindow->Unlock();
} }
// TODO: This code is getting awfully complicated and should
// probably be refactored.
uint32 tickBase = kInitialTickRate;
int32 snoozeCount = 0; int32 snoozeCount = 0;
int32 frame = 0; int32 frame = 0;
bigtime_t lastTickTime = 0; bigtime_t lastTickTime = 0;
bigtime_t tick = fSaver ? fSaver->TickSize() : kTickBase; bigtime_t tick = fSaver ? fSaver->TickSize() : tickBase;
while (!fQuitting) { while (!fQuitting) {
// break the idle time up into ticks so that we can evaluate // break the idle time up into ticks so that we can evaluate
@ -192,14 +196,23 @@ ScreenSaverRunner::_Run()
// otherwise a screen saver that sets, say, a 30 second tick // otherwise a screen saver that sets, say, a 30 second tick
// will result in the screen saver not responding to deactivation // will result in the screen saver not responding to deactivation
// for that length of time // for that length of time
snooze(kTickBase); snooze(tickBase);
if (system_time() - lastTickTime < tick) if (system_time() - lastTickTime < tick) {
continue; continue;
else { } else {
// re-evaluate the tick time after each successful wakeup - // re-evaluate the tick time after each successful wakeup -
// screensavers can adjust it on the fly and we must be // screensavers can adjust it on the fly, and we must be
// prepared to accomodate that // prepared to accomodate that
tick = fSaver ? fSaver->TickSize() : kTickBase; tick = fSaver ? fSaver->TickSize() : tickBase;
if (tick < tickBase) {
if (tick < 0)
tick = 0;
tickBase = tick;
} else if (tickBase < kInitialTickRate && tick >= kInitialTickRate) {
tickBase = kInitialTickRate;
}
lastTickTime = system_time(); lastTickTime = system_time();
} }