Refactor QQnxWindow

This patch does following things:
* Remove the root window: First window which is created will serve as a root window
* Allow creation of more than one application window (with every app window having
  an own window group) on one screen
* Fixes a bug when reparanting an EGL window

Change-Id: I1afd64a813bc084c0893b958aa191d4a25c32b9d
Reviewed-by: Matt Hoosier <matt.hoosier@garmin.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>

1 files changed, 37 insertions, 37 deletions

diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp
index 3dab2b3bc9..a09d6ce1f5 100644
--- a/src/plugins/platforms/qnx/qqnxscreen.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreen.cpp
@@ -1,6 +1,6 @@
 /***************************************************************************
 **
-** Copyright (C) 2011 - 2012 Research In Motion
+** Copyright (C) 2011 - 2013 BlackBerry Limited. All rights reserved.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -154,8 +154,8 @@ static QQnxWindow *findMultimediaWindow(const QList<QQnxWindow*> windows,
 QQnxScreen::QQnxScreen(screen_context_t screenContext, screen_display_t display, bool primaryScreen)
     : m_screenContext(screenContext),
       m_display(display),
+      m_rootWindow(0),
       m_primaryScreen(primaryScreen),
-      m_posted(false),
       m_keyboardHeight(0),
       m_nativeOrientation(Qt::PrimaryOrientation),
       m_coverWindow(0),
@@ -292,7 +292,8 @@ void QQnxScreen::setRotation(int rotation)
 {
     qScreenDebug() << Q_FUNC_INFO << "orientation =" << rotation;
     // Check if rotation changed
-    if (m_currentRotation != rotation) {
+    // We only want to rotate if we are the primary screen
+    if (m_currentRotation != rotation && isPrimaryScreen()) {
         // Update rotation of root window
         if (rootWindow())
             rootWindow()->setRotation(rotation);
@@ -312,15 +313,13 @@ void QQnxScreen::setRotation(int rotation)
         if (isOrthogonal(m_currentRotation, rotation)) {
             qScreenDebug() << Q_FUNC_INFO << "resize, size =" << m_currentGeometry.size();
             if (rootWindow())
-                rootWindow()->resize(m_currentGeometry.size());
+                rootWindow()->setGeometry(QRect(QPoint(0,0), m_currentGeometry.size()));
 
-            if (m_primaryScreen)
-                resizeWindows(previousScreenGeometry);
+            resizeWindows(previousScreenGeometry);
         } else {
             // TODO: Find one global place to flush display updates
             // Force immediate display update if no geometry changes required
-            if (rootWindow())
-                rootWindow()->flush();
+            screen_flush_context(nativeContext(), 0);
         }
 
         // Save new rotation
@@ -490,6 +489,8 @@ void QQnxScreen::removeWindow(QQnxWindow *window)
 
     if (window != m_coverWindow) {
         const int numWindowsRemoved = m_childWindows.removeAll(window);
+        if (window == m_rootWindow) //We just removed the root window
+            m_rootWindow = 0; //TODO we need a new root window ;)
         if (numWindowsRemoved > 0)
             updateHierarchy();
     } else {
@@ -525,13 +526,15 @@ void QQnxScreen::updateHierarchy()
 
     QList<QQnxWindow*>::const_iterator it;
     int result;
-    int topZorder;
+    int topZorder = 0;
 
     errno = 0;
-    if (isPrimaryScreen()) {
+    if (rootWindow()) {
         result = screen_get_window_property_iv(rootWindow()->nativeHandle(), SCREEN_PROPERTY_ZORDER, &topZorder);
-        if (result != 0)
-            qFatal("QQnxScreen: failed to query root window z-order, errno=%d", errno);
+        if (result != 0) { //This can happen if we use winId in QWidgets
+            topZorder = 10;
+            qWarning("QQnxScreen: failed to query root window z-order, errno=%d", errno);
+        }
     } else {
         topZorder = 0;  //We do not need z ordering on the secondary screen, because only one window
                         //is supported there
@@ -539,16 +542,17 @@ void QQnxScreen::updateHierarchy()
 
     topZorder++; // root window has the lowest z-order in the windowgroup
 
+    int underlayZorder = -1;
     // Underlays sit immediately above the root window in the z-ordering
     Q_FOREACH (screen_window_t underlay, m_underlays) {
         // Do nothing when this fails. This can happen if we have stale windows in m_underlays,
         // which in turn can happen because a window was removed but we didn't get a notification
         // yet.
-        screen_set_window_property_iv(underlay, SCREEN_PROPERTY_ZORDER, &topZorder);
-        topZorder++;
+        screen_set_window_property_iv(underlay, SCREEN_PROPERTY_ZORDER, &underlayZorder);
+        underlayZorder--;
     }
 
-    // Normal Qt windows come next above underlays in the z-ordering
+    // Normal Qt windows come next above the root window z-ordering
     for (it = m_childWindows.constBegin(); it != m_childWindows.constEnd(); ++it)
         (*it)->updateZorder(topZorder);
 
@@ -564,20 +568,6 @@ void QQnxScreen::updateHierarchy()
     screen_flush_context( m_screenContext, 0 );
 }
 
-void QQnxScreen::onWindowPost(QQnxWindow *window)
-{
-    qScreenDebug() << Q_FUNC_INFO;
-    Q_UNUSED(window)
-
-    // post app window (so navigator will show it) after first child window
-    // has posted; this only needs to happen once as the app window's content
-    // never changes
-    if (!m_posted && rootWindow()) {
-        rootWindow()->post();
-        m_posted = true;
-    }
-}
-
 void QQnxScreen::adjustOrientation()
 {
     if (!m_primaryScreen)
@@ -713,7 +703,7 @@ void QQnxScreen::windowGroupStateChanged(const QByteArray &id, Qt::WindowState s
     if (!rootWindow() || id != rootWindow()->groupName())
         return;
 
-    QWindow * const window = topMostChildWindow();
+    QWindow * const window = rootWindow()->window();
 
     if (!window)
         return;
@@ -728,7 +718,7 @@ void QQnxScreen::activateWindowGroup(const QByteArray &id)
     if (!rootWindow() || id != rootWindow()->groupName())
         return;
 
-    QWindow * const window = topMostChildWindow();
+    QWindow * const window = rootWindow()->window();
 
     if (!window)
         return;
@@ -755,18 +745,28 @@ void QQnxScreen::deactivateWindowGroup(const QByteArray &id)
     Q_FOREACH (QQnxWindow *childWindow, m_childWindows)
         childWindow->setExposed(false);
 
-    QWindowSystemInterface::handleWindowActivated(0);
+    QWindowSystemInterface::handleWindowActivated(rootWindow()->window());
 }
 
-QSharedPointer<QQnxRootWindow> QQnxScreen::rootWindow() const
+QQnxWindow *QQnxScreen::rootWindow() const
 {
-    // We only create the root window if we are the primary display.
-    if (m_primaryScreen && !m_rootWindow)
-        m_rootWindow = QSharedPointer<QQnxRootWindow>(new QQnxRootWindow(this));
-
     return m_rootWindow;
 }
 
+void QQnxScreen::setRootWindow(QQnxWindow *window)
+{
+    // Optionally disable the screen power save
+    bool ok = false;
+    const int disablePowerSave = qgetenv("QQNX_DISABLE_POWER_SAVE").toInt(&ok);
+    if (ok && disablePowerSave) {
+        const int mode = SCREEN_IDLE_MODE_KEEP_AWAKE;
+        int result = screen_set_window_property_iv(window->nativeHandle(), SCREEN_PROPERTY_IDLE_MODE, &mode);
+        if (result != 0)
+            qWarning("QQnxRootWindow: failed to disable power saving mode");
+    }
+    m_rootWindow = window;
+}
+
 QWindow * QQnxScreen::topMostChildWindow() const
 {
     if (!m_childWindows.isEmpty()) {