diff -Nru kidletime-5.68.0/CMakeLists.txt kidletime-5.70.0/CMakeLists.txt --- kidletime-5.68.0/CMakeLists.txt 2020-03-07 08:52:30.000000000 +0000 +++ kidletime-5.70.0/CMakeLists.txt 2020-05-02 21:58:15.000000000 +0000 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.68.0") # handled by release scripts +set(KF5_VERSION "5.70.0") # handled by release scripts project(KIdleTime VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.68.0 NO_MODULE) +find_package(ECM 5.70.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru kidletime-5.68.0/debian/changelog kidletime-5.70.0/debian/changelog --- kidletime-5.68.0/debian/changelog 2020-03-25 20:57:41.000000000 +0000 +++ kidletime-5.70.0/debian/changelog 2020-05-09 11:32:09.000000000 +0000 @@ -1,3 +1,13 @@ +kidletime (5.70.0-0ubuntu1) groovy; urgency=medium + + [ José Manuel Santamaría Lema ] + * New upstream release (5.69.0) + + [ Rik Mills ] + * New upstream release (5.70.0) + + -- Rik Mills Sat, 09 May 2020 12:32:09 +0100 + kidletime (5.68.0-0ubuntu1) focal; urgency=medium * New upstream release (5.68.0) diff -Nru kidletime-5.68.0/debian/control kidletime-5.70.0/debian/control --- kidletime-5.68.0/debian/control 2020-03-25 20:57:41.000000000 +0000 +++ kidletime-5.70.0/debian/control 2020-05-09 11:32:09.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: cmake (>= 3.0~), debhelper (>= 11~), doxygen, - extra-cmake-modules (>= 5.68.0~), + extra-cmake-modules (>= 5.70.0~), graphviz, libqt5sql5-sqlite, libqt5x11extras5-dev (>= 5.8.0~), diff -Nru kidletime-5.68.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp kidletime-5.70.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp --- kidletime-5.68.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2020-03-07 08:52:30.000000000 +0000 +++ kidletime-5.70.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2020-05-02 21:58:15.000000000 +0000 @@ -59,6 +59,5 @@ stopCatchingIdleEvents(); XResetScreenSaver(QX11Info::display()); XFlush(QX11Info::display()); - emit resumingFromIdle(); } diff -Nru kidletime-5.68.0/src/widgetbasedpoller.cpp kidletime-5.70.0/src/widgetbasedpoller.cpp --- kidletime-5.68.0/src/widgetbasedpoller.cpp 2020-03-07 08:52:30.000000000 +0000 +++ kidletime-5.70.0/src/widgetbasedpoller.cpp 2020-05-02 21:58:15.000000000 +0000 @@ -6,9 +6,9 @@ #include "widgetbasedpoller.h" -#include #include #include +#include WidgetBasedPoller::WidgetBasedPoller(QObject *parent) : AbstractSystemPoller(parent) @@ -31,10 +31,9 @@ //setup idle timer, with some smart polling connect(m_pollTimer, &QTimer::timeout, this, &WidgetBasedPoller::poll); - // This code was taken from Lithium/KDE4Powersave - m_grabber = new QWidget(nullptr, Qt::X11BypassWindowManagerHint); - m_grabber->move(-1000, -1000); - m_grabber->setMouseTracking(true); + m_grabber = new QWindow(); + m_grabber->setFlag(Qt::X11BypassWindowManagerHint); + m_grabber->setPosition(-1000, -1000); m_grabber->installEventFilter(this); m_grabber->setObjectName(QStringLiteral("KIdleGrabberWidget")); @@ -76,11 +75,9 @@ void WidgetBasedPoller::waitForActivity() { - // This code was taken from Lithium/KDE4Powersave - m_grabber->show(); - m_grabber->grabMouse(); - m_grabber->grabKeyboard(); + m_grabber->setMouseGrabEnabled(true); + m_grabber->setKeyboardGrabEnabled(true); } @@ -92,8 +89,8 @@ void WidgetBasedPoller::releaseInputLock() { - m_grabber->releaseMouse(); - m_grabber->releaseKeyboard(); + m_grabber->setMouseGrabEnabled(false); + m_grabber->setKeyboardGrabEnabled(false); m_grabber->hide(); } diff -Nru kidletime-5.68.0/src/widgetbasedpoller.h kidletime-5.70.0/src/widgetbasedpoller.h --- kidletime-5.68.0/src/widgetbasedpoller.h 2020-03-07 08:52:30.000000000 +0000 +++ kidletime-5.70.0/src/widgetbasedpoller.h 2020-05-02 21:58:15.000000000 +0000 @@ -13,6 +13,7 @@ class QTimer; class QEvent; +class QWindow; class KIDLETIME_EXPORT WidgetBasedPoller : public AbstractSystemPoller { @@ -49,7 +50,7 @@ private: QTimer *m_pollTimer; - QWidget *m_grabber; + QWindow *m_grabber; QList m_timeouts; };