Merge lp:~vanvugt/mir/occluded-vanity into lp:mir

[Daniel van Vugt]

vanity: Handle VT switching and other occlusions

One problem discovered last week trying to run on a single-headed system
was that the act of VT-switching to see your results would immediately
affect the results. This tries to prevent that.

The workaround I landed last week was to just fix the quit keys and quit before VT-switching. But this is better.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3789
https://mir-jenkins.ubuntu.com/job/mir-ci/2053/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2640
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2703
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2695
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2695
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2695
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2669
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2669/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2669
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2669/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2669
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2669/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2669
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2669/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2669
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2669/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2669
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2669/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2053/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

Seems reasonable.

review: Approve

=== modified file 'src/utils/vanity.c'
--- src/utils/vanity.c	2016-10-21 07:53:23 +0000
+++ src/utils/vanity.c	2016-10-26 10:38:49 +0000
@@ -79,6 +79,7 @@
     Buffer const* preview;
     int expected_direction;
     bool reset;
+    bool occluded;
 } State;
 
 static Time now()
@@ -133,6 +134,27 @@
     return false;
 }
 
+static bool on_surface_event(MirSurfaceEvent const* sevent, State* state)
+{
+    MirSurfaceAttrib attrib = mir_surface_event_get_attribute(sevent);
+    int value = mir_surface_event_get_attribute_value(sevent);
+
+    if (attrib == mir_surface_attrib_visibility)
+    {
+        if (value == mir_surface_visibility_exposed)
+        {
+            state->reset = true;
+            state->occluded = false;
+        }
+        else
+        {
+            state->occluded = true;
+        }
+    }
+
+    return false;  // Let eglapp handle the same event. We are passive.
+}
+
 static void on_event(MirSurface* surface, MirEvent const* event, void* context)
 {
     bool handled = true;
@@ -150,6 +172,9 @@
     case mir_event_type_input:
         handled = on_input_event(mir_event_get_input_event(event), state);
         break;
+    case mir_event_type_surface:
+        handled = on_surface_event(mir_event_get_surface_event(event), state);
+        break;
     case mir_event_type_resize:
         state->resized = true;
         break;
@@ -485,6 +510,7 @@
         int const resolution = 5;
         int see = resolution * interpret(cam, buf);
         if ( (see != last_seen_value) &&
+             !state->occluded && // Camera is likely seeing other things
              (acquire_time > state->last_change_time) &&
              ( (see > last_seen_value && state->expected_direction > 0) || 
                (see < last_seen_value && state->expected_direction < 0)
@@ -715,6 +741,7 @@
         0,
         NULL,
         0,
+        false,
         false
     };
     MirSurface* surface = mir_eglapp_native_surface();