* On construction initialize fLastEventTime with the current system time.

Otherwise when restarting the input server the screen blanker would start
  immediately.
* Automatic white space cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29935 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-04-05 13:49:05 +00:00
parent 433deca87e
commit 3a28e9bb96
@@ -65,7 +65,7 @@ ScreenSaverController::MessageReceived(BMessage *message)
case B_SOME_APP_QUIT: case B_SOME_APP_QUIT:
{ {
const char *signature; const char *signature;
if (message->FindString("be:signature", &signature) == B_OK if (message->FindString("be:signature", &signature) == B_OK
&& strcasecmp(signature, SCREEN_BLANKER_SIG) == 0) { && strcasecmp(signature, SCREEN_BLANKER_SIG) == 0) {
fFilter->SetEnabled(message->what == B_SOME_APP_LAUNCHED); fFilter->SetEnabled(message->what == B_SOME_APP_LAUNCHED);
} }
@@ -89,16 +89,16 @@ ScreenSaverController::MessageReceived(BMessage *message)
// #pragma mark - // #pragma mark -
ScreenSaverFilter::ScreenSaverFilter() ScreenSaverFilter::ScreenSaverFilter()
: BLocker("screen saver filter"), : BLocker("screen saver filter"),
fLastEventTime(0), fLastEventTime(system_time()),
fBlankTime(0), fBlankTime(0),
fSnoozeTime(0), fSnoozeTime(0),
fCurrentCorner(NO_CORNER), fCurrentCorner(NO_CORNER),
fFrameNum(0), fFrameNum(0),
fRunner(NULL), fRunner(NULL),
fCornerRunner(NULL), fCornerRunner(NULL),
fWatchingDirectory(false), fWatchingDirectory(false),
fWatchingFile(false), fWatchingFile(false),
fEnabled(false) fEnabled(false)
{ {
@@ -237,7 +237,7 @@ ScreenSaverFilter::CheckTime()
BAutolock _(this); BAutolock _(this);
bigtime_t now = system_time(); bigtime_t now = system_time();
if (now >= fLastEventTime + fBlankTime) if (now >= fLastEventTime + fBlankTime)
_Invoke(); _Invoke();
// TODO: this doesn't work correctly - since the BMessageRunner is not // TODO: this doesn't work correctly - since the BMessageRunner is not