From cc5da1fe650d3728fcea45dcdb580eb30f7b72a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 10 Apr 2006 23:16:06 +0000 Subject: [PATCH] Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17065 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../filters/screensaver/ScreenSaverFilter.cpp | 26 ++++++++++--------- .../filters/screensaver/ScreenSaverFilter.h | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp b/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp index ce54049927..22a7b0f503 100644 --- a/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp +++ b/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp @@ -19,8 +19,8 @@ #define CALLED() SERIAL_PRINT(("%s\n", __PRETTY_FUNCTION__)) -const int CORNER_SIZE = 10; -const int32 SS_CHECK_TIME = 'SSCT'; +static const int kCornerSize = 10; +static const int32 kMsgCheckTime = 'SSCT'; extern "C" _EXPORT BInputServerFilter* instantiate_input_filter(); @@ -56,9 +56,6 @@ ScreenSaverController::MessageReceived(BMessage *msg) case B_NODE_MONITOR: fFilter->ReloadSettings(); break; - case SS_CHECK_TIME: - fFilter->CheckTime(); - break; case B_SOME_APP_LAUNCHED: case B_SOME_APP_QUIT: { @@ -70,6 +67,11 @@ ScreenSaverController::MessageReceived(BMessage *msg) SERIAL_PRINT(("mime_sig %s\n", signature)); break; } + + case kMsgCheckTime: + fFilter->CheckTime(); + break; + default: BLooper::MessageReceived(msg); } @@ -175,7 +177,7 @@ ScreenSaverFilter::ReloadSettings() delete fRunner; fRunner = new BMessageRunner(BMessenger(NULL, fController), - new BMessage(SS_CHECK_TIME), fSnoozeTime, -1); + new BMessage(kMsgCheckTime), fSnoozeTime, -1); if (fRunner->InitCheck() != B_OK) { SERIAL_PRINT(("fRunner init failed\n")); } @@ -232,12 +234,12 @@ ScreenSaverFilter::UpdateRectangles() BRect frame = BScreen().Frame(); fTopLeft.Set(frame.left, frame.top, - frame.left + CORNER_SIZE, frame.top + CORNER_SIZE); - fTopRight.Set(frame.right - CORNER_SIZE, frame.top, - frame.right, frame.top + CORNER_SIZE); - fBottomLeft.Set(frame.left, frame.bottom - CORNER_SIZE, - frame.left + CORNER_SIZE, frame.bottom); - fBottomRight.Set(frame.right - CORNER_SIZE, frame.bottom - CORNER_SIZE, + frame.left + kCornerSize, frame.top + kCornerSize); + fTopRight.Set(frame.right - kCornerSize, frame.top, + frame.right, frame.top + kCornerSize); + fBottomLeft.Set(frame.left, frame.bottom - kCornerSize, + frame.left + kCornerSize, frame.bottom); + fBottomRight.Set(frame.right - kCornerSize, frame.bottom - kCornerSize, frame.right, frame.bottom); } diff --git a/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h b/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h index d1375ba2ba..e5528cbdf0 100644 --- a/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h +++ b/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h @@ -36,7 +36,7 @@ class ScreenSaverFilter : public BInputServerFilter { ScreenSaverFilter(); virtual ~ScreenSaverFilter(); - virtual filter_result Filter(BMessage *msg, BList *outList); + virtual filter_result Filter(BMessage *message, BList *outList); void CheckTime(); uint32 SnoozeTime() {return fSnoozeTime;}