eglfs: Separate compositor and improve raster window support

Separating the compositor into a separate source file improves the
chances of possible future reuse and paves the way to supporting
multiple GL windows. Tooltips are now working too. Implemented a few
window functions like raise() and lower(). Fixed the qFatal for
multiple GL windows to be raised in non-SDK based Android builds too.

Change-Id: Id94d2fb2a4382766f3d130eebe1e6f397a535852
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/platforms/eglfs/qeglfsscreen.h b/src/plugins/platforms/eglfs/qeglfsscreen.h
index bf7e88bd50..578a6cf20d 100644
--- a/src/plugins/platforms/eglfs/qeglfsscreen.h
+++ b/src/plugins/platforms/eglfs/qeglfsscreen.h
@@ -50,9 +50,9 @@
 
 QT_BEGIN_NAMESPACE
 
-class QPlatformOpenGLContext;
 class QEglFSCursor;
 class QEglFSWindow;
+class QOpenGLContext;
 
 class QEglFSScreen : public QPlatformScreen
 {
@@ -77,7 +77,11 @@ public:
     QList<QEglFSWindow *> windows() const { return m_windows; }
     void addWindow(QEglFSWindow *window);
     void removeWindow(QEglFSWindow *window);
+    void moveToTop(QEglFSWindow *window);
+    void changeWindowIndex(QEglFSWindow *window, int newIdx);
     QEglFSWindow *rootWindow();
+    QOpenGLContext *rootContext() { return m_rootContext; }
+    void setRootContext(QOpenGLContext *context) { m_rootContext = context; }
 
 protected:
     void setPrimarySurface(EGLSurface surface);
@@ -89,6 +93,7 @@ private:
     EGLSurface m_surface;
     QEglFSCursor *m_cursor;
     QList<QEglFSWindow *> m_windows;
+    QOpenGLContext *m_rootContext;
 };
 
 QT_END_NAMESPACE