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

Screen Saver: style fixes

Browse Source
This commit is contained in:
John Scipione
2013-11-14 23:30:10 -05:00
parent e11db35d48
commit e22c01af03
8 changed files with 61 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/screen_saver/ScreenSaverRunner.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2013 Haiku, Inc. All Rights Reserved.
* Copyright 2003-2013 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
src/bin/screen_blanker/ScreenBlanker.cpp
+21 -12
View File
@@ -1,12 +1,13 @@
/*
* Copyright 2003-2009, Haiku.
* Copyright 2003-2013 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Michael Phipps
* Jérôme Duval, [email protected]
* Axel Dörfler, [email protected]
* Ryan Leavengood, [email protected]
* Michael Phipps
* John Scipione, [email protected]
*/
@@ -32,8 +33,12 @@ const static uint32 kMsgSuspendScreen = 'suss';
const static uint32 kMsgStandByScreen = 'stbs';
// #pragma mark - ScreenBlanker
ScreenBlanker::ScreenBlanker()
: BApplication(SCREEN_BLANKER_SIG),
:
BApplication(SCREEN_BLANKER_SIG),
fWindow(NULL),
fSaver(NULL),
fRunner(NULL),
@@ -57,9 +62,8 @@ ScreenBlanker::~ScreenBlanker()
void
ScreenBlanker::ReadyToRun()
{
if (!fSettings.Load()) {
if (!fSettings.Load())
fprintf(stderr, "could not load settings, using defaults\n");
}
// create a BDirectWindow and start the render thread.
// TODO: we need a window per screen...
@@ -173,10 +177,12 @@ ScreenBlanker::_QueueTurnOffScreen()
return;
if (fSettings.OffTime() == fSettings.SuspendTime()
&& (flags & (ENABLE_DPMS_OFF | ENABLE_DPMS_SUSPEND)) == (ENABLE_DPMS_OFF | ENABLE_DPMS_SUSPEND))
&& (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_SUSPEND | ENABLE_DPMS_STAND_BY))
== (ENABLE_DPMS_SUSPEND | ENABLE_DPMS_STAND_BY))
flags &= ~ENABLE_DPMS_STAND_BY;
// start them off again
@@ -248,16 +254,17 @@ ScreenBlanker::MessageReceived(BMessage* message)
case kMsgTurnOffScreen:
_SetDPMSMode(B_DPMS_OFF);
break;
case kMsgSuspendScreen:
_SetDPMSMode(B_DPMS_SUSPEND);
break;
case kMsgStandByScreen:
_SetDPMSMode(B_DPMS_STAND_BY);
break;
default:
BApplication::MessageReceived(message);
break;
}
}
@@ -266,7 +273,8 @@ bool
ScreenBlanker::QuitRequested()
{
if (fSettings.LockEnable()
&& system_time() - fBlankTime > fSettings.PasswordTime() - fSettings.BlankTime()) {
&& system_time() - fBlankTime > fSettings.PasswordTime()
- fSettings.BlankTime()) {
_ShowPasswordWindow();
return false;
}
@@ -279,7 +287,7 @@ ScreenBlanker::QuitRequested()
void
ScreenBlanker::_Shutdown()
{
if (fWindow) {
if (fWindow != NULL) {
fWindow->Hide();
if (fWindow->Lock())
@@ -290,13 +298,14 @@ ScreenBlanker::_Shutdown()
}
// #pragma mark -
// #pragma mark - main
int
main(int, char**)
main(int argc, char** argv)
{
ScreenBlanker app;
app.Run();
return 0;
}
src/bin/screen_blanker/ScreenBlanker.h
+3 -2
View File
@@ -1,10 +1,11 @@
/*
* Copyright 2003-2006, Haiku.
* Copyright 2003-2013 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Michael Phipps
* Jérôme Duval, [email protected]
* Michael Phipps
* John Scipione, [email protected]
*/
#ifndef SCREEN_SAVER_APP_H
#define SCREEN_SAVER_APP_H
src/bin/screen_blanker/ScreenSaverWindow.cpp
+10 -6
View File
@@ -20,6 +20,9 @@
#include <syslog.h>
// #pragma mark - ScreenSaverFilter
/* This message filter is what will close the screensaver upon user activity. */
filter_result
ScreenSaverFilter::Filter(BMessage* message, BHandler** target)
@@ -77,7 +80,8 @@ ScreenSaverFilter::SetEnabled(bool enabled)
A view is added to it so that BView based screensavers will work.
*/
ScreenSaverWindow::ScreenSaverWindow(BRect frame)
: BDirectWindow(frame, "ScreenSaver Window",
:
BDirectWindow(frame, "ScreenSaver Window",
B_NO_BORDER_WINDOW_LOOK, kWindowScreenFeel,
B_NOT_RESIZABLE | B_NOT_MOVABLE | B_NOT_MINIMIZABLE
| B_NOT_ZOOMABLE | B_NOT_CLOSABLE, B_ALL_WORKSPACES),
@@ -112,7 +116,7 @@ ScreenSaverWindow::SetSaver(BScreenSaver *saver)
void
ScreenSaverWindow::MessageReceived(BMessage *message)
ScreenSaverWindow::MessageReceived(BMessage* message)
{
switch (message->what) {
case kMsgEnableFilter:
@@ -121,7 +125,6 @@ ScreenSaverWindow::MessageReceived(BMessage *message)
default:
BWindow::MessageReceived(message);
break;
}
}
@@ -135,9 +138,10 @@ ScreenSaverWindow::QuitRequested()
void
ScreenSaverWindow::DirectConnected(direct_buffer_info *info)
ScreenSaverWindow::DirectConnected(direct_buffer_info* info)
{
if (fSaver)
fSaver->DirectConnected(info);
BScreenSaver* saver = _ScreenSaver();
if (saver != NULL)
saver->DirectConnected(info);
}
src/bin/screen_blanker/ScreenSaverWindow.h
+17 -15
View File
@@ -16,30 +16,32 @@ const static uint32 kMsgEnableFilter = 'eflt';
class ScreenSaverFilter : public BMessageFilter {
public:
ScreenSaverFilter()
: BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE),
fEnabled(true) {}
public:
ScreenSaverFilter()
:
BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE),
fEnabled(true) {}
virtual filter_result Filter(BMessage* message, BHandler** target);
virtual filter_result Filter(BMessage* message, BHandler** target);
void SetEnabled(bool enabled);
private:
bool fEnabled;
void SetEnabled(bool enabled)
{ fEnabled = enabled; };
private:
bool fEnabled;
};
class ScreenSaverWindow : public BDirectWindow {
public:
ScreenSaverWindow(BRect frame);
~ScreenSaverWindow();
public:
ScreenSaverWindow(BRect frame);
~ScreenSaverWindow();
void SetSaver(BScreenSaver *saver);
virtual void MessageReceived(BMessage* message);
virtual bool QuitRequested();
virtual void DirectConnected(direct_buffer_info* info);
virtual void MessageReceived(BMessage *message);
virtual bool QuitRequested();
virtual void DirectConnected(direct_buffer_info *info);
private:
BView *fTopView;
src/kits/screensaver/ScreenSaverRunner.cpp
+4 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2013, Haiku, Inc. All Rights Reserved
* Copyright 2003-2013 Haiku, Inc. All rights reserved
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -111,7 +111,8 @@ ScreenSaverRunner::_LoadAddOn()
}
_CleanUp();
if (strcmp("", fSettings.ModuleName()) == 0) {
const char* moduleName = fSettings.ModuleName();
if (*moduleName == '\0') {
Resume();
return;
}
@@ -257,7 +258,7 @@ ScreenSaverRunner::_Run()
status_t
ScreenSaverRunner::_ThreadFunc(void *data)
ScreenSaverRunner::_ThreadFunc(void* data)
{
ScreenSaverRunner* runner = (ScreenSaverRunner*)data;
return runner->_Run();
src/preferences/screensaver/ScreenSaverWindow.cpp
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2013 Haiku, Inc. All Rights Reserved.
* Copyright 2003-2013 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -12,9 +12,6 @@
#include "ScreenSaverWindow.h"
#include <algorithm>
// for std::max and std::min
#include <stdio.h>
#include <Alignment.h>
@@ -44,6 +41,9 @@
#include <TabView.h>
#include <TextView.h>
#include <algorithm>
// for std::max and std::min
#include <BuildScreenSaverDefaultSettingsView.h>
#include "PreviewView.h"
src/preferences/screensaver/ScreenSaverWindow.h
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2013 Haiku, Inc. All Rights Reserved.
* Copyright 2003-2013 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors: