Move eglfs-only parts back from eglconvenience

The integration, screen, window and cursor classes were split in Qt 5.3 under a plan
of sharing these between eglfs, the Android port and potentially other future plugins.
This never materialized.

Maintaining the artificial split is getting difficult and is prone to errors. Therefore
it is time to merge back these base classes into eglfs. The result is cleaner, smaller,
and potentially better performing code. eglconvenience is now restored to be a collection
of convenience classes instead of platform plugin bits.

Change-Id: I75c6ad876ef66a1a0c5b39c1c307f928d2ed47d4
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>

1 files changed, 0 insertions, 146 deletions

diff --git a/src/platformsupport/eglconvenience/qeglplatformscreen.cpp b/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
deleted file mode 100644
index 61f8cdd9b4..0000000000
--- a/src/platformsupport/eglconvenience/qeglplatformscreen.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qeglplatformscreen_p.h"
-#include "qeglplatformwindow_p.h"
-#include <QtGui/qwindow.h>
-#include <qpa/qwindowsysteminterface.h>
-#include <QtPlatformSupport/private/qopenglcompositor_p.h>
-
-QT_BEGIN_NAMESPACE
-
-/*!
-    \class QEGLPlatformScreen
-    \brief Base class for EGL-based platform screen implementations.
-    \since 5.2
-    \internal
-    \ingroup qpa
- */
-
-QEGLPlatformScreen::QEGLPlatformScreen(EGLDisplay dpy)
-    : m_dpy(dpy),
-      m_pointerWindow(0)
-{
-}
-
-QEGLPlatformScreen::~QEGLPlatformScreen()
-{
-    QOpenGLCompositor::destroy();
-}
-
-void QEGLPlatformScreen::handleCursorMove(const QPoint &pos)
-{
-    const QOpenGLCompositor *compositor = QOpenGLCompositor::instance();
-    const QList<QOpenGLCompositorWindow *> windows = compositor->windows();
-
-    // Generate enter and leave events like a real windowing system would do.
-    if (windows.isEmpty())
-        return;
-
-    // First window is always fullscreen.
-    if (windows.count() == 1) {
-        QWindow *window = windows[0]->sourceWindow();
-        if (m_pointerWindow != window) {
-            m_pointerWindow = window;
-            QWindowSystemInterface::handleEnterEvent(window, window->mapFromGlobal(pos), pos);
-        }
-        return;
-    }
-
-    QWindow *enter = 0, *leave = 0;
-    for (int i = windows.count() - 1; i >= 0; --i) {
-        QWindow *window = windows[i]->sourceWindow();
-        const QRect geom = window->geometry();
-        if (geom.contains(pos)) {
-            if (m_pointerWindow != window) {
-                leave = m_pointerWindow;
-                m_pointerWindow = window;
-                enter = window;
-            }
-            break;
-        }
-    }
-
-    if (enter && leave)
-        QWindowSystemInterface::handleEnterLeaveEvent(enter, leave, enter->mapFromGlobal(pos), pos);
-}
-
-QPixmap QEGLPlatformScreen::grabWindow(WId wid, int x, int y, int width, int height) const
-{
-    QOpenGLCompositor *compositor = QOpenGLCompositor::instance();
-    const QList<QOpenGLCompositorWindow *> windows = compositor->windows();
-    Q_ASSERT(!windows.isEmpty());
-
-    QImage img;
-
-    if (static_cast<QEGLPlatformWindow *>(windows.first()->sourceWindow()->handle())->isRaster()) {
-        // Request the compositor to render everything into an FBO and read it back. This
-        // is of course slow, but it's safe and reliable. It will not include the mouse
-        // cursor, which is a plus.
-        img = compositor->grab();
-    } else {
-        // Just a single OpenGL window without compositing. Do not support this case for now. Doing
-        // glReadPixels is not an option since it would read from the back buffer which may have
-        // undefined content when calling right after a swapBuffers (unless preserved swap is
-        // available and enabled, but we have no support for that).
-        qWarning("grabWindow: Not supported for non-composited OpenGL content. Use QQuickWindow::grabWindow() instead.");
-        return QPixmap();
-    }
-
-    if (!wid) {
-        const QSize screenSize = geometry().size();
-        if (width < 0)
-            width = screenSize.width() - x;
-        if (height < 0)
-            height = screenSize.height() - y;
-        return QPixmap::fromImage(img).copy(x, y, width, height);
-    }
-
-    foreach (QOpenGLCompositorWindow *w, windows) {
-        const QWindow *window = w->sourceWindow();
-        if (window->winId() == wid) {
-            const QRect geom = window->geometry();
-            if (width < 0)
-                width = geom.width() - x;
-            if (height < 0)
-                height = geom.height() - y;
-            QRect rect(geom.topLeft() + QPoint(x, y), QSize(width, height));
-            rect &= window->geometry();
-            return QPixmap::fromImage(img).copy(rect);
-        }
-    }
-
-    return QPixmap();
-}
-
-QT_END_NAMESPACE