Minor cleanup.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17065 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-04-10 23:16:06 +00:00
parent a089120898
commit cc5da1fe65
2 changed files with 15 additions and 13 deletions
@@ -19,8 +19,8 @@
#define CALLED() SERIAL_PRINT(("%s\n", __PRETTY_FUNCTION__)) #define CALLED() SERIAL_PRINT(("%s\n", __PRETTY_FUNCTION__))
const int CORNER_SIZE = 10; static const int kCornerSize = 10;
const int32 SS_CHECK_TIME = 'SSCT'; static const int32 kMsgCheckTime = 'SSCT';
extern "C" _EXPORT BInputServerFilter* instantiate_input_filter(); extern "C" _EXPORT BInputServerFilter* instantiate_input_filter();
@@ -56,9 +56,6 @@ ScreenSaverController::MessageReceived(BMessage *msg)
case B_NODE_MONITOR: case B_NODE_MONITOR:
fFilter->ReloadSettings(); fFilter->ReloadSettings();
break; break;
case SS_CHECK_TIME:
fFilter->CheckTime();
break;
case B_SOME_APP_LAUNCHED: case B_SOME_APP_LAUNCHED:
case B_SOME_APP_QUIT: case B_SOME_APP_QUIT:
{ {
@@ -70,6 +67,11 @@ ScreenSaverController::MessageReceived(BMessage *msg)
SERIAL_PRINT(("mime_sig %s\n", signature)); SERIAL_PRINT(("mime_sig %s\n", signature));
break; break;
} }
case kMsgCheckTime:
fFilter->CheckTime();
break;
default: default:
BLooper::MessageReceived(msg); BLooper::MessageReceived(msg);
} }
@@ -175,7 +177,7 @@ ScreenSaverFilter::ReloadSettings()
delete fRunner; delete fRunner;
fRunner = new BMessageRunner(BMessenger(NULL, fController), fRunner = new BMessageRunner(BMessenger(NULL, fController),
new BMessage(SS_CHECK_TIME), fSnoozeTime, -1); new BMessage(kMsgCheckTime), fSnoozeTime, -1);
if (fRunner->InitCheck() != B_OK) { if (fRunner->InitCheck() != B_OK) {
SERIAL_PRINT(("fRunner init failed\n")); SERIAL_PRINT(("fRunner init failed\n"));
} }
@@ -232,12 +234,12 @@ ScreenSaverFilter::UpdateRectangles()
BRect frame = BScreen().Frame(); BRect frame = BScreen().Frame();
fTopLeft.Set(frame.left, frame.top, fTopLeft.Set(frame.left, frame.top,
frame.left + CORNER_SIZE, frame.top + CORNER_SIZE); frame.left + kCornerSize, frame.top + kCornerSize);
fTopRight.Set(frame.right - CORNER_SIZE, frame.top, fTopRight.Set(frame.right - kCornerSize, frame.top,
frame.right, frame.top + CORNER_SIZE); frame.right, frame.top + kCornerSize);
fBottomLeft.Set(frame.left, frame.bottom - CORNER_SIZE, fBottomLeft.Set(frame.left, frame.bottom - kCornerSize,
frame.left + CORNER_SIZE, frame.bottom); frame.left + kCornerSize, frame.bottom);
fBottomRight.Set(frame.right - CORNER_SIZE, frame.bottom - CORNER_SIZE, fBottomRight.Set(frame.right - kCornerSize, frame.bottom - kCornerSize,
frame.right, frame.bottom); frame.right, frame.bottom);
} }
@@ -36,7 +36,7 @@ class ScreenSaverFilter : public BInputServerFilter {
ScreenSaverFilter(); ScreenSaverFilter();
virtual ~ScreenSaverFilter(); virtual ~ScreenSaverFilter();
virtual filter_result Filter(BMessage *msg, BList *outList); virtual filter_result Filter(BMessage *message, BList *outList);
void CheckTime(); void CheckTime();
uint32 SnoozeTime() {return fSnoozeTime;} uint32 SnoozeTime() {return fSnoozeTime;}