yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create KSelectionOwner in StartupFeedbackEffect only on X11

Browse source 
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
This commit is contained in:
Martin Gräßlin 2016-10-20 10:57:25 +02:00
parent d9612b327c
commit 288cf06b90
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
effects/startupfeedback/startupfeedback.cpp
View file

@ -31,6 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KIconLoader> #include <KIconLoader>
#include <KStartupInfo> #include <KStartupInfo>
#include <KSelectionOwner> #include <KSelectionOwner>
#include <KWindowSystem>
// KWin // KWin
#include <kwinglutils.h> #include <kwinglutils.h>
@ -73,7 +74,7 @@ static const int s_startupDefaultTimeout = 5;
StartupFeedbackEffect::StartupFeedbackEffect() StartupFeedbackEffect::StartupFeedbackEffect()
: m_bounceSizesRatio(1.0) : m_bounceSizesRatio(1.0)
, m_startupInfo(new KStartupInfo(KStartupInfo::CleanOnCantDetect, this)) , m_startupInfo(new KStartupInfo(KStartupInfo::CleanOnCantDetect, this))
, m_selection(new KSelectionOwner("_KDE_STARTUP_FEEDBACK", xcbConnection(), x11RootWindow(), this)) , m_selection(nullptr)
, m_active(false) , m_active(false)
, m_frame(0) , m_frame(0)
, m_progress(0) , m_progress(0)
@ -85,7 +86,10 @@ StartupFeedbackEffect::StartupFeedbackEffect()
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
m_bouncingTextures[i] = 0; 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(gotNewStartup(KStartupInfoId,KStartupInfoData)), SLOT(gotNewStartup(KStartupInfoId,KStartupInfoData)));
connect(m_startupInfo, SIGNAL(gotRemoveStartup(KStartupInfoId,KStartupInfoData)), SLOT(gotRemoveStartup(KStartupInfoId,KStartupInfoData))); connect(m_startupInfo, SIGNAL(gotRemoveStartup(KStartupInfoId,KStartupInfoData)), SLOT(gotRemoveStartup(KStartupInfoId,KStartupInfoData)));
connect(m_startupInfo, SIGNAL(gotStartupChange(KStartupInfoId,KStartupInfoData)), SLOT(gotStartupChange(KStartupInfoId,KStartupInfoData))); connect(m_startupInfo, SIGNAL(gotStartupChange(KStartupInfoId,KStartupInfoData)), SLOT(gotStartupChange(KStartupInfoId,KStartupInfoData)));