--- a/src-qt5/core/README.md 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/README.md 2025-02-09 01:04:46.905428077 +0100 @@ -45,7 +45,6 @@ 1. Required Utilities * `xinit`: Used by `start-lumina-desktop` for launching an X11 session if needed. * `fluxbox`: Used for window management within the desktop session - * `xscreensaver`: Screensaver/locker for the desktop session 2. Optional (but recommended) Utilities * `numlockx`: Used to toggle the numlock key on session start * `compton` *or* `xcompmgr`: Compositor to provide cross-application transparency effects and graphical smoothing --- a/src-qt5/core/lumina-session/session.cpp 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-session/session.cpp 2025-02-09 00:42:16.969058145 +0100 @@ -200,8 +200,6 @@ //Desktop Next LSingleApplication::removeLocks("lumina-desktop"); startProcess("runtime","lumina-desktop"); - //ScreenSaver - if(LUtils::isValidBinary("xscreensaver")){ startProcess("screensaver","xscreensaver -no-splash"); } }else{ //unified process setupCompositor(true); //required for Lumina 2 --- a/src-qt5/core/lumina-desktop/WMProcess.cpp 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/WMProcess.cpp 2025-02-09 00:55:36.202829483 +0100 @@ -13,7 +13,6 @@ QString log = QString(getenv("XDG_CONFIG_HOME"))+"/lumina-desktop/logs/wm.log"; if(QFile::exists(log)){ QFile::remove(log); } this->setStandardOutputFile(log); - //ssaver = new QProcess(0); inShutdown = false; } @@ -28,17 +27,12 @@ inShutdown = false; QString cmd = setupWM(); if(!isRunning()){this->start(cmd); } - /*if(ssaver->state() == QProcess::NotRunning \ - && LSession::handle()->sessionSettings()->value("WindowManager", "fluxbox").toString() != "lumina-wm"){ - ssaver->start("xscreensaver -no-splash"); - }*/ } void WMProcess::stopWM(){ if(isRunning()){ inShutdown = true; //QProcess::startDetached("fluxbox-remote closeallwindows"); - //ssaver->kill(); this->kill(); if(!this->waitForFinished(10000)){ this->terminate(); }; }else{ --- a/src-qt5/core/lumina-desktop/WMProcess.h 2025-02-09 00:55:54.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/WMProcess.h 2025-02-09 00:56:09.532986757 +0100 @@ -34,7 +34,6 @@ bool isRunning(); QString setupWM(); void cleanupConfig(); - //QProcess *ssaver; private slots: void processFinished(int exitcode, QProcess::ExitStatus status); --- a/src-qt5/core/lumina-desktop/SystemWindow.cpp 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/SystemWindow.cpp 2025-02-09 00:52:18.141894895 +0100 @@ -104,8 +104,6 @@ void SystemWindow::sysSuspend(){ this->hide(); LSession::processEvents(); - //Make sure to lock the system first (otherwise anybody can access it again) - LUtils::runCmd("xscreensaver-command -lock"); //Now suspend the system LOS::systemSuspend(); } @@ -113,6 +111,5 @@ void SystemWindow::sysLock(){ this->hide(); LSession::processEvents(); - qDebug() << "Locking the desktop..."; - QProcess::startDetached("xscreensaver-command -lock"); + qDebug() << "Locking the desktop disabled..."; } --- a/src-qt5/core/lumina-desktop/LDesktop.cpp 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/LDesktop.cpp 2025-02-09 00:52:42.552010079 +0100 @@ -109,7 +109,6 @@ } void LDesktop::SystemLock(){ - QProcess::startDetached("xscreensaver-command -lock"); } void LDesktop::SystemLogout(){ --- a/src-qt5/core/lumina-desktop/SettingsMenu.cpp 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/SettingsMenu.cpp 2025-02-09 00:49:51.281201905 +0100 @@ -27,10 +27,7 @@ this->setIcon( LXDG::findIcon("configure","") ); this->clear(); //Now setup the possible configuration options - QAction *act = new QAction(LXDG::findIcon("preferences-desktop-screensaver",""), tr("Screensaver"), this); - act->setWhatsThis("xscreensaver-demo"); - this->addAction(act); - act = new QAction( LXDG::findIcon("preferences-desktop-wallpaper",""), tr("Wallpaper"), this); + QAction *act = new QAction( LXDG::findIcon("preferences-desktop-wallpaper",""), tr("Wallpaper"), this); act->setWhatsThis("lumina-config --page wallpaper"); this->addAction(act); act = new QAction( LXDG::findIcon("preferences-other",""), tr("Display"), this); --- a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys 2025-02-09 00:51:00.461528345 +0100 @@ -129,8 +129,6 @@ #Lumina Specific defaults Print :Exec lumina-screenshot -Pause :Exec xscreensaver-command -lock -Mod1 L :Exec xscreensaver-command -lock Mod1 space :Exec lumina-search XF86AudioRaiseVolume :Exec lumina-open -volumeup XF86AudioLowerVolume :Exec lumina-open -volumedown @@ -143,4 +141,3 @@ Print :Exec lumina-screenshot Mod1 Home :Exec lumina-open -brightnessup Mod1 End :Exec lumina-open -brightnessdown -Pause :Exec xscreensaver-command -lock --- a/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserWidget.cpp 2025-02-09 00:57:39.363410638 +0100 @@ -18,7 +18,6 @@ //Connect the signals/slots connect(ui->tool_desktopsettings, SIGNAL(clicked()), this, SLOT(openDeskSettings()) ); - connect(ui->tool_config_screensaver, SIGNAL(clicked()), this, SLOT(openScreenSaverConfig()) ); connect(ui->tool_config_screensettings, SIGNAL(clicked()), this, SLOT(openScreenConfig()) ); connect(ui->tool_fav_apps, SIGNAL(clicked()), this, SLOT(FavChanged()) ); connect(ui->tool_fav_files, SIGNAL(clicked()), this, SLOT(FavChanged()) ); @@ -119,7 +118,6 @@ ui->tool_fav_dirs->setIcon( LXDG::findIcon("folder","") ); ui->tool_fav_files->setIcon( LXDG::findIcon("document-multiple","") ); ui->tool_desktopsettings->setIcon( LXDG::findIcon("preferences-desktop","") ); - ui->tool_config_screensaver->setIcon( LXDG::findIcon("preferences-desktop-screensaver","") ); ui->tool_config_screensettings->setIcon( LXDG::findIcon("preferences-other","") ); ui->tool_home_gohome->setIcon( LXDG::findIcon("go-home","") ); ui->tool_home_browse->setIcon( LXDG::findIcon("document-open","") ); --- a/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserWidget.h 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/panel-plugins/userbutton/UserWidget.h 2025-02-09 00:56:50.203178668 +0100 @@ -24,8 +24,6 @@ #include #include "UserItemWidget.h" -#define SSAVER QString("xscreensaver-demo") - namespace Ui{ class UserWidget; }; @@ -80,9 +78,6 @@ void openDeskSettings(){ LaunchItem("lumina-config", false); } - void openScreenSaverConfig(){ - LaunchItem(SSAVER, false); - } void openScreenConfig(){ LaunchItem("lumina-xconfig",false); } --- a/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core/lumina-desktop/panel-plugins/systemstart/StartMenu.cpp 2025-02-09 01:01:26.664483203 +0100 @@ -12,7 +12,6 @@ #include #include "ItemWidget.h" -//#define SSAVER QString("xscreensaver-demo") StartMenu::StartMenu(QWidget *parent) : QWidget(parent), ui(new Ui::StartMenu){ ui->setupUi(this); //load the designer file @@ -577,8 +576,6 @@ //Logout Buttons void StartMenu::on_tool_lock_clicked(){ - //QProcess::startDetached("xscreensaver-command -lock"); - LaunchItem("xscreensaver-command -lock",false); } void StartMenu::on_tool_logout_clicked(){ @@ -613,7 +610,6 @@ void StartMenu::on_tool_suspend_clicked(){ //Make sure to lock the system first (otherwise anybody can access it again) emit CloseMenu(); - LUtils::runCmd("xscreensaver-command -lock"); LOS::systemSuspend(); } --- a/src-qt5/core-utils/lumina-config/lumina-config.1 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core-utils/lumina-config/lumina-config.1 2025-02-09 01:03:00.374925394 +0100 @@ -70,10 +70,6 @@ Check and apply updates or change update settings. .It Ic User Configuration Change user details and groups. -.It Ic XScreenSaver Lock -Lock the screen with XScreenSaver. -.It Ic XScreenSaver Stop -Stop XscreenSaver daemon. .It Ic Device Manager Manage devices connected to the system. .It Ic PulseAudio Preferences @@ -82,10 +78,6 @@ Run or enable start on boot for various services. .It Ic Task Manager View or stop a currently running process. -.It Ic XScreenSaver Blank -Blank the screen with (activate) XScreenSaver. -.It Ic XScreenSaver Start -Start XScreenSaver daemon. .El .Pp .Sy User Settings: --- a/src-qt5/core-utils/lumina-config/pages/page_fluxbox_keys.cpp 2020-01-31 21:25:37.000000000 +0100 +++ b/src-qt5/core-utils/lumina-config/pages/page_fluxbox_keys.cpp 2025-02-09 01:02:30.164782840 +0100 @@ -79,8 +79,7 @@ << "Exec lumina-open -volumedown::::"+tr("Audio Volume Down") \ << "Exec lumina-open -brightnessup::::"+tr("Screen Brightness Up") \ << "Exec lumina-open -brightnessdown::::"+tr("Screen Brightness Down") \ - << "Exec lumina-screenshot::::"+tr("Take Screenshot") \ - << "Exec xscreensaver-command -lock::::"+tr("Lock Screen"); + << "Exec lumina-screenshot::::"+tr("Take Screenshot"); for(int i=0; i