From 503d8893143608765c62b995780820dc89ae5c8f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 10 Sep 2018 19:51:02 -0400 Subject: [PATCH] Remove the "Haiku" screensaver from the tree. As discussed in #14447. --- build/jam/images/definitions/regular | 1 - src/add-ons/screen_savers/Jamfile | 1 - src/add-ons/screen_savers/haiku/Jamfile | 19 --- .../screen_savers/haiku/ScreenSaver.cpp | 123 ------------------ .../screen_savers/haiku/ScreenSaver.rdef | 14 -- 5 files changed, 158 deletions(-) delete mode 100644 src/add-ons/screen_savers/haiku/Jamfile delete mode 100644 src/add-ons/screen_savers/haiku/ScreenSaver.cpp delete mode 100644 src/add-ons/screen_savers/haiku/ScreenSaver.rdef diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index 3f6e015932..9ce83e43b4 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -183,7 +183,6 @@ SYSTEM_ADD_ONS_SCREENSAVERS += [ FFilterByBuildFeatures DebugNow Flurry@mesa GLife@mesa Gravity@mesa - $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves Message diff --git a/src/add-ons/screen_savers/Jamfile b/src/add-ons/screen_savers/Jamfile index 031c70dc0c..00fe3db861 100644 --- a/src/add-ons/screen_savers/Jamfile +++ b/src/add-ons/screen_savers/Jamfile @@ -5,7 +5,6 @@ SubInclude HAIKU_TOP src add-ons screen_savers debugnow ; SubInclude HAIKU_TOP src add-ons screen_savers flurry ; SubInclude HAIKU_TOP src add-ons screen_savers glife ; SubInclude HAIKU_TOP src add-ons screen_savers gravity ; -SubInclude HAIKU_TOP src add-ons screen_savers haiku ; SubInclude HAIKU_TOP src add-ons screen_savers icons ; SubInclude HAIKU_TOP src add-ons screen_savers ifs ; SubInclude HAIKU_TOP src add-ons screen_savers leaves ; diff --git a/src/add-ons/screen_savers/haiku/Jamfile b/src/add-ons/screen_savers/haiku/Jamfile deleted file mode 100644 index 9f8dd9e276..0000000000 --- a/src/add-ons/screen_savers/haiku/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src add-ons screen_savers haiku ; - -SetSubDirSupportedPlatformsBeOSCompatible ; - -UsePrivateHeaders screen_saver ; - # For BuildDefaultSettingsView - -AddResources Haiku : ScreenSaver.rdef ; - -Addon Haiku : - ScreenSaver.cpp - : be screensaver localestub [ TargetLibsupc++ ] -; - -DoCatalogs Haiku : - x-vnd.Haiku-HaikuScreensaver - : - ScreenSaver.cpp -; diff --git a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp b/src/add-ons/screen_savers/haiku/ScreenSaver.cpp deleted file mode 100644 index 4bd9590f2a..0000000000 --- a/src/add-ons/screen_savers/haiku/ScreenSaver.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/* -** -** A simple screensaver, displays the text "Haiku" at random locations. -** -** Version: 3.0 -** -** Copyright (c) 2002, 2005 Marcus Overhagen. All Rights Reserved. -** This file may be used under the terms of the MIT License. -*/ - - -#include - -#include -#include -#include -#include -#include -#include - - -#undef B_TRANSLATION_CONTEXT -#define B_TRANSLATION_CONTEXT "Screensaver Haiku" - - -class ScreenSaver : public BScreenSaver -{ -public: - ScreenSaver(BMessage *archive, image_id); - void Draw(BView *view, int32 frame); - void StartConfig(BView *view); - status_t StartSaver(BView *view, bool preview); - -private: - const char *fText; - float fX; - float fY; - float fSizeX; - float fSizeY; - float fTextHeight; - float fTextWith; - bool fIsPreview; -}; - - -BScreenSaver *instantiate_screen_saver(BMessage *msg, image_id image) -{ - return new ScreenSaver(msg, image); -} - - -ScreenSaver::ScreenSaver(BMessage *archive, image_id id) - : BScreenSaver(archive, id) - , fText("Haiku") - , fX(0) - , fY(0) -{ -} - - -void -ScreenSaver::StartConfig(BView *view) -{ - BPrivate::BuildDefaultSettingsView(view, "Haiku", - B_TRANSLATE("by Marcus Overhagen")); -} - - -status_t -ScreenSaver::StartSaver(BView *view, bool preview) -{ - // save view dimensions and preview mode - fIsPreview = preview; - fSizeX = view->Bounds().Width(); - fSizeY = view->Bounds().Height(); - - // set a new font, about 1/8th of view height, and bold - BFont font; - view->GetFont(&font); - font.SetSize(fSizeY / 8); - font.SetFace(B_BOLD_FACE); - view->SetFont(&font); - - // find out space needed for text display - BRect rect; - escapement_delta delta; - delta.nonspace = 0; - delta.space = 0; - font.GetBoundingBoxesForStrings(&fText, 1, B_SCREEN_METRIC, &delta, &rect); - fTextHeight = rect.Height(); - fTextWith = rect.Width(); - - // seed the random number generator - srand((int)system_time()); - - return B_OK; -} - - -void -ScreenSaver::Draw(BView *view, int32 frame) -{ - if (frame == 0) { - // fill with black on first frame - view->SetLowColor(0, 0, 0); - view->FillRect(view->Bounds(), B_SOLID_LOW); - } else { - // erase old text on all other frames - view->SetHighColor(0, 0, 0); - view->DrawString(fText, BPoint(fX, fY)); - } - - // find some new text coordinates - fX = rand() % int(fSizeX - fTextWith); - fY = rand() % int(fSizeY - fTextHeight - (fIsPreview ? 2 : 20)) + fTextHeight; - - // draw new text - view->SetHighColor(0, 255, 0); - view->DrawString(fText, BPoint(fX, fY)); - - // randomize time until next update (preview mode is faster) - SetTickSize(((rand() % 4) + 1) * (fIsPreview ? 300000 : 1000000)); -} diff --git a/src/add-ons/screen_savers/haiku/ScreenSaver.rdef b/src/add-ons/screen_savers/haiku/ScreenSaver.rdef deleted file mode 100644 index 6e346fb866..0000000000 --- a/src/add-ons/screen_savers/haiku/ScreenSaver.rdef +++ /dev/null @@ -1,14 +0,0 @@ - -resource app_signature "application/x-vnd.Haiku-HaikuScreensaver"; - -resource app_name_catalog_entry "x-vnd.Haiku-HaikuScreensaver:System name:Haiku"; - -resource app_version { - major = 1, - middle = 0, - minor = 0, - variety = 0, - internal = 0, - short_info = "1.0.0", - long_info = "Screensaver Haiku" -};