Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kidletime for openSUSE:Factory checked in at 2021-03-16 15:40:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kidletime (Old) and /work/SRC/openSUSE:Factory/.kidletime.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kidletime" Tue Mar 16 15:40:43 2021 rev:88 rq:878813 version:5.80.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kidletime/kidletime.changes 2021-02-17 18:12:09.313970803 +0100 +++ /work/SRC/openSUSE:Factory/.kidletime.new.2401/kidletime.changes 2021-03-16 15:42:01.632808918 +0100 @@ -1,0 +2,12 @@ +Sun Mar 7 09:26:55 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.80.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.80.0 +- Changes since 5.79.0: + * Run clang-format + * Add clang-format configuration + * Handle Qt6 change in nativeEventFilter signature + +------------------------------------------------------------------- Old: ---- kidletime-5.79.0.tar.xz kidletime-5.79.0.tar.xz.sig New: ---- kidletime-5.80.0.tar.xz kidletime-5.80.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kidletime.spec ++++++ --- /var/tmp/diff_new_pack.zk1HXe/_old 2021-03-16 15:42:02.276809948 +0100 +++ /var/tmp/diff_new_pack.zk1HXe/_new 2021-03-16 15:42:02.280809955 +0100 @@ -17,7 +17,7 @@ %define lname libKF5IdleTime5 -%define _tar_path 5.79 +%define _tar_path 5.80 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kidletime -Version: 5.79.0 +Version: 5.80.0 Release: 0 Summary: User and system idle time reporting singleton License: LGPL-2.1-or-later ++++++ kidletime-5.79.0.tar.xz -> kidletime-5.80.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/.gitignore new/kidletime-5.80.0/.gitignore --- old/kidletime-5.79.0/.gitignore 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/.gitignore 2021-02-28 19:58:45.000000000 +0100 @@ -21,3 +21,4 @@ *.unc-backup* .cmake/ /.clang-format +/compile_commands.json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/CMakeLists.txt new/kidletime-5.80.0/CMakeLists.txt --- old/kidletime-5.79.0/CMakeLists.txt 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/CMakeLists.txt 2021-02-28 19:58:45.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.79.0") # handled by release scripts +set(KF_VERSION "5.80.0") # handled by release scripts project(KIdleTime VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.79.0 NO_MODULE) +find_package(ECM 5.80.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) @@ -29,6 +29,7 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(KDEGitCommitHooks) set(REQUIRED_QT_VERSION 5.14.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) @@ -113,3 +114,9 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + +kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) +# Remove these 3 lines when the ECM version is bumped to 5.80 +include(KDEClangFormat) +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/examples/KIdleTest.cpp new/kidletime-5.80.0/examples/KIdleTest.cpp --- old/kidletime-5.79.0/examples/KIdleTest.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/examples/KIdleTest.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -13,10 +13,8 @@ KIdleTest::KIdleTest() { // connect to idle events - connect(KIdleTime::instance(), &KIdleTime::resumingFromIdle, - this, &KIdleTest::resumeEvent); - connect(KIdleTime::instance(), SIGNAL(timeoutReached(int,int)), - this, SLOT(timeoutReached(int,int))); + connect(KIdleTime::instance(), &KIdleTime::resumingFromIdle, this, &KIdleTest::resumeEvent); + connect(KIdleTime::instance(), SIGNAL(timeoutReached(int, int)), this, SLOT(timeoutReached(int, int))); // register to get informed for the very next user event KIdleTime::instance()->catchNextResumeEvent(); @@ -35,10 +33,8 @@ { KIdleTime::instance()->removeAllIdleTimeouts(); - printf("Great! Now stay idle for 5 seconds to get a nice message. From 10" - "seconds on, you can move your mouse to get back here.\n"); - printf("If you will stay idle for too long, I will simulate your activity" - "after 25 seconds, and make everything start back\n"); + printf("Great! Now stay idle for 5 seconds to get a nice message. From 10 seconds on, you can move your mouse to get back here.\n"); + printf("If you will stay idle for too long, I will simulate your activity after 25 seconds, and make everything start back\n"); KIdleTime::instance()->addIdleTimeout(5000); KIdleTime::instance()->addIdleTimeout(10000); @@ -57,8 +53,7 @@ KIdleTime::instance()->catchNextResumeEvent(); printf("Cool. You can move your mouse to start over\n"); } else if (timeout == 25000) { - printf("Uff, you're annoying me. Let's start again. I'm simulating your" - "activity now\n"); + printf("Uff, you're annoying me. Let's start again. I'm simulating your activity now\n"); KIdleTime::instance()->simulateUserActivity(); } else { qDebug() << "OUCH"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/examples/main.cpp new/kidletime-5.80.0/examples/main.cpp --- old/kidletime-5.79.0/examples/main.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/examples/main.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include <QGuiApplication> #include "KIdleTest.h" +#include <QGuiApplication> int main(int argc, char **argv) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/abstractsystempoller.cpp new/kidletime-5.80.0/src/abstractsystempoller.cpp --- old/kidletime-5.79.0/src/abstractsystempoller.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/abstractsystempoller.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -14,4 +14,3 @@ AbstractSystemPoller::~AbstractSystemPoller() { } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/abstractsystempoller.h new/kidletime-5.80.0/src/abstractsystempoller.h --- old/kidletime-5.79.0/src/abstractsystempoller.h 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/abstractsystempoller.h 2021-02-28 19:58:45.000000000 +0100 @@ -18,7 +18,6 @@ Q_OBJECT public: - AbstractSystemPoller(QObject *parent = nullptr); virtual ~AbstractSystemPoller(); @@ -38,7 +37,6 @@ Q_SIGNALS: void resumingFromIdle(); void timeoutReached(int msec); - }; Q_DECLARE_INTERFACE(AbstractSystemPoller, AbstractSystemPoller_iid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/kidletime.cpp new/kidletime-5.80.0/src/kidletime.cpp --- old/kidletime-5.79.0/src/kidletime.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/kidletime.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -12,8 +12,8 @@ #include "logging.h" #include <QDir> -#include <QJsonArray> #include <QGuiApplication> +#include <QJsonArray> #include <QPluginLoader> #include <QPointer> #include <QSet> @@ -21,7 +21,10 @@ class KIdleTimeHelper { public: - KIdleTimeHelper() : q(nullptr) {} + KIdleTimeHelper() + : q(nullptr) + { + } ~KIdleTimeHelper() { delete q; @@ -46,8 +49,13 @@ { Q_DECLARE_PUBLIC(KIdleTime) KIdleTime *q_ptr; + public: - KIdleTimePrivate() : catchResume(false), currentId(0) {} + KIdleTimePrivate() + : catchResume(false) + , currentId(0) + { + } void loadSystem(); void unloadCurrentSystem(); @@ -139,8 +147,8 @@ { Q_D(KIdleTime); - QHash< int, int >::iterator i = d->associations.begin(); - QSet< int > removed; + QHash<int, int>::iterator i = d->associations.begin(); + QSet<int> removed; removed.reserve(d->associations.size()); while (i != d->associations.end()) { @@ -159,7 +167,7 @@ { QStringList ret; const QStringList libPath = QCoreApplication::libraryPaths(); - for (const QString &path : libPath ) { + for (const QString &path : libPath) { const QDir pluginDir(path + QLatin1String("/kf5/org.kde.kidletime.platforms")); if (!pluginDir.exists()) { continue; @@ -173,8 +181,7 @@ static bool checkPlatform(const QJsonObject &metadata, const QString &platformName) { - const QJsonArray platforms = metadata.value(QStringLiteral("MetaData")) - .toObject().value(QStringLiteral("platforms")).toArray(); + const QJsonArray platforms = metadata.value(QStringLiteral("MetaData")).toObject().value(QStringLiteral("platforms")).toArray(); return std::any_of(platforms.begin(), platforms.end(), [&platformName](const QJsonValue &value) { return QString::compare(platformName, value.toString(), Qt::CaseInsensitive) == 0; }); @@ -209,7 +216,7 @@ } QPluginLoader loader(candidate); if (checkPlatform(loader.metaData(), platformName)) { - AbstractSystemPoller *poller = qobject_cast< AbstractSystemPoller* >(loader.instance()); + AbstractSystemPoller *poller = qobject_cast<AbstractSystemPoller *>(loader.instance()); if (poller) { qCDebug(KIDLETIME) << "Trying plugin" << candidate; if (poller->isAvailable()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/kidletime.h new/kidletime-5.80.0/src/kidletime.h --- old/kidletime-5.79.0/src/kidletime.h 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/kidletime.h 2021-02-28 19:58:45.000000000 +0100 @@ -7,8 +7,8 @@ #ifndef KIDLETIME_H #define KIDLETIME_H -#include <QObject> #include <QHash> +#include <QObject> #include <kidletime_export.h> #include <memory> @@ -189,7 +189,6 @@ Q_PRIVATE_SLOT(d_func(), void _k_resumingFromIdle()) Q_PRIVATE_SLOT(d_func(), void _k_timeoutReached(int)) - }; #endif /* KIDLETIME_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/plugins/osx/macpoller.cpp new/kidletime-5.80.0/src/plugins/osx/macpoller.cpp --- old/kidletime-5.79.0/src/plugins/osx/macpoller.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/plugins/osx/macpoller.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -12,8 +12,8 @@ // Why does Apple have to make this so complicated? static OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) { - OSStatus err; - FSRef frameworksFolderRef; + OSStatus err; + FSRef frameworksFolderRef; CFURLRef baseURL; CFURLRef bundleURL; @@ -91,12 +91,12 @@ } // Typedef for the function we're getting back from CFBundleGetFunctionPointerForName. -typedef OSStatus(*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop, - EventTimerInterval inFireDelay, - EventTimerInterval inInterval, - EventLoopIdleTimerUPP inTimerProc, - void *inTimerData, - EventLoopTimerRef *outTimer); +typedef OSStatus (*InstallEventLoopIdleTimerPtr)(EventLoopRef inEventLoop, + EventTimerInterval inFireDelay, + EventTimerInterval inInterval, + EventLoopIdleTimerUPP inTimerProc, + void *inTimerData, + EventLoopTimerRef *outTimer); MacPoller::MacPoller(QObject *parent) : AbstractSystemPoller(parent) @@ -213,4 +213,3 @@ { // TODO } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/plugins/osx/macpoller.h new/kidletime-5.80.0/src/plugins/osx/macpoller.h --- old/kidletime-5.79.0/src/plugins/osx/macpoller.h 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/plugins/osx/macpoller.h 2021-02-28 19:58:45.000000000 +0100 @@ -11,7 +11,7 @@ #include <Carbon/Carbon.h> -class MacPoller: public AbstractSystemPoller +class MacPoller : public AbstractSystemPoller { Q_OBJECT Q_PLUGIN_METADATA(IID "org.kde.kidletime.AbstractSystemPoller" FILE "osx.json") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/plugins/windows/windowspoller.cpp new/kidletime-5.80.0/src/plugins/windows/windowspoller.cpp --- old/kidletime-5.79.0/src/plugins/windows/windowspoller.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/plugins/windows/windowspoller.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -75,4 +75,3 @@ Q_EMIT resumingFromIdle(); } } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp new/kidletime-5.80.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp --- old/kidletime-5.79.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/plugins/xscreensaver/xscreensaverbasedpoller.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -14,9 +14,9 @@ #include <X11/extensions/scrnsaver.h> XScreensaverBasedPoller::XScreensaverBasedPoller(QObject *parent) - : WidgetBasedPoller(parent), m_screenSaverIface(nullptr) + : WidgetBasedPoller(parent) + , m_screenSaverIface(nullptr) { - } XScreensaverBasedPoller::~XScreensaverBasedPoller() @@ -26,8 +26,9 @@ bool XScreensaverBasedPoller::additionalSetUp() { m_screenSaverIface = new OrgFreedesktopScreenSaverInterface(QLatin1String("org.freedesktop.ScreenSaver"), - QLatin1String("/ScreenSaver"), - QDBusConnection::sessionBus(), this); + QLatin1String("/ScreenSaver"), + QDBusConnection::sessionBus(), + this); connect(m_screenSaverIface, SIGNAL(ActiveChanged(bool)), SLOT(screensaverActivated(bool))); @@ -60,4 +61,3 @@ XResetScreenSaver(QX11Info::display()); XFlush(QX11Info::display()); } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/plugins/xscreensaver/xscreensaverbasedpoller.h new/kidletime-5.80.0/src/plugins/xscreensaver/xscreensaverbasedpoller.h --- old/kidletime-5.79.0/src/plugins/xscreensaver/xscreensaverbasedpoller.h 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/plugins/xscreensaver/xscreensaverbasedpoller.h 2021-02-28 19:58:45.000000000 +0100 @@ -11,7 +11,7 @@ #include "screensaver_interface.h" -class XScreensaverBasedPoller: public WidgetBasedPoller +class XScreensaverBasedPoller : public WidgetBasedPoller { Q_OBJECT Q_PLUGIN_METADATA(IID "org.kde.kidletime.AbstractSystemPoller" FILE "xcb.json") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/plugins/xsync/fixx11h.h new/kidletime-5.80.0/src/plugins/xsync/fixx11h.h --- old/kidletime-5.79.0/src/plugins/xsync/fixx11h.h 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/plugins/xsync/fixx11h.h 2021-02-28 19:58:45.000000000 +0100 @@ -38,7 +38,6 @@ namespace X { - // template ---> // Affects: Should be without side effects. #ifdef Unsorted @@ -244,14 +243,12 @@ #ifdef index #ifndef FIXX11H_index #define FIXX11H_index -inline -const char *Xindex(const char *s, int c) +inline const char *Xindex(const char *s, int c) { return index(s, c); } #undef index -inline -const char *index(const char *s, int c) +inline const char *index(const char *s, int c) { return Xindex(s, c); } @@ -264,14 +261,12 @@ // Affects: Should be without side effects. #ifndef FIXX11H_rindex #define FIXX11H_rindex -inline -const char *Xrindex(const char *s, int c) +inline const char *Xrindex(const char *s, int c) { return rindex(s, c); } #undef rindex -inline -const char *rindex(const char *s, int c) +inline const char *rindex(const char *s, int c) { return Xrindex(s, c); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/plugins/xsync/xsyncbasedpoller.cpp new/kidletime-5.80.0/src/plugins/xsync/xsyncbasedpoller.cpp --- old/kidletime-5.79.0/src/plugins/xsync/xsyncbasedpoller.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/plugins/xsync/xsyncbasedpoller.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -19,12 +19,20 @@ class XSyncBasedPollerHelper : public QAbstractNativeEventFilter { public: - XSyncBasedPollerHelper() : q(nullptr), isActive(false) {} + XSyncBasedPollerHelper() + : q(nullptr) + , isActive(false) + { + } ~XSyncBasedPollerHelper() { delete q; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override +#else bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override +#endif { Q_UNUSED(result); if (isActive && eventType == "xcb_generic_event_t") { @@ -78,7 +86,7 @@ #if 0 // Workaround for https://bugs.freedesktop.org/show_bug.cgi?id=23403 -#define xcb_sync_systemcounter_name(sc) (((char *) &(sc)->name_len) + 2) +#define xcb_sync_systemcounter_name(sc) (((char *)&(sc)->name_len) + 2) xcb_sync_list_system_counters_cookie_t cookie = xcb_sync_list_system_counters(m_xcb_connection); xcb_sync_list_system_counters_reply_t *reply = xcb_sync_list_system_counters_reply(m_xcb_connection, cookie, NULL); @@ -190,8 +198,7 @@ XSyncIntToValue(&timeout, nextTimeout); - setAlarm(m_display, &newalarm, m_idleCounter, - XSyncPositiveComparison, timeout); + setAlarm(m_display, &newalarm, m_idleCounter, XSyncPositiveComparison, timeout); m_timeoutAlarm.insert(nextTimeout, newalarm); } @@ -242,14 +249,13 @@ * we have to subtract 1 from the counter value */ - //NOTE: this must be a int, else compilation might fail + // NOTE: this must be a int, else compilation might fail int overflow; XSyncValue add; XSyncValue plusone; XSyncIntToValue(&add, -1); XSyncValueAdd(&plusone, idleTime, add, &overflow); - setAlarm(m_display, &m_resetAlarm, m_idleCounter, - XSyncNegativeComparison, plusone); + setAlarm(m_display, &m_resetAlarm, m_idleCounter, XSyncNegativeComparison, plusone); } void XSyncBasedPoller::reloadAlarms() @@ -259,8 +265,7 @@ for (QHash<int, XSyncAlarm>::iterator i = m_timeoutAlarm.begin(); i != m_timeoutAlarm.end(); ++i) { XSyncIntToValue(&timeout, i.key()); - setAlarm(m_display, &(i.value()), m_idleCounter, - XSyncPositiveComparison, timeout); + setAlarm(m_display, &(i.value()), m_idleCounter, XSyncPositiveComparison, timeout); } } @@ -297,26 +302,24 @@ return false; } -void XSyncBasedPoller::setAlarm(Display *dpy, XSyncAlarm *alarm, XSyncCounter counter, - XSyncTestType test, XSyncValue value) +void XSyncBasedPoller::setAlarm(Display *dpy, XSyncAlarm *alarm, XSyncCounter counter, XSyncTestType test, XSyncValue value) { - XSyncAlarmAttributes attr; - XSyncValue delta; - unsigned int flags; + XSyncAlarmAttributes attr; + XSyncValue delta; + unsigned int flags; XSyncIntToValue(&delta, 0); - attr.trigger.counter = counter; - attr.trigger.value_type = XSyncAbsolute; - attr.trigger.test_type = test; - attr.trigger.wait_value = value; - attr.delta = delta; + attr.trigger.counter = counter; + attr.trigger.value_type = XSyncAbsolute; + attr.trigger.test_type = test; + attr.trigger.wait_value = value; + attr.delta = delta; - flags = XSyncCACounter | XSyncCAValueType | XSyncCATestType | - XSyncCAValue | XSyncCADelta; + flags = XSyncCACounter | XSyncCAValueType | XSyncCATestType | XSyncCAValue | XSyncCADelta; if (*alarm) { - //xcb_sync_change_alarm_checked(m_xcb_connection, alarmId, ... + // xcb_sync_change_alarm_checked(m_xcb_connection, alarmId, ... XSyncChangeAlarm(dpy, *alarm, flags, &attr); } else { *alarm = XSyncCreateAlarm(dpy, flags, &attr); @@ -331,4 +334,3 @@ XResetScreenSaver(m_display); XFlush(m_display); } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/plugins/xsync/xsyncbasedpoller.h new/kidletime-5.80.0/src/plugins/xsync/xsyncbasedpoller.h --- old/kidletime-5.79.0/src/plugins/xsync/xsyncbasedpoller.h 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/plugins/xsync/xsyncbasedpoller.h 2021-02-28 19:58:45.000000000 +0100 @@ -15,6 +15,7 @@ #include <X11/Xlib.h> #include <X11/extensions/sync.h> #include <xcb/xcb.h> + #include "fixx11h.h" class XSyncBasedPoller : public AbstractSystemPoller @@ -49,19 +50,17 @@ void reloadAlarms(); private: - void setAlarm(Display *dpy, XSyncAlarm *alarm, XSyncCounter counter, - XSyncTestType test, XSyncValue value); + void setAlarm(Display *dpy, XSyncAlarm *alarm, XSyncCounter counter, XSyncTestType test, XSyncValue value); private: Display *m_display; xcb_connection_t *m_xcb_connection; - int m_sync_event; - XSyncCounter m_idleCounter; - QHash<int, XSyncAlarm> m_timeoutAlarm; - XSyncAlarm m_resetAlarm; + int m_sync_event; + XSyncCounter m_idleCounter; + QHash<int, XSyncAlarm> m_timeoutAlarm; + XSyncAlarm m_resetAlarm; bool m_available; }; #endif /* XSYNCBASEDPOLLER_H */ - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidletime-5.79.0/src/widgetbasedpoller.cpp new/kidletime-5.80.0/src/widgetbasedpoller.cpp --- old/kidletime-5.79.0/src/widgetbasedpoller.cpp 2021-01-30 18:40:08.000000000 +0100 +++ new/kidletime-5.80.0/src/widgetbasedpoller.cpp 2021-02-28 19:58:45.000000000 +0100 @@ -6,8 +6,8 @@ #include "widgetbasedpoller.h" -#include <QTimer> #include <QEvent> +#include <QTimer> #include <QWindow> WidgetBasedPoller::WidgetBasedPoller(QObject *parent) @@ -28,7 +28,7 @@ { m_pollTimer = new QTimer(this); - //setup idle timer, with some smart polling + // setup idle timer, with some smart polling connect(m_pollTimer, &QTimer::timeout, this, &WidgetBasedPoller::poll); m_grabber = new QWindow(); @@ -59,8 +59,7 @@ bool WidgetBasedPoller::eventFilter(QObject *object, QEvent *event) { - if (object == m_grabber - && (event->type() == QEvent::MouseMove || event->type() == QEvent::KeyPress)) { + if (object == m_grabber && (event->type() == QEvent::MouseMove || event->type() == QEvent::KeyPress)) { detectedActivity(); return true; } else if (object != m_grabber) { @@ -70,7 +69,6 @@ // Otherwise, simply ignore it return false; - } void WidgetBasedPoller::waitForActivity() @@ -78,7 +76,6 @@ m_grabber->show(); m_grabber->setMouseGrabEnabled(true); m_grabber->setKeyboardGrabEnabled(true); - } void WidgetBasedPoller::detectedActivity() @@ -99,10 +96,10 @@ int idle = getIdleTime(); // Check if we reached a timeout.. - for(int timeOut : qAsConst(m_timeouts)) { - if ( ( timeOut - idle < 300 && timeOut >= idle ) || ( idle - timeOut < 300 && idle > timeOut ) ) { + for (int timeOut : qAsConst(m_timeouts)) { + if ((timeOut - idle < 300 && timeOut >= idle) || (idle - timeOut < 300 && idle > timeOut)) { // Bingo! - Q_EMIT timeoutReached( timeOut ); + Q_EMIT timeoutReached(timeOut); } } @@ -115,7 +112,7 @@ } } - //qDebug() << "mintime " << mintime << "idle " << idle; + // qDebug() << "mintime " << mintime << "idle " << idle; if (mintime != 0) { m_pollTimer->start(mintime - idle); @@ -146,4 +143,3 @@ { releaseInputLock(); } -
