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

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 <nogrist>input_server ;
 

src/add-ons/input_server/filters/screensaver/ScreenSaverFilter.cpp

@@ -13,7 +13,7 @@
 #include <Roster.h>
 #include <Screen.h>
 #include <Application.h>
-#include "SSInputFilter.h"
+#include "ScreenSaverFilter.h"
 
 #include <Debug.h>
 #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);
+	fController = new ScreenSaverController(this);
-	fSSController->Run();
+	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);
+	be_roster->StopWatching(fController);
-	delete fSSController;
+	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();
 

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 <InputServerFilter.h>
@@ -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();
+		ScreenSaverFilter();
-		virtual ~SSInputFilter();
+		virtual ~ScreenSaverFilter();
-		virtual filter_result Filter(BMessage *msg, BList *outList);
-		void CheckTime();
 
+		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 */