[xwl] Add Xwayland interface class

Summary: Adds an interface class to access Xwayland members from within KWin core.

Reviewers: #kwin, davidedmundson, zzag

Subscribers: zzag, davidedmundson, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D15419

CMakeLists.txt

@@ -493,6 +493,7 @@ set(kwin_KDEINIT_SRCS
     libinput/libinput_logging.cpp
     udev.cpp
     touch_hide_cursor_spy.cpp
+    xwl/xwayland_interface.cpp
    )
 
 include(ECMQtDeclareLoggingCategory)

xwl/xwayland.cpp

@@ -78,7 +78,7 @@ Xwayland* Xwayland::self()
 }
 
 Xwayland::Xwayland(ApplicationWaylandAbstract *app, QObject *parent)
-    : QObject(parent),
+    : XwaylandInterface(parent),
       m_app(app)
 {
     s_self = this;

xwl/xwayland.h

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_XWL_XWAYLAND
 #define KWIN_XWL_XWAYLAND
 
-#include <QObject>
+#include "xwayland_interface.h"
 
 #include <xcb/xproto.h>
 
@@ -36,7 +36,7 @@ namespace Xwl
 {
 class DataBridge;
 
-class Xwayland : public QObject
+class Xwayland : public XwaylandInterface
 {
     Q_OBJECT
 public:

xwl/xwayland_interface.cpp

@@ -0,0 +1,43 @@
+/********************************************************************
+ KWin - the KDE window manager
+ This file is part of the KDE project.
+
+Copyright 2019 Roman Gilg <subdiff@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+#include "xwayland_interface.h"
+
+namespace KWin
+{
+
+XwaylandInterface *s_self = nullptr;
+
+XwaylandInterface *XwaylandInterface::self()
+{
+    return s_self;
+}
+
+XwaylandInterface::XwaylandInterface(QObject *parent)
+    : QObject(parent)
+{
+    s_self = this;
+}
+
+XwaylandInterface::~XwaylandInterface()
+{
+    s_self = nullptr;
+}
+
+}

xwl/xwayland_interface.h

@@ -0,0 +1,47 @@
+/********************************************************************
+ KWin - the KDE window manager
+ This file is part of the KDE project.
+
+Copyright 2019 Roman Gilg <subdiff@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*********************************************************************/
+#ifndef KWIN_XWL_XWAYLAND_INTERFACE
+#define KWIN_XWL_XWAYLAND_INTERFACE
+
+#include <kwinglobals.h>
+
+#include <QObject>
+
+namespace KWin
+{
+
+class KWIN_EXPORT XwaylandInterface : public QObject
+{
+    Q_OBJECT
+public:
+    static XwaylandInterface *self();
+
+protected:
+    explicit XwaylandInterface(QObject *parent = nullptr);
+    virtual ~XwaylandInterface();
+};
+
+inline XwaylandInterface *xwayland() {
+    return XwaylandInterface::self();
+}
+
+}
+
+#endif