From 288cf06b90a21a162581b1054266e3a7819e7507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 20 Oct 2016 10:57:25 +0200 Subject: [PATCH] Create KSelectionOwner in StartupFeedbackEffect only on X11 Summary: On Wayland we do not need the selection. By only creating the KSelectionOwner on X11 an X11-runtime dependency is removed from the StartupFeedbackEffect. Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D3121 --- effects/startupfeedback/startupfeedback.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/effects/startupfeedback/startupfeedback.cpp b/effects/startupfeedback/startupfeedback.cpp index a948a5f33f..14b5f1300a 100644 --- a/effects/startupfeedback/startupfeedback.cpp +++ b/effects/startupfeedback/startupfeedback.cpp @@ -31,6 +31,7 @@ along with this program. If not, see . #include #include #include +#include // KWin #include @@ -73,7 +74,7 @@ static const int s_startupDefaultTimeout = 5; StartupFeedbackEffect::StartupFeedbackEffect() : m_bounceSizesRatio(1.0) , m_startupInfo(new KStartupInfo(KStartupInfo::CleanOnCantDetect, this)) - , m_selection(new KSelectionOwner("_KDE_STARTUP_FEEDBACK", xcbConnection(), x11RootWindow(), this)) + , m_selection(nullptr) , m_active(false) , m_frame(0) , m_progress(0) @@ -85,7 +86,10 @@ StartupFeedbackEffect::StartupFeedbackEffect() for (int i = 0; i < 5; ++i) { m_bouncingTextures[i] = 0; } - m_selection->claim(true); + if (KWindowSystem::isPlatformX11()) { + m_selection = new KSelectionOwner("_KDE_STARTUP_FEEDBACK", xcbConnection(), x11RootWindow(), this); + m_selection->claim(true); + } connect(m_startupInfo, SIGNAL(gotNewStartup(KStartupInfoId,KStartupInfoData)), SLOT(gotNewStartup(KStartupInfoId,KStartupInfoData))); connect(m_startupInfo, SIGNAL(gotRemoveStartup(KStartupInfoId,KStartupInfoData)), SLOT(gotRemoveStartup(KStartupInfoId,KStartupInfoData))); connect(m_startupInfo, SIGNAL(gotStartupChange(KStartupInfoId,KStartupInfoData)), SLOT(gotStartupChange(KStartupInfoId,KStartupInfoData)));