i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed missing "not" operator in all those flags changing lines; turning off the

Browse Source 
screen is now working as expected.
* Only remove DPMS runners when the time is actually supported (previous code would
  not have always worked correctly in case the graphics card would not support all
  DPMS modes).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19724 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-01-06 15:50:26 +00:00
parent e7c111135c
commit f0d2e76081
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/screen_blanker/ScreenBlanker.cpp
+11 -9
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2006, Haiku.
* Copyright 2003-2007, Haiku.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -154,7 +154,7 @@ ScreenBlanker::_QueueTurnOffScreen()
delete fStandByScreenRunner;
delete fSuspendScreenRunner;
delete fTurnOffScreenRunner;
fStandByScreenRunner = fSuspendScreenRunner = fTurnOffScreenRunner = NULL;
// figure out which notifiers we need and which of them are supported
@@ -163,19 +163,21 @@ ScreenBlanker::_QueueTurnOffScreen()
BScreen screen;
uint32 capabilities = screen.DPMSCapabilites();
if ((capabilities & B_DPMS_OFF) == 0)
flags &= ENABLE_DPMS_OFF;
flags &= ~ENABLE_DPMS_OFF;
if ((capabilities & B_DPMS_SUSPEND) == 0)
flags &= ENABLE_DPMS_SUSPEND;
flags &= ~ENABLE_DPMS_SUSPEND;
if ((capabilities & B_DPMS_STAND_BY) == 0)
flags &= ENABLE_DPMS_STAND_BY;
flags &= ~ENABLE_DPMS_STAND_BY;
if ((flags & ENABLE_DPMS_MASK) == 0)
return;
if (fSettings.OffTime() == fSettings.SuspendTime())
flags &= ENABLE_DPMS_SUSPEND;
if (fSettings.SuspendTime() == fSettings.StandByTime())
flags &= ENABLE_DPMS_STAND_BY;
if (fSettings.OffTime() == fSettings.SuspendTime()
&& (flags & (ENABLE_DPMS_OFF | ENABLE_DPMS_SUSPEND)) == ENABLE_DPMS_OFF | ENABLE_DPMS_SUSPEND)
flags &= ~ENABLE_DPMS_SUSPEND;
if (fSettings.SuspendTime() == fSettings.StandByTime()
&& (flags & (ENABLE_DPMS_SUSPEND | ENABLE_DPMS_STAND_BY)) == ENABLE_DPMS_SUSPEND | ENABLE_DPMS_STAND_BY)
flags &= ~ENABLE_DPMS_STAND_BY;
// start them off again