From db3f842c545ce838e40a50e8025268c833c9fc57 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Sun, 9 Jun 2024 22:04:25 +0300 Subject: KSMServer: improve suspend code 1. Some code deduplication. Suspending is now handled via the public method `suspend(int)` which is DCOP-accessible and maps SuspendType values to corresponding TDEHWLib TDESystemPowerState values, and the internal method `suspendInternal(int)` which performs the chosen suspend and optionally locks the screen beforehand. 2. Options are now read from power-managerrc on startup and stored in memory to avoid reading the configuration file every time a suspend is requested. 3. SuspendType is now a member of KSMServer class (instead of KSMShutdownDlg) 4. A new DCOP-accessible method `suspendOptions()` returns a TQStringList of all available suspend options. Signed-off-by: Mavridis Philippe (cherry picked from commit d88718ee027e329565d2d97c5cadde4aa1b83166) --- ksmserver/KSMServerInterface.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'ksmserver/KSMServerInterface.h') diff --git a/ksmserver/KSMServerInterface.h b/ksmserver/KSMServerInterface.h index a628b92ba..3645eb84a 100644 --- a/ksmserver/KSMServerInterface.h +++ b/ksmserver/KSMServerInterface.h @@ -10,6 +10,11 @@ class KSMServerInterface : virtual public DCOPObject k_dcop: virtual void logout(int, int, int ) = 0; + virtual void logoutTimed( int, int, TQString ) = 0; + virtual bool suspend(int) = 0; + + virtual TQStringList suspendOptions() = 0; + virtual void restoreSessionInternal() = 0; virtual void restoreSessionDoneInternal() = 0; virtual TQStringList sessionList() = 0; @@ -19,11 +24,11 @@ k_dcop: virtual void saveCurrentSessionAs( TQString ) = 0; virtual void autoStart2() = 0; - + virtual void suspendStartup( TQCString ) = 0; virtual void resumeStartup( TQCString ) = 0; - virtual void logoutTimed( int, int, TQString ) = 0; + virtual void reconfigure() = 0; }; #endif -- cgit v1.2.1