Merge lp:~macslow/qtubuntu/fix-1475678 into lp:qtubuntu

[Mirco Müller]

Hook up listening to changes of mir_surface_attrib_visibility.

Hook up listening to changes of mir_surface_attrib_visibility.

[lp:~macslow/qtubuntu/fix-1475678]

271. By Mirco Müller on 2015-07-22

Implement isExposed() for UbuntuWindow and store visible state passed in via handleSurfaceVisibleChange().

272. By Mirco Müller on 2015-07-23

Use better-fitting term of "exposed" instead of "visible" in related calls... also matches qtmir's meaning of visibility better.

273. By Mirco Müller on 2015-07-30

Use temp. logging for UbuntuInput::customEvent().

Unmerged revisions

273. By Mirco Müller on 2015-07-30

Use temp. logging for UbuntuInput::customEvent().

272. By Mirco Müller on 2015-07-23

Use better-fitting term of "exposed" instead of "visible" in related calls... also matches qtmir's meaning of visibility better.

271. By Mirco Müller on 2015-07-22

Implement isExposed() for UbuntuWindow and store visible state passed in via handleSurfaceVisibleChange().

270. By Mirco Müller on 2015-07-21

Make a client-window set its visible-flag based on corresponding mir-surface-event coming in.

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2015-06-17 13:46:49 +0000
+++ src/ubuntumirclient/input.cpp	2015-07-30 13:49:11 +0000
@@ -232,10 +232,22 @@
     case mir_event_type_surface:
     {
         auto surfaceEvent = mir_event_get_surface_event(nativeEvent);
+
+        if (mir_surface_event_get_attribute(surfaceEvent) == mir_surface_attrib_focus) {
+            LOG("UbuntuInput::customEvent() - mir_surface_attrib_focus");
+        }
+        if (mir_surface_event_get_attribute(surfaceEvent) == mir_surface_attrib_visibility) {
+            LOG("UbuntuInput::customEvent() - mir_surface_attrib_visibility");
+        }
+
         if (mir_surface_event_get_attribute(surfaceEvent) == mir_surface_attrib_focus) {
             ubuntuEvent->window->handleSurfaceFocusChange(mir_surface_event_get_attribute_value(surfaceEvent) ==
                 mir_surface_focused);
         }
+        if (mir_surface_event_get_attribute(surfaceEvent) == mir_surface_attrib_visibility) {
+            ubuntuEvent->window->handleSurfaceExposedChange(mir_surface_event_get_attribute_value(surfaceEvent) ==
+                mir_surface_visibility_exposed);
+        }
         break;
     }
     case mir_event_type_orientation:

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2015-06-24 17:21:21 +0000
+++ src/ubuntumirclient/window.cpp	2015-07-30 13:49:11 +0000
@@ -350,6 +350,18 @@
     QWindowSystemInterface::handleWindowActivated(activatedWindow, Qt::ActiveWindowFocusReason);
 }
 
+void UbuntuWindow::handleSurfaceExposedChange(bool exposed)
+{
+    LOG("UbuntuWindow::handleSurfaceExposedChange(exposed=%s)", exposed ? "true" : "false");
+
+    this->setVisible(exposed);
+    if (m_exposed != exposed) {
+        m_exposed = exposed;
+        QWindowSystemInterface::handleExposeEvent (window(), m_exposed ? geometry() : QRect());
+    }
+}
+
+
 void UbuntuWindow::setWindowState(Qt::WindowState state)
 {
     QMutexLocker(&d->mutex);
@@ -397,6 +409,11 @@
     }
 }
 
+bool UbuntuWindow::isExposed() const
+{
+    return m_exposed;
+}
+
 void* UbuntuWindow::eglSurface() const
 {
     return d->eglSurface;

=== modified file 'src/ubuntumirclient/window.h'
--- src/ubuntumirclient/window.h	2015-05-12 17:30:15 +0000
+++ src/ubuntumirclient/window.h	2015-07-30 13:49:11 +0000
@@ -40,11 +40,13 @@
     void setGeometry(const QRect&) override;
     void setWindowState(Qt::WindowState state) override;
     void setVisible(bool visible) override;
+    bool isExposed() const override;
 
     // New methods.
     void* eglSurface() const;
     void handleSurfaceResize(int width, int height);
     void handleSurfaceFocusChange(bool focused);
+    void handleSurfaceExposedChange(bool exposed);
     void onBuffersSwapped_threadSafe(int newBufferWidth, int newBufferHeight);
 
     UbuntuWindowPrivate* priv() { return d; }
@@ -54,6 +56,7 @@
     void moveResize(const QRect& rect);
 
     UbuntuWindowPrivate *d;
+    bool m_exposed;
 };
 
 #endif // UBUNTU_WINDOW_H