From bef4185e93ef3528e8050f1146ef1c6768612906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 2 Aug 2005 09:57:45 +0000 Subject: [PATCH] fixes Loadsettings return value rename pwWindow to PasswordWindow added ScreenSaver to Jamfile to have Matrix screensaver loaded correctly git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13876 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/screen_blanker/Jamfile | 6 ++- .../{pwWindow.cpp => PasswordWindow.cpp} | 6 +-- .../{pwWindow.h => PasswordWindow.h} | 2 + src/bin/screen_blanker/ScreenSaverApp.cpp | 50 +++++++++---------- src/bin/screen_blanker/ScreenSaverApp.h | 2 +- src/kits/screensaver/ScreenSaverPrefs.cpp | 5 +- 6 files changed, 39 insertions(+), 32 deletions(-) rename src/bin/screen_blanker/{pwWindow.cpp => PasswordWindow.cpp} (83%) rename src/bin/screen_blanker/{pwWindow.h => PasswordWindow.h} (95%) diff --git a/src/bin/screen_blanker/Jamfile b/src/bin/screen_blanker/Jamfile index 534e7cf98c..2776342b49 100644 --- a/src/bin/screen_blanker/Jamfile +++ b/src/bin/screen_blanker/Jamfile @@ -5,7 +5,11 @@ UsePrivateHeaders screen_saver ; BinCommand screen_blanker : ScreenSaverApp.cpp SSAwindow.cpp - pwWindow.cpp + PasswordWindow.cpp + ScreenSaver.cpp : be game libscreensaver.so ; +SEARCH on [ FGristFiles + ScreenSaver.cpp + ] = [ FDirName $(OBOS_TOP) src kits screensaver ] ; diff --git a/src/bin/screen_blanker/pwWindow.cpp b/src/bin/screen_blanker/PasswordWindow.cpp similarity index 83% rename from src/bin/screen_blanker/pwWindow.cpp rename to src/bin/screen_blanker/PasswordWindow.cpp index 6c55e68bc5..37528dccbd 100644 --- a/src/bin/screen_blanker/pwWindow.cpp +++ b/src/bin/screen_blanker/PasswordWindow.cpp @@ -5,7 +5,7 @@ #include #include -#include "pwWindow.h" +#include "PasswordWindow.h" void @@ -21,7 +21,7 @@ PasswordWindow::Setup() BRect bounds(fBgd->Bounds()); bounds.InsetBy(5,5); - fCustomBox=new BBox(bounds,"custBeBox",B_FOLLOW_NONE); + fCustomBox = new BBox(bounds,"custBeBox",B_FOLLOW_NONE); fCustomBox->SetLabel("Unlock screen saver"); fBgd->AddChild(fCustomBox); @@ -29,7 +29,7 @@ PasswordWindow::Setup() fPassword->SetDivider(100); fCustomBox->AddChild(fPassword); - fUnlock=new BButton(BRect(160,70,255,85),"fUnlock","Unlock",new BMessage ('DONE'),B_FOLLOW_NONE); + fUnlock = new BButton(BRect(160,70,255,85), "fUnlock", "Unlock", new BMessage(UNLOCK_MESSAGE), B_FOLLOW_NONE); fUnlock->SetTarget(NULL,be_app); fCustomBox->AddChild(fUnlock); fUnlock->MakeDefault(true); diff --git a/src/bin/screen_blanker/pwWindow.h b/src/bin/screen_blanker/PasswordWindow.h similarity index 95% rename from src/bin/screen_blanker/pwWindow.h rename to src/bin/screen_blanker/PasswordWindow.h index eb33be42e8..1245a56c5d 100644 --- a/src/bin/screen_blanker/pwWindow.h +++ b/src/bin/screen_blanker/PasswordWindow.h @@ -10,6 +10,8 @@ #include #include +const int32 UNLOCK_MESSAGE = 'ULMS'; + class PasswordWindow : public BWindow { public: diff --git a/src/bin/screen_blanker/ScreenSaverApp.cpp b/src/bin/screen_blanker/ScreenSaverApp.cpp index 6a28fcc761..e865113574 100755 --- a/src/bin/screen_blanker/ScreenSaverApp.cpp +++ b/src/bin/screen_blanker/ScreenSaverApp.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include "ScreenSaverApp.h" // Start the server application. Set pulse to fire once per second. @@ -28,7 +28,7 @@ int main(int, char**) // Construct the server app. Doesn't do much, at this point. ScreenSaverApp::ScreenSaverApp() - : BApplication("application/x-vnd.OBOS-ScreenSaverApp"), + : BApplication(SCREEN_BLANKER_SIG), fWin(NULL) { fBlankTime = system_time(); @@ -77,30 +77,30 @@ ScreenSaverApp::ShowPW(void) void ScreenSaverApp::MessageReceived(BMessage *message) { - switch(message->what) { - case 'DONE': - if (strcmp(fPww->GetPassword(),fPref.Password())) { - beep(); - fPww->Hide(); - fWin->SetFullScreen(true); - if (fThreadID) - resume_thread(fThreadID); - } - else { - printf ("Quitting!\n"); - Shutdown(); - } - break; - case 'MOO1': - if (real_time_clock()-fBlankTime>fPref.PasswordTime()) - ShowPW(); - else + switch(message->what) { + case UNLOCK_MESSAGE: + if (strcmp(fPww->GetPassword(),fPref.Password())) { + beep(); + fPww->Hide(); + fWin->SetFullScreen(true); + if (fThreadID) + resume_thread(fThreadID); + } + else { + printf ("Quitting!\n"); + Shutdown(); + } + break; + case 'MOO1': + if (real_time_clock()-fBlankTime>fPref.PasswordTime()) + ShowPW(); + else Shutdown(); - break; - default: - BApplication::MessageReceived(message); - break; - } + break; + default: + BApplication::MessageReceived(message); + break; + } } diff --git a/src/bin/screen_blanker/ScreenSaverApp.h b/src/bin/screen_blanker/ScreenSaverApp.h index 6fb6a83dcd..df7d43c071 100755 --- a/src/bin/screen_blanker/ScreenSaverApp.h +++ b/src/bin/screen_blanker/ScreenSaverApp.h @@ -10,7 +10,7 @@ #include "SSAwindow.h" #include "ScreenSaverPrefs.h" #include "ScreenSaverThread.h" -#include "pwWindow.h" +#include "PasswordWindow.h" class ScreenSaverApp : public BApplication { diff --git a/src/kits/screensaver/ScreenSaverPrefs.cpp b/src/kits/screensaver/ScreenSaverPrefs.cpp index ffab1ef16a..8f09f2af57 100755 --- a/src/kits/screensaver/ScreenSaverPrefs.cpp +++ b/src/kits/screensaver/ScreenSaverPrefs.cpp @@ -69,8 +69,9 @@ ScreenSaverPrefs::LoadSettings() fPassword = password; } } - } - return false; + return true; + } else + return false; }