From 7d3bce21a1c4bacf02155d86b60a2476afcbbf87 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Sun, 17 Oct 2021 18:09:38 +0300
Subject: [PATCH] plugins/idletime: Fix processing of user activity

Currently, idle timers are not restarted on user input which triggers
the lockscreen even though the user is active at computer.

This change fixes that by making sure that idle timers are restarted
whenever SeatInterface's timestamp changes, i.e. user moves the pointer
or presses a key, etc.
---
 src/plugins/idletime/poller.cpp | 17 +++++++++++------
 src/plugins/idletime/poller.h   |  3 ++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/plugins/idletime/poller.cpp b/src/plugins/idletime/poller.cpp
index 90892872c6..7a49aa7347 100644
--- a/src/plugins/idletime/poller.cpp
+++ b/src/plugins/idletime/poller.cpp
@@ -33,6 +33,7 @@ bool KWinIdleTimePoller::isAvailable()
 bool KWinIdleTimePoller::setUpPoller()
 {
     connect(waylandServer()->idle(), &KWaylandServer::IdleInterface::inhibitedChanged, this, &KWinIdleTimePoller::onInhibitedChanged);
+    connect(waylandServer()->seat(), &KWaylandServer::SeatInterface::timestampChanged, this, &KWinIdleTimePoller::onTimestampChanged);
 
     return true;
 }
@@ -41,6 +42,7 @@ void KWinIdleTimePoller::unloadPoller()
 {
     if (waylandServer() && waylandServer()->idle()) {
         disconnect(waylandServer()->idle(), &KWaylandServer::IdleInterface::inhibitedChanged, this, &KWinIdleTimePoller::onInhibitedChanged);
+        disconnect(waylandServer()->idle(), &KWaylandServer::IdleInterface::timestampChanged, this, &KWinIdleTimePoller::onTimestampChanged);
     }
 
     qDeleteAll(m_timeouts);
@@ -70,7 +72,7 @@ void KWinIdleTimePoller::addTimeout(int newTimeout)
     }
 }
 
-void KWinIdleTimePoller::onActivity()
+void KWinIdleTimePoller::processActivity()
 {
     if (m_idling) {
         Q_EMIT resumingFromIdle();
@@ -96,10 +98,15 @@ void KWinIdleTimePoller::onInhibitedChanged()
     }
 }
 
+void KWinIdleTimePoller::onTimestampChanged()
+{
+    if (!waylandServer()->idle()->isInhibited()) {
+        processActivity();
+    }
+}
+
 void KWinIdleTimePoller::catchIdleEvent()
 {
-    connect(waylandServer()->seat(), &KWaylandServer::SeatInterface::timestampChanged, this, &KWinIdleTimePoller::onActivity);
-
     for (QTimer *timer : qAsConst(m_timeouts)) {
         timer->start();
     }
@@ -107,8 +114,6 @@ void KWinIdleTimePoller::catchIdleEvent()
 
 void KWinIdleTimePoller::stopCatchingIdleEvents()
 {
-    disconnect(waylandServer()->seat(), &KWaylandServer::SeatInterface::timestampChanged, this, &KWinIdleTimePoller::onActivity);
-
     for (QTimer *timer : qAsConst(m_timeouts)) {
         timer->stop();
     }
@@ -119,7 +124,7 @@ void KWinIdleTimePoller::simulateUserActivity()
     if (waylandServer()->idle()->isInhibited()) {
         return ;
     }
-    onActivity();
+    processActivity();
     waylandServer()->simulateUserActivity();
 }
 
diff --git a/src/plugins/idletime/poller.h b/src/plugins/idletime/poller.h
index 2a26d6d11e..0f28aeacd4 100644
--- a/src/plugins/idletime/poller.h
+++ b/src/plugins/idletime/poller.h
@@ -40,10 +40,11 @@ public Q_SLOTS:
     void simulateUserActivity() override;
 
 private Q_SLOTS:
-    void onActivity();
     void onInhibitedChanged();
+    void onTimestampChanged();
 
 private:
+    void processActivity();
     QHash<int, QTimer *> m_timeouts;
     bool m_idling = false;
 };