Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2021-02-17 18:11:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Wed Feb 17 18:11:44 2021 rev:91 rq:871729 version:5.79.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2021-01-13 18:20:35.929497641 +0100 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new.28504/kwindowsystem.changes 2021-02-17 18:12:51.082004974 +0100 @@ -1,0 +2,13 @@ +Mon Feb 8 08:46:47 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.79.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.79.0 +- Changes since 5.78.0: + * Add fractional opacity convenience helpers + * Really fix includes + * Fix includes + * xcb: Work with the active screen as reported by QX11Info::appScreen(). + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.78.0.tar.xz kwindowsystem-5.78.0.tar.xz.sig New: ---- kwindowsystem-5.79.0.tar.xz kwindowsystem-5.79.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.yADo2H/_old 2021-02-17 18:12:51.718005494 +0100 +++ /var/tmp/diff_new_pack.yADo2H/_new 2021-02-17 18:12:51.722005498 +0100 @@ -17,14 +17,14 @@ %define lname libKF5WindowSystem5 -%define _tar_path 5.78 +%define _tar_path 5.79 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kwindowsystem -Version: 5.78.0 +Version: 5.79.0 Release: 0 Summary: KDE Access to window manager License: LGPL-2.1-or-later ++++++ kwindowsystem-5.78.0.tar.xz -> kwindowsystem-5.79.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/.gitignore new/kwindowsystem-5.79.0/.gitignore --- old/kwindowsystem-5.78.0/.gitignore 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/.gitignore 2021-02-06 19:26:49.000000000 +0100 @@ -20,3 +20,4 @@ CMakeLists.txt.user* *.unc-backup* .cmake/ +/.clang-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/CMakeLists.txt new/kwindowsystem-5.79.0/CMakeLists.txt --- old/kwindowsystem-5.78.0/CMakeLists.txt 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/CMakeLists.txt 2021-02-06 19:26:49.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.78.0") # handled by release scripts -project(KWindowSystem VERSION ${KF5_VERSION}) +set(KF_VERSION "5.79.0") # handled by release scripts +project(KWindowSystem VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.78.0 NO_MODULE) +find_package(ECM 5.79.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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/autotests/kstartupinfo_unittest.cpp new/kwindowsystem-5.79.0/autotests/kstartupinfo_unittest.cpp --- old/kwindowsystem-5.78.0/autotests/kstartupinfo_unittest.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/autotests/kstartupinfo_unittest.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -38,7 +38,7 @@ ++m_receivedCount; m_receivedId = id; m_receivedData = data; - emit ready(); + Q_EMIT ready(); } Q_SIGNALS: void ready(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/po/bg/kwindowsystem5_qt.po new/kwindowsystem-5.79.0/po/bg/kwindowsystem5_qt.po --- old/kwindowsystem-5.78.0/po/bg/kwindowsystem5_qt.po 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/po/bg/kwindowsystem5_qt.po 2021-02-06 19:26:49.000000000 +0100 @@ -2,27 +2,26 @@ # This file is distributed under the same license as the PACKAGE package. # # Zlatko Popov <zlatkopo...@fsa-bg.org>, 2006, 2007, 2008, 2009. -# Yasen Pramatarov <ya...@lindeas.com>, 2009, 2010, 2011, 2012, 2013. +# Yasen Pramatarov <ya...@lindeas.com>, 2009, 2010, 2011, 2012, 2013, 2021. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2013-07-23 01:52+0300\n" +"PO-Revision-Date: 2021-01-06 17:38+0200\n" "Last-Translator: Yasen Pramatarov <ya...@lindeas.com>\n" "Language-Team: Bulgarian <d...@ludost.net>\n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 20.08.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" #: platforms/osx/kwindowsystem.cpp:567 platforms/windows/kwindowsystem.cpp:619 #: platforms/xcb/kwindowsystem.cpp:978 -#, fuzzy, qt-format -#| msgid "Desktop %1" +#, qt-format msgctxt "KWindowSystem|" msgid "Desktop %1" msgstr "?????????????? ???????? %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/po/zh_CN/kwindowsystem5_qt.po new/kwindowsystem-5.79.0/po/zh_CN/kwindowsystem5_qt.po --- old/kwindowsystem-5.78.0/po/zh_CN/kwindowsystem5_qt.po 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/po/zh_CN/kwindowsystem5_qt.po 2021-02-06 19:26:49.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-01-01 14:21\n" +"PO-Revision-Date: 2021-02-04 11:59\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/CMakeLists.txt new/kwindowsystem-5.79.0/src/CMakeLists.txt --- old/kwindowsystem-5.78.0/src/CMakeLists.txt 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/CMakeLists.txt 2021-02-06 19:26:49.000000000 +0100 @@ -91,7 +91,7 @@ ecm_generate_export_header(KF5WindowSystem BASE_NAME KWindowSystem GROUP_BASE_NAME KF - VERSION ${KF5_VERSION} + VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 DEPRECATION_VERSIONS 5.0 5.18 5.38 5.62 5.67 5.69 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} @@ -161,7 +161,7 @@ KF5WindowSystem_QCH NAME KWindowSystem BASE_NAME KF5WindowSystem - VERSION ${KF5_VERSION} + VERSION ${KF_VERSION} ORG_DOMAIN org.kde SOURCE_DIRS # using dir for now, to cover any platform dependant code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/kstartupinfo.cpp new/kwindowsystem-5.79.0/src/kstartupinfo.cpp --- old/kwindowsystem-5.78.0/src/kstartupinfo.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/kstartupinfo.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -320,10 +320,10 @@ && !(flags & AnnounceSilenceChanges)) { silent_startups[ id_P ] = startups[ id_P ]; startups.remove(id_P); - emit q->gotRemoveStartup(id_P, silent_startups[ id_P ]); + Q_EMIT q->gotRemoveStartup(id_P, silent_startups[ id_P ]); return; } - emit q->gotStartupChange(id_P, startups[ id_P ]); + Q_EMIT q->gotStartupChange(id_P, startups[ id_P ]); return; } if (silent_startups.contains(id_P)) { @@ -334,10 +334,10 @@ if (silent_startups[ id_P ].silent() != Data::Yes) { startups[ id_P ] = silent_startups[ id_P ]; silent_startups.remove(id_P); - q->emit gotNewStartup(id_P, startups[ id_P ]); + q->Q_EMIT gotNewStartup(id_P, startups[ id_P ]); return; } - emit q->gotStartupChange(id_P, silent_startups[ id_P ]); + Q_EMIT q->gotStartupChange(id_P, silent_startups[ id_P ]); return; } if (uninited_startups.contains(id_P)) { @@ -346,7 +346,7 @@ if (!update_P) { // uninited finally got new: startups[ id_P ] = uninited_startups[ id_P ]; uninited_startups.remove(id_P); - emit q->gotNewStartup(id_P, startups[ id_P ]); + Q_EMIT q->gotNewStartup(id_P, startups[ id_P ]); return; } // no change announce, it's still uninited @@ -358,7 +358,7 @@ } else if (data_P.silent() != Data::Yes || flags & AnnounceSilenceChanges) { //qCDebug(LOG_KWINDOWSYSTEM) << "adding"; startups.insert(id_P, data_P); - emit q->gotNewStartup(id_P, data_P); + Q_EMIT q->gotNewStartup(id_P, data_P); } else { // new silenced, and silent shouldn't be announced //qCDebug(LOG_KWINDOWSYSTEM) << "adding silent"; silent_startups.insert(id_P, data_P); @@ -386,7 +386,7 @@ auto it = startups.find(id_P); if (it != startups.end()) { //qCDebug(LOG_KWINDOWSYSTEM) << "removing"; - emit q->gotRemoveStartup(it.key(), it.value()); + Q_EMIT q->gotRemoveStartup(it.key(), it.value()); startups.erase(it); return; } @@ -403,7 +403,7 @@ QMap< KStartupInfoId, KStartupInfo::Data >::iterator KStartupInfo::Private::removeStartupInfoInternal(QMap< KStartupInfoId, Data >::iterator it) { - emit q->gotRemoveStartup(it.key(), it.value()); + Q_EMIT q->gotRemoveStartup(it.key(), it.value()); return startups.erase(it); } @@ -1029,7 +1029,7 @@ } if ((*it).age >= tout) { if (doEmit) { - emit q->gotRemoveStartup(it.key(), it.value()); + Q_EMIT q->gotRemoveStartup(it.key(), it.value()); } it = s.erase(it); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/kwindoweffects_dummy.cpp new/kwindowsystem-5.79.0/src/kwindoweffects_dummy.cpp --- old/kwindowsystem-5.78.0/src/kwindoweffects_dummy.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/kwindoweffects_dummy.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -7,6 +7,8 @@ #include "kwindoweffects_dummy_p.h" +#include <QList> + KWindowEffectsPrivateDummy::KWindowEffectsPrivateDummy() { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/kwindowsystem_p.h new/kwindowsystem-5.79.0/src/kwindowsystem_p.h --- old/kwindowsystem-5.78.0/src/kwindowsystem_p.h 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/kwindowsystem_p.h 2021-02-06 19:26:49.000000000 +0100 @@ -9,8 +9,8 @@ #include <kwindowsystem_export.h> #include "netwm_def.h" #include <QWidgetList> //For WId +#include <QStringList> -class QStringList; class NETWinInfo; class KWINDOWSYSTEM_EXPORT KWindowSystemPrivate : public NET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/osx/kwindowsystem.cpp new/kwindowsystem-5.79.0/src/platforms/osx/kwindowsystem.cpp --- old/kwindowsystem-5.78.0/src/platforms/osx/kwindowsystem.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/osx/kwindowsystem.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -171,7 +171,7 @@ AXUIElementRef app = AXUIElementCreateApplication(pid); winfo.d->setAxElement(app); if (!m_noEmit) { - emit KWindowSystem::self()->windowAdded(winfo.win()); + Q_EMIT KWindowSystem::self()->windowAdded(winfo.win()); } #ifdef EXPERIMENTAL_WINDOW_TRACKING @@ -255,10 +255,10 @@ KWindowInfo winfo = windows[id]; foreach (KWindowInfo::Private *wi, winfo.d->children) { winids.removeAll(wi->win); - emit KWindowSystem::self()->windowRemoved(wi->win); + Q_EMIT KWindowSystem::self()->windowRemoved(wi->win); } winids.removeAll(id); - emit KWindowSystem::self()->windowRemoved(winfo.win()); + Q_EMIT KWindowSystem::self()->windowRemoved(winfo.win()); } } @@ -272,7 +272,7 @@ parent->children.removeAll(wind); winids.removeAll(wind->win); if (!m_noEmit) { - emit KWindowSystem::self()->windowRemoved(wind->win); + Q_EMIT KWindowSystem::self()->windowRemoved(wind->win); } } @@ -300,7 +300,7 @@ winfod->children.append(win2.d); win2.d->parent = winfod; if (!m_noEmit) { - emit KWindowSystem::self()->windowAdded(win2.win()); + Q_EMIT KWindowSystem::self()->windowAdded(win2.win()); } } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/wayland/CMakeLists.txt new/kwindowsystem-5.79.0/src/platforms/wayland/CMakeLists.txt --- old/kwindowsystem-5.78.0/src/platforms/wayland/CMakeLists.txt 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/wayland/CMakeLists.txt 2021-02-06 19:26:49.000000000 +0100 @@ -17,5 +17,5 @@ TARGETS KF5WindowSystemWaylandPlugin DESTINATION - ${PLUGIN_INSTALL_DIR}/kf5/kwindowsystem/ + ${KDE_INSTALL_PLUGINDIR}/kf5/kwindowsystem/ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/windows/kwindowsystem.cpp new/kwindowsystem-5.79.0/src/platforms/windows/kwindowsystem.cpp --- old/kwindowsystem-5.78.0/src/platforms/windows/kwindowsystem.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/windows/kwindowsystem.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -292,17 +292,17 @@ { // qDebug() << "window added!"; KWindowSystem::s_d_func()->reloadStackList(); - emit KWindowSystem::self()->windowAdded(wid); - emit KWindowSystem::self()->activeWindowChanged(wid); - emit KWindowSystem::self()->stackingOrderChanged(); + Q_EMIT KWindowSystem::self()->windowAdded(wid); + Q_EMIT KWindowSystem::self()->activeWindowChanged(wid); + Q_EMIT KWindowSystem::self()->stackingOrderChanged(); } void KWindowSystemPrivate::windowRemoved(WId wid) { // qDebug() << "window removed!"; KWindowSystem::s_d_func()->reloadStackList(); - emit KWindowSystem::self()->windowRemoved(wid); - emit KWindowSystem::self()->stackingOrderChanged(); + Q_EMIT KWindowSystem::self()->windowRemoved(wid); + Q_EMIT KWindowSystem::self()->stackingOrderChanged(); } void KWindowSystemPrivate::windowActivated(WId wid) @@ -313,8 +313,8 @@ } KWindowSystem::s_d_func()->reloadStackList(); - emit KWindowSystem::self()->activeWindowChanged(wid); - emit KWindowSystem::self()->stackingOrderChanged(); + Q_EMIT KWindowSystem::self()->activeWindowChanged(wid); + Q_EMIT KWindowSystem::self()->stackingOrderChanged(); } void KWindowSystemPrivate::windowRedraw(WId wid) @@ -329,7 +329,7 @@ void KWindowSystemPrivate::windowStateChanged(WId wid) { - emit KWindowSystem::self()->windowChanged(wid); + Q_EMIT KWindowSystem::self()->windowChanged(wid); } void KWindowSystemPrivate::reloadStackList() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/xcb/CMakeLists.txt new/kwindowsystem-5.79.0/src/platforms/xcb/CMakeLists.txt --- old/kwindowsystem-5.78.0/src/platforms/xcb/CMakeLists.txt 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/xcb/CMakeLists.txt 2021-02-06 19:26:49.000000000 +0100 @@ -56,5 +56,5 @@ TARGETS KF5WindowSystemX11Plugin DESTINATION - ${PLUGIN_INSTALL_DIR}/kf5/kwindowsystem/ + ${KDE_INSTALL_PLUGINDIR}/kf5/kwindowsystem/ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/xcb/kselectionowner.cpp new/kwindowsystem-5.79.0/src/platforms/xcb/kselectionowner.cpp --- old/kwindowsystem-5.78.0/src/platforms/xcb/kselectionowner.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/xcb/kselectionowner.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -185,7 +185,7 @@ // qDebug() << "Claimed selection"; - emit owner->claimedOwnership(); + Q_EMIT owner->claimedOwnership(); } void KSelectionOwner::Private::gotTimestamp() @@ -206,7 +206,7 @@ timestamp = XCB_CURRENT_TIME; window = XCB_NONE; - emit owner->failedToClaimOwnership(); + Q_EMIT owner->failedToClaimOwnership(); return; } @@ -239,7 +239,7 @@ claimSucceeded(); } else { - emit owner->failedToClaimOwnership(); + Q_EMIT owner->failedToClaimOwnership(); } } @@ -264,7 +264,7 @@ if (d->prev_owner != XCB_NONE) { if (!force_P) { // qDebug() << "Selection already owned, failing"; - emit failedToClaimOwnership(); + Q_EMIT failedToClaimOwnership(); return; } @@ -357,7 +357,7 @@ // qDebug() << "Lost selection"; xcb_window_t window = d->window; - emit lostOwnership(); + Q_EMIT lostOwnership(); // Unset the event mask before we destroy the window so we don't get a destroy event uint32_t event_mask = XCB_NONE; @@ -384,7 +384,7 @@ d->timestamp = XCB_CURRENT_TIME; // qDebug() << "Lost selection (destroyed)"; - emit lostOwnership(); + Q_EMIT lostOwnership(); return true; } case XCB_SELECTION_NOTIFY: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/xcb/kselectionwatcher.cpp new/kwindowsystem-5.79.0/src/platforms/xcb/kselectionwatcher.cpp --- old/kwindowsystem-5.78.0/src/platforms/xcb/kselectionwatcher.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/xcb/kselectionwatcher.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -198,7 +198,7 @@ if (!err && current_owner == new_owner) { d->selection_owner = current_owner; - emit newOwner(d->selection_owner); + Q_EMIT newOwner(d->selection_owner); } else { // ### This doesn't look right - the selection could have an owner d->selection_owner = XCB_NONE; @@ -237,7 +237,7 @@ d->selection_owner = XCB_NONE; // in case the exactly same ID gets reused as the owner if (owner() == XCB_NONE) { - emit lostOwner(); // it must be safe to delete 'this' in a slot + Q_EMIT lostOwner(); // it must be safe to delete 'this' in a slot } return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/xcb/kwindowinfo.cpp new/kwindowsystem-5.79.0/src/platforms/xcb/kwindowinfo.cpp --- old/kwindowsystem-5.78.0/src/platforms/xcb/kwindowinfo.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/xcb/kwindowinfo.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -322,11 +322,7 @@ #endif const QStringList result = QString::fromLatin1(m_info->activities()).split( -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QLatin1Char(','), QString::SkipEmptyParts); -#else QLatin1Char(','), Qt::SkipEmptyParts); -#endif return result.contains(QStringLiteral(KDE_ALL_ACTIVITIES_UUID)) ? QStringList() : result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/xcb/kwindowsystem.cpp new/kwindowsystem-5.79.0/src/platforms/xcb/kwindowsystem.cpp --- old/kwindowsystem-5.78.0/src/platforms/xcb/kwindowsystem.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/xcb/kwindowsystem.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -120,7 +120,7 @@ : NETRootInfo(QX11Info::connection(), _what >= KWindowSystemPrivateX11::INFO_WINDOWS ? windowsProperties : desktopProperties, _what >= KWindowSystemPrivateX11::INFO_WINDOWS ? windowsProperties2 : desktopProperties2, - -1, false), + QX11Info::appScreen(), false), QAbstractNativeEventFilter(), strutSignalConnected(false), compositingEnabled(false), @@ -186,7 +186,7 @@ bool haveOwner = event->owner != XCB_WINDOW_NONE; if (compositingEnabled != haveOwner) { compositingEnabled = haveOwner; - emit s_q->compositingChanged(compositingEnabled); + Q_EMIT s_q->compositingChanged(compositingEnabled); } return true; } @@ -198,7 +198,7 @@ bool haveOwner = event->owner != XCB_WINDOW_NONE; if (compositingEnabled != haveOwner) { compositingEnabled = haveOwner; - emit s_q->compositingChanged(compositingEnabled); + Q_EMIT s_q->compositingChanged(compositingEnabled); } // NOTICE this is not our event, we just randomly captured it from Qt -> pass on return false; @@ -230,32 +230,32 @@ NETRootInfo::event(ev, &props, &props2); if ((props & CurrentDesktop) && currentDesktop() != old_current_desktop) { - emit s_q->currentDesktopChanged(currentDesktop()); + Q_EMIT s_q->currentDesktopChanged(currentDesktop()); } if ((props & DesktopViewport) && mapViewport() && currentDesktop() != old_current_desktop) { - emit s_q->currentDesktopChanged(currentDesktop()); + Q_EMIT s_q->currentDesktopChanged(currentDesktop()); } if ((props & ActiveWindow) && activeWindow() != old_active_window) { - emit s_q->activeWindowChanged(activeWindow()); + Q_EMIT s_q->activeWindowChanged(activeWindow()); } if (props & DesktopNames) { - emit s_q->desktopNamesChanged(); + Q_EMIT s_q->desktopNamesChanged(); } if ((props & NumberOfDesktops) && numberOfDesktops() != old_number_of_desktops) { - emit s_q->numberOfDesktopsChanged(numberOfDesktops()); + Q_EMIT s_q->numberOfDesktopsChanged(numberOfDesktops()); } if ((props & DesktopGeometry) && mapViewport() && numberOfDesktops() != old_number_of_desktops) { - emit s_q->numberOfDesktopsChanged(numberOfDesktops()); + Q_EMIT s_q->numberOfDesktopsChanged(numberOfDesktops()); } if (props & WorkArea) { - emit s_q->workAreaChanged(); + Q_EMIT s_q->workAreaChanged(); } if (props & ClientListStacking) { updateStackingOrder(); - emit s_q->stackingOrderChanged(); + Q_EMIT s_q->stackingOrderChanged(); } if ((props2 & WM2ShowingDesktop) && showingDesktop() != old_showing_desktop) { - emit s_q->showingDesktopChanged(showingDesktop()); + Q_EMIT s_q->showingDesktopChanged(showingDesktop()); } } else if (windows.contains(eventWindow)) { NETWinInfo ni(QX11Info::connection(), eventWindow, m_appRootWindow, NET::Properties(), NET::Properties2()); @@ -285,15 +285,15 @@ } } if (dirtyProperties || dirtyProperties2) { - emit s_q->windowChanged(eventWindow); - emit s_q->windowChanged(eventWindow, dirtyProperties, dirtyProperties2); + Q_EMIT s_q->windowChanged(eventWindow); + Q_EMIT s_q->windowChanged(eventWindow, dirtyProperties, dirtyProperties2); #if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0) unsigned long dirty[ 2 ] = {dirtyProperties, dirtyProperties2}; - emit s_q->windowChanged(eventWindow, dirty); - emit s_q->windowChanged(eventWindow, dirtyProperties); + Q_EMIT s_q->windowChanged(eventWindow, dirty); + Q_EMIT s_q->windowChanged(eventWindow, dirtyProperties); #endif if ((dirtyProperties & NET::WMStrut) != 0) { - emit s_q->strutChanged(); + Q_EMIT s_q->strutChanged(); } } } @@ -351,9 +351,9 @@ } windows.append(w); - emit s_q->windowAdded(w); + Q_EMIT s_q->windowAdded(w); if (emit_strutChanged) { - emit s_q->strutChanged(); + Q_EMIT s_q->strutChanged(); } } @@ -372,9 +372,9 @@ possibleStrutWindows.removeAll(w); windows.removeAll(w); - emit s_q->windowRemoved(w); + Q_EMIT s_q->windowRemoved(w); if (emit_strutChanged) { - emit s_q->strutChanged(); + Q_EMIT s_q->strutChanged(); } } @@ -491,7 +491,7 @@ d.reset(filter); d->activate(); if (wasCompositing != s_d_func()->compositingEnabled) { - emit KWindowSystem::self()->compositingChanged(s_d_func()->compositingEnabled); + Q_EMIT KWindowSystem::self()->compositingChanged(s_d_func()->compositingEnabled); } } } @@ -525,7 +525,7 @@ if (s_d) { return s_d->currentDesktop(true); } - NETRootInfo info(QX11Info::connection(), NET::CurrentDesktop); + NETRootInfo info(QX11Info::connection(), NET::CurrentDesktop, NET::Properties2(), QX11Info::appScreen()); return info.currentDesktop(true); } @@ -546,7 +546,7 @@ if (s_d) { return s_d->numberOfDesktops(true); } - NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops); + NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops, NET::Properties2(), QX11Info::appScreen()); return info.numberOfDesktops(true); } @@ -555,7 +555,7 @@ if (mapViewport()) { init(INFO_BASIC); NETEventFilter *const s_d = s_d_func(); - NETRootInfo info(QX11Info::connection(), NET::Properties()); + NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::Properties2(), QX11Info::appScreen()); QPoint pos = desktopToViewport(desktop, true); NETPoint p; p.x = pos.x(); @@ -563,7 +563,7 @@ info.setDesktopViewport(s_d->currentDesktop(true), p); return; } - NETRootInfo info(QX11Info::connection(), NET::Properties()); + NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::Properties2(), QX11Info::appScreen()); info.setCurrentDesktop(desktop, true); } @@ -581,7 +581,7 @@ if (b) { info.setDesktop(NETWinInfo::OnAllDesktops, true); } else if (info.desktop(true) == NETWinInfo::OnAllDesktops) { - NETRootInfo rinfo(QX11Info::connection(), NET::CurrentDesktop); + NETRootInfo rinfo(QX11Info::connection(), NET::CurrentDesktop, NET::Properties2(), QX11Info::appScreen()); info.setDesktop(rinfo.currentDesktop(true), true); } } @@ -639,13 +639,13 @@ if (s_d) { return s_d->activeWindow(); } - NETRootInfo info(QX11Info::connection(), NET::ActiveWindow); + NETRootInfo info(QX11Info::connection(), NET::ActiveWindow, NET::Properties2(), QX11Info::appScreen()); return info.activeWindow(); } void KWindowSystemPrivateX11::activateWindow(WId win, long time) { - NETRootInfo info(QX11Info::connection(), NET::Properties()); + NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::Properties2(), QX11Info::appScreen()); if (time == 0) { time = QX11Info::appUserTime(); } @@ -655,7 +655,7 @@ void KWindowSystemPrivateX11::forceActiveWindow(WId win, long time) { - NETRootInfo info(QX11Info::connection(), NET::Properties()); + NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::Properties2(), QX11Info::appScreen()); if (time == 0) { time = QX11Info::appTime(); } @@ -848,7 +848,7 @@ void KWindowSystemPrivateX11::raiseWindow(WId win) { - NETRootInfo info(QX11Info::connection(), NET::Supported); + NETRootInfo info(QX11Info::connection(), NET::Supported, NET::Properties2(), QX11Info::appScreen()); if (info.isSupported(NET::WM2RestackWindow)) { info.restackRequest(win, NET::FromTool, XCB_WINDOW_NONE, XCB_STACK_MODE_ABOVE, QX11Info::appUserTime()); } else { @@ -859,7 +859,7 @@ void KWindowSystemPrivateX11::lowerWindow(WId win) { - NETRootInfo info(QX11Info::connection(), NET::Supported); + NETRootInfo info(QX11Info::connection(), NET::Supported, NET::Properties2(), QX11Info::appScreen()); if (info.isSupported(NET::WM2RestackWindow)) { info.restackRequest(win, NET::FromTool, XCB_WINDOW_NONE, XCB_STACK_MODE_BELOW, QX11Info::appUserTime()); } else { @@ -991,7 +991,7 @@ return; } - NETRootInfo info(QX11Info::connection(), NET::Properties()); + NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::Properties2(), QX11Info::appScreen()); info.setDesktopName(desktop, name.toUtf8().constData()); } @@ -1003,7 +1003,7 @@ void KWindowSystemPrivateX11::setShowingDesktop(bool showing) { - NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::WM2ShowingDesktop); + NETRootInfo info(QX11Info::connection(), NET::Properties(), NET::WM2ShowingDesktop, QX11Info::appScreen()); info.setShowingDesktop(showing); } @@ -1052,7 +1052,7 @@ { static enum { noidea, yes, no } wm_is_1_2_compliant = noidea; if (wm_is_1_2_compliant == noidea) { - NETRootInfo info(QX11Info::connection(), NET::Supported); + NETRootInfo info(QX11Info::connection(), NET::Supported, NET::Properties2(), QX11Info::appScreen()); wm_is_1_2_compliant = info.isSupported(NET::Hidden) ? yes : no; } return wm_is_1_2_compliant == yes; @@ -1062,7 +1062,7 @@ { static enum { noidea, yes, no } wm_supports_allowed_actions = noidea; if (wm_supports_allowed_actions == noidea) { - NETRootInfo info(QX11Info::connection(), NET::Supported); + NETRootInfo info(QX11Info::connection(), NET::Supported, NET::Properties2(), QX11Info::appScreen()); wm_supports_allowed_actions = info.isSupported(NET::WM2AllowedActions) ? yes : no; } return wm_supports_allowed_actions == yes; @@ -1112,11 +1112,12 @@ return s_d->mapViewport(); } // avoid creating KWindowSystemPrivate - NETRootInfo infos(QX11Info::connection(), NET::Supported); + NETRootInfo infos(QX11Info::connection(), NET::Supported, NET::Properties2(), QX11Info::appScreen()); if (!infos.isSupported(NET::DesktopViewport)) { return false; } - NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops | NET::CurrentDesktop | NET::DesktopGeometry); + NETRootInfo info(QX11Info::connection(), NET::NumberOfDesktops | NET::CurrentDesktop | NET::DesktopGeometry, + NET::Properties2(), QX11Info::appScreen()); if (info.numberOfDesktops(true) <= 1 && (info.desktopGeometry().width > displayWidth() || info.desktopGeometry().height > displayHeight())) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/xcb/kxmessages.cpp new/kwindowsystem-5.79.0/src/platforms/xcb/kxmessages.cpp --- old/kwindowsystem-5.78.0/src/platforms/xcb/kxmessages.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/xcb/kxmessages.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -153,7 +153,7 @@ incoming_messages[cm_event->window] = buf; } if (strlen(buf) < 20) { // last message fragment - emit q->gotMessage(QString::fromUtf8(incoming_messages[cm_event->window].constData())); + Q_EMIT q->gotMessage(QString::fromUtf8(incoming_messages[cm_event->window].constData())); incoming_messages.remove(cm_event->window); } return false; // lets other KXMessages instances get the event too diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/xcb/netwm.cpp new/kwindowsystem-5.79.0/src/platforms/xcb/netwm.cpp --- old/kwindowsystem-5.78.0/src/platforms/xcb/netwm.cpp 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/xcb/netwm.cpp 2021-02-06 19:26:49.000000000 +0100 @@ -3404,6 +3404,11 @@ XCB_ATOM_CARDINAL, 32, 1, (const void *) &p->opacity); } +void NETWinInfo::setOpacityF(qreal opacity) +{ + setOpacity(static_cast<unsigned long>(opacity * 0xffffffff)); +} + void NETWinInfo::setAllowedActions(NET::Actions actions) { if (p->role != WindowManager) { @@ -4837,6 +4842,14 @@ return p->opacity; } +qreal NETWinInfo::opacityF() const +{ + if (p->opacity == 0xffffffff) { + return 1.0; + } + return p->opacity * 1.0 / 0xffffffff; +} + NET::Actions NETWinInfo::allowedActions() const { return p->allowed_actions; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.78.0/src/platforms/xcb/netwm.h new/kwindowsystem-5.79.0/src/platforms/xcb/netwm.h --- old/kwindowsystem-5.78.0/src/platforms/xcb/netwm.h 2021-01-02 14:27:16.000000000 +0100 +++ new/kwindowsystem-5.79.0/src/platforms/xcb/netwm.h 2021-02-06 19:26:49.000000000 +0100 @@ -1353,11 +1353,19 @@ * Sets opacity (0 = transparent, 0xffffffff = opaque ) on the window. */ void setOpacity(unsigned long opacity); + /** + * Sets opacity (0 = transparent, 1 = opaque) on the window. + */ + void setOpacityF(qreal opacity); /** * Returns the opacity of the window. */ unsigned long opacity() const; + /** + * Returns the opacity of the window. + */ + qreal opacityF() const; /** * Sets actions that the window manager allows for the window.
