From 8b95f0279ddf0d35141ed5bf7aa348b2b761aebc Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Wed, 4 Nov 2015 15:17:55 -0500 Subject: Get the new lockscreen all setup and (somewhat) functional in the screensaver. Also setup the screensaver so that the "--test-ss" option makes it fully-functional even if the WM event handler is not installed for valid testing). The *only* thing which is still broken is that PAM is allowing all passwords for the user to unlock the system (probably some kind of password cache for the current credentials?). Still need to find some way to register a "lock" with PAM so that it forces the validation of the user's login credentials again. --- lumina-wm-INCOMPLETE/LScreenSaver.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'lumina-wm-INCOMPLETE/LScreenSaver.h') diff --git a/lumina-wm-INCOMPLETE/LScreenSaver.h b/lumina-wm-INCOMPLETE/LScreenSaver.h index a0595a7c..82950156 100644 --- a/lumina-wm-INCOMPLETE/LScreenSaver.h +++ b/lumina-wm-INCOMPLETE/LScreenSaver.h @@ -7,12 +7,10 @@ #ifndef _LUMINA_DESKTOP_SCREEN_SAVER_H #define _LUMINA_DESKTOP_SCREEN_SAVER_H -#include -#include -#include -#include +#include "GlobalDefines.h" #include "SSBaseWidget.h" +#include "LLockScreen.h" class LScreenSaver : public QWidget{ Q_OBJECT @@ -21,18 +19,22 @@ public: ~LScreenSaver(); bool isLocked(); - + private: QTimer *starttimer, *locktimer, *hidetimer; QSettings *settings; QList BASES; - + LLockScreen *LOCKER; + bool SSRunning, SSLocked; + void UpdateTimers(); + public slots: void start(); void reloadSettings(); void newInputEvent(); + void LockScreenNow(); private slots: void ShowScreenSaver(); @@ -40,6 +42,9 @@ private slots: void HideScreenSaver(); void HideLockScreen(); + void LockScreen(); + void SSFinished(); + signals: void StartingScreenSaver(); void ClosingScreenSaver(); -- cgit