From 4db4fa42f7ed30c4fb5cd46f3e6831c86efe715a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraesslin@kde.org>
Date: Sat, 2 Sep 2017 10:04:15 +0200
Subject: [PATCH] Protect readProperty and deleteProperty in case of no X11

Summary:
Read(Window)Property and deleteProperty should only operate if there is
an X11 connection available.

In addition the methods are changed to the x11 wrappers provided on the
KWin::Application as that one can support restarting XWayland in opposite
to the global methods.

Test Plan: Compiles

Reviewers: #kwin, #plasma

Subscribers: plasma-devel, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D7651
---
 effects.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/effects.cpp b/effects.cpp
index acc864feb5..7e4a6689ea 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -90,7 +90,7 @@ static void deleteWindowProperty(Window win, long int atom)
     if (win == XCB_WINDOW_NONE) {
         return;
     }
-    xcb_delete_property(connection(), win, atom);
+    xcb_delete_property(kwinApp()->x11Connection(), win, atom);
 }
 
 static xcb_atom_t registerSupportProperty(const QByteArray &propertyName)
@@ -867,7 +867,10 @@ void EffectsHandlerImpl::removeSupportProperty(const QByteArray &propertyName, E
 
 QByteArray EffectsHandlerImpl::readRootProperty(long atom, long type, int format) const
 {
-    return readWindowProperty(rootWindow(), atom, type, format);
+    if (!kwinApp()->x11Connection()) {
+        return QByteArray();
+    }
+    return readWindowProperty(kwinApp()->x11RootWindow(), atom, type, format);
 }
 
 void EffectsHandlerImpl::activateWindow(EffectWindow* c)
@@ -1737,12 +1740,17 @@ QRect EffectWindowImpl::decorationInnerRect() const
 
 QByteArray EffectWindowImpl::readProperty(long atom, long type, int format) const
 {
+    if (!kwinApp()->x11Connection()) {
+        return QByteArray();
+    }
     return readWindowProperty(window()->window(), atom, type, format);
 }
 
 void EffectWindowImpl::deleteProperty(long int atom) const
 {
-    deleteWindowProperty(window()->window(), atom);
+    if (kwinApp()->x11Connection()) {
+        deleteWindowProperty(window()->window(), atom);
+    }
 }
 
 EffectWindow* EffectWindowImpl::findModal()