From 4dd3c156399cf0203c2a503e231dffdf43321153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 27 Sep 2005 21:32:01 +0000 Subject: [PATCH] Renamed SSInputFilter/SSController to ScreenSaverFilter and ScreenSaverController. Germans are usually a bit picky about abbreviations... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14256 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../input_server/filters/screensaver/Jamfile | 2 +- ...SInputFilter.cpp => ScreenSaverFilter.cpp} | 45 ++++++++++--------- .../{SSInputFilter.h => ScreenSaverFilter.h} | 24 +++++----- 3 files changed, 38 insertions(+), 33 deletions(-) rename src/add-ons/input_server/filters/screensaver/{SSInputFilter.cpp => ScreenSaverFilter.cpp} (84%) rename src/add-ons/input_server/filters/screensaver/{SSInputFilter.h => ScreenSaverFilter.h} (75%) diff --git a/src/add-ons/input_server/filters/screensaver/Jamfile b/src/add-ons/input_server/filters/screensaver/Jamfile index 48dd223273..0ac697577c 100644 --- a/src/add-ons/input_server/filters/screensaver/Jamfile +++ b/src/add-ons/input_server/filters/screensaver/Jamfile @@ -3,7 +3,7 @@ SubDir OBOS_TOP src add-ons input_server filters screensaver ; UsePrivateHeaders screen_saver ; Addon screen_saver : input_server/filters : - SSInputFilter.cpp + ScreenSaverFilter.cpp : false : be libscreensaver.so input_server ; diff --git a/src/add-ons/input_server/filters/screensaver/SSInputFilter.cpp b/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp similarity index 84% rename from src/add-ons/input_server/filters/screensaver/SSInputFilter.cpp rename to src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp index 1f2357c92b..ce54049927 100644 --- a/src/add-ons/input_server/filters/screensaver/SSInputFilter.cpp +++ b/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp @@ -13,7 +13,7 @@ #include #include #include -#include "SSInputFilter.h" +#include "ScreenSaverFilter.h" #include #define CALLED() SERIAL_PRINT(("%s\n", __PRETTY_FUNCTION__)) @@ -31,14 +31,14 @@ extern "C" _EXPORT BInputServerFilter* instantiate_input_filter(); BInputServerFilter* instantiate_input_filter() { - return new SSInputFilter(); + return new ScreenSaverFilter(); } // #pragma mark - -SSController::SSController(SSInputFilter *filter) +ScreenSaverController::ScreenSaverController(ScreenSaverFilter *filter) : BLooper("screensaver controller", B_LOW_PRIORITY), fFilter(filter) { @@ -47,7 +47,7 @@ SSController::SSController(SSInputFilter *filter) void -SSController::MessageReceived(BMessage *msg) +ScreenSaverController::MessageReceived(BMessage *msg) { CALLED(); SERIAL_PRINT(("what %lx\n", msg->what)); @@ -79,7 +79,7 @@ SSController::MessageReceived(BMessage *msg) // #pragma mark - -SSInputFilter::SSInputFilter() +ScreenSaverFilter::ScreenSaverFilter() : fLastEventTime(0), fBlankTime(0), fSnoozeTime(0), @@ -91,15 +91,15 @@ SSInputFilter::SSInputFilter() fWatchingFile(false) { CALLED(); - fSSController = new SSController(this); - fSSController->Run(); + fController = new ScreenSaverController(this); + fController->Run(); ReloadSettings(); - be_roster->StartWatching(fSSController); + be_roster->StartWatching(fController); } -SSInputFilter::~SSInputFilter() +ScreenSaverFilter::~ScreenSaverFilter() { delete fRunner; @@ -108,13 +108,13 @@ SSInputFilter::~SSInputFilter() if (fWatchingDirectory) watch_node(&fPrefsDirNodeRef, B_STOP_WATCHING, NULL); - be_roster->StopWatching(fSSController); - delete fSSController; + be_roster->StopWatching(fController); + delete fController; } void -SSInputFilter::WatchPreferences() +ScreenSaverFilter::WatchPreferences() { BEntry entry(fPrefs.GetPath().Path()); if (entry.Exists()) { @@ -125,7 +125,7 @@ SSInputFilter::WatchPreferences() fWatchingDirectory = false; } entry.GetNodeRef(&fPrefsNodeRef); - watch_node(&fPrefsNodeRef, B_WATCH_ALL, NULL, fSSController); + watch_node(&fPrefsNodeRef, B_WATCH_ALL, NULL, fController); fWatchingFile = true; } else { if (fWatchingDirectory) @@ -137,14 +137,14 @@ SSInputFilter::WatchPreferences() BEntry dir; entry.GetParent(&dir); dir.GetNodeRef(&fPrefsDirNodeRef); - watch_node(&fPrefsDirNodeRef, B_WATCH_ALL, NULL, fSSController); + watch_node(&fPrefsDirNodeRef, B_WATCH_ALL, NULL, fController); fWatchingDirectory = true; } } void -SSInputFilter::Invoke() +ScreenSaverFilter::Invoke() { CALLED(); if ((fKeep != NONE && fCurrent == fKeep) @@ -161,7 +161,7 @@ SSInputFilter::Invoke() void -SSInputFilter::ReloadSettings() +ScreenSaverFilter::ReloadSettings() { CALLED(); if (!fPrefs.LoadSettings()) { @@ -174,7 +174,7 @@ SSInputFilter::ReloadSettings() CheckTime(); delete fRunner; - fRunner = new BMessageRunner(BMessenger(NULL, fSSController), + fRunner = new BMessageRunner(BMessenger(NULL, fController), new BMessage(SS_CHECK_TIME), fSnoozeTime, -1); if (fRunner->InitCheck() != B_OK) { SERIAL_PRINT(("fRunner init failed\n")); @@ -185,7 +185,7 @@ SSInputFilter::ReloadSettings() void -SSInputFilter::Banish() +ScreenSaverFilter::Banish() { CALLED(); if (!fEnabled) @@ -200,7 +200,7 @@ SSInputFilter::Banish() void -SSInputFilter::CheckTime() +ScreenSaverFilter::CheckTime() { CALLED(); bigtime_t now = system_time(); @@ -218,13 +218,14 @@ SSInputFilter::CheckTime() fSnoozeTime = fBlankTime; else fSnoozeTime = fLastEventTime + fBlankTime - now; + if (fRunner) fRunner->SetInterval(fSnoozeTime); } void -SSInputFilter::UpdateRectangles() +ScreenSaverFilter::UpdateRectangles() { // TODO: make this better if possible at all (in a clean way) CALLED(); @@ -242,7 +243,7 @@ SSInputFilter::UpdateRectangles() void -SSInputFilter::Cornered(arrowDirection pos) +ScreenSaverFilter::Cornered(arrowDirection pos) { //CALLED(); fCurrent = pos; @@ -252,7 +253,7 @@ SSInputFilter::Cornered(arrowDirection pos) filter_result -SSInputFilter::Filter(BMessage *msg, BList *outList) +ScreenSaverFilter::Filter(BMessage *msg, BList *outList) { fLastEventTime = system_time(); diff --git a/src/add-ons/input_server/filters/screensaver/SSInputFilter.h b/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h similarity index 75% rename from src/add-ons/input_server/filters/screensaver/SSInputFilter.h rename to src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h index 35c1c8b5f8..d1375ba2ba 100644 --- a/src/add-ons/input_server/filters/screensaver/SSInputFilter.h +++ b/src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.h @@ -6,6 +6,8 @@ * Michael Phipps * Jérôme Duval, jerome.duval@free.fr */ +#ifndef SCREEN_SAVER_FILTER_H +#define SCREEN_SAVER_FILTER_H #include @@ -18,24 +20,25 @@ #include "ScreenSaverPrefs.h" -class SSInputFilter; +class ScreenSaverFilter; -class SSController : public BLooper { +class ScreenSaverController : public BLooper { public: - SSController(SSInputFilter *filter); + ScreenSaverController(ScreenSaverFilter *filter); void MessageReceived(BMessage *msg); private: - SSInputFilter* fFilter; + ScreenSaverFilter* fFilter; }; -class SSInputFilter : public BInputServerFilter { +class ScreenSaverFilter : public BInputServerFilter { public: - SSInputFilter(); - virtual ~SSInputFilter(); - virtual filter_result Filter(BMessage *msg, BList *outList); - void CheckTime(); + ScreenSaverFilter(); + virtual ~ScreenSaverFilter(); + virtual filter_result Filter(BMessage *msg, BList *outList); + + void CheckTime(); uint32 SnoozeTime() {return fSnoozeTime;} void ReloadSettings(); void SetEnabled(bool enabled) { fEnabled = enabled; } @@ -51,7 +54,7 @@ class SSInputFilter : public BInputServerFilter { // Ideally, we would get a message when the screen changes. // R5 doesn't do this. - SSController *fSSController; + ScreenSaverController *fController; node_ref fPrefsNodeRef, fPrefsDirNodeRef; BMessageRunner *fRunner; bool fWatchingDirectory, fWatchingFile; @@ -63,3 +66,4 @@ class SSInputFilter : public BInputServerFilter { void Banish(); }; +#endif /* SCREEN_SAVER_FILTER_H */