From 2ecd097e877f610f14e009c15522965dcb2bdcf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 19 Apr 2016 09:46:16 +0200
Subject: [PATCH] [plugins/drm] Drop dependency on VirtualTerminal

Only integrates with Logind to find out when the session is active.
---
 plugins/platforms/drm/drm_backend.cpp                | 6 +-----
 plugins/platforms/drm/drm_output.cpp                 | 4 ++--
 plugins/platforms/drm/scene_qpainter_drm_backend.cpp | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugins/platforms/drm/drm_backend.cpp b/plugins/platforms/drm/drm_backend.cpp
index 1589c58f59..b7025acc8b 100644
--- a/plugins/platforms/drm/drm_backend.cpp
+++ b/plugins/platforms/drm/drm_backend.cpp
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "scene_qpainter_drm_backend.h"
 #include "screens_drm.h"
 #include "udev.h"
-#include "virtual_terminal.h"
 #include "wayland_server.h"
 #if HAVE_GBM
 #include "egl_gbm_backend.h"
@@ -101,8 +100,6 @@ void DrmBackend::init()
     } else {
         connect(logind, &LogindIntegration::connectedChanged, this, takeControl);
     }
-    auto v = VirtualTerminal::create(this);
-    connect(v, &VirtualTerminal::activeChanged, this, &DrmBackend::activate);
 }
 
 void DrmBackend::outputWentOff()
@@ -210,7 +207,6 @@ void DrmBackend::pageFlipHandler(int fd, unsigned int frame, unsigned int sec, u
 void DrmBackend::openDrm()
 {
     connect(LogindIntegration::self(), &LogindIntegration::sessionActiveChanged, this, &DrmBackend::activate);
-    VirtualTerminal::self()->init();
     UdevDevice::Ptr device = m_udev->primaryGpu();
     if (!device) {
         qCWarning(KWIN_DRM) << "Did not find a GPU";
@@ -226,7 +222,7 @@ void DrmBackend::openDrm()
     QSocketNotifier *notifier = new QSocketNotifier(m_fd, QSocketNotifier::Read, this);
     connect(notifier, &QSocketNotifier::activated, this,
         [this] {
-            if (!VirtualTerminal::self()->isActive()) {
+            if (!LogindIntegration::self()->isActiveSession()) {
                 return;
             }
             drmEventContext e;
diff --git a/plugins/platforms/drm/drm_output.cpp b/plugins/platforms/drm/drm_output.cpp
index d4c504a395..3e60127cc5 100644
--- a/plugins/platforms/drm/drm_output.cpp
+++ b/plugins/platforms/drm/drm_output.cpp
@@ -21,10 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "drm_backend.h"
 
 #include "composite.h"
+#include "logind.h"
 #include "logging.h"
 #include "main.h"
 #include "screens_drm.h"
-#include "virtual_terminal.h"
 #include "wayland_server.h"
 // KWayland
 #include <KWayland/Server/display.h>
@@ -102,7 +102,7 @@ bool DrmOutput::present(DrmBuffer *buffer)
     if (!buffer || buffer->bufferId() == 0) {
         return false;
     }
-    if (!VirtualTerminal::self()->isActive()) {
+    if (!LogindIntegration::self()->isActiveSession()) {
         m_currentBuffer = buffer;
         return false;
     }
diff --git a/plugins/platforms/drm/scene_qpainter_drm_backend.cpp b/plugins/platforms/drm/scene_qpainter_drm_backend.cpp
index 40cf926309..ec975a385f 100644
--- a/plugins/platforms/drm/scene_qpainter_drm_backend.cpp
+++ b/plugins/platforms/drm/scene_qpainter_drm_backend.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "scene_qpainter_drm_backend.h"
 #include "drm_backend.h"
 #include "drm_output.h"
-#include "virtual_terminal.h"
+#include "logind.h"
 
 namespace KWin
 {
@@ -101,7 +101,7 @@ void DrmQPainterBackend::present(int mask, const QRegion &damage)
 {
     Q_UNUSED(mask)
     Q_UNUSED(damage)
-    if (!VirtualTerminal::self()->isActive()) {
+    if (!LogindIntegration::self()->isActiveSession()) {
         return;
     }
     for (auto it = m_outputs.begin(); it != m_outputs.end(); ++it) {