From 12946a9ec9df1b6eac7c4baa4b5285049d33c908 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 27 Oct 2021 17:22:21 +0300 Subject: [PATCH] Require the compositor to call IdleInterface::simulateUserActivity() explicitly In some cases, kwin may decide not to forward input events to the seat. --- src/wayland/autotests/client/test_idle.cpp | 2 +- src/wayland/idle_interface.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/wayland/autotests/client/test_idle.cpp b/src/wayland/autotests/client/test_idle.cpp index ded7b80d2e..f1ec7554ff 100644 --- a/src/wayland/autotests/client/test_idle.cpp +++ b/src/wayland/autotests/client/test_idle.cpp @@ -135,7 +135,7 @@ void IdleTest::testTimeout() // simulate some activity QVERIFY(resumedFormIdleSpy.isEmpty()); - m_seatInterface->setTimestamp(1); + m_idleInterface->simulateUserActivity(); QVERIFY(resumedFormIdleSpy.wait()); timeout.reset(); diff --git a/src/wayland/idle_interface.cpp b/src/wayland/idle_interface.cpp index 60dc1df4b9..0ce4614961 100644 --- a/src/wayland/idle_interface.cpp +++ b/src/wayland/idle_interface.cpp @@ -79,9 +79,6 @@ IdleTimeoutInterface::IdleTimeoutInterface(SeatInterface *seat, IdleInterface *m , seat(seat) , manager(manager) { - connect(seat, &SeatInterface::timestampChanged, this, [this] { - simulateUserActivity(); - }); connect(manager, &IdleInterface::inhibitedChanged, this, [this, manager] { if (!timer) { // not yet configured