Merge lp:~vanvugt/mir/fix-1400218 into lp:mir

[Daniel van Vugt]

Ensure surfaces can't consume/steal input events while they themselves
are invisible (e.g. no frame posted yet, or [soon] while minimized).
(LP: #1400218)

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

[Alan Griffiths (alan-griffiths)]

Yes

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Ok.

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

=== modified file 'src/server/scene/basic_surface.cpp'
--- src/server/scene/basic_surface.cpp	2014-12-05 03:26:03 +0000
+++ src/server/scene/basic_surface.cpp	2014-12-08 07:16:27 +0000
@@ -293,7 +293,7 @@
 {
     std::unique_lock<std::mutex> lock(guard);
 
-    if (hidden)
+    if (!visible(lock))
         return false;
 
     // Restrict to bounding rectangle

=== modified file 'tests/unit-tests/scene/test_basic_surface.cpp'
--- tests/unit-tests/scene/test_basic_surface.cpp	2014-12-05 03:26:03 +0000
+++ tests/unit-tests/scene/test_basic_surface.cpp	2014-12-08 07:16:27 +0000
@@ -85,6 +85,17 @@
     void attribute_set(ms::Surface const&, MirSurfaceAttrib, int) override { }
 };
 
+void post_a_frame(ms::BasicSurface& surface)
+{
+    /*
+     * Make sure there's a frame ready. Otherwise visible()==false and the
+     * input_area will never report it containing anything for all the tests
+     * that use it.
+     */
+    mtd::StubBuffer buffer;
+    surface.swap_buffers(&buffer, [&](mir::graphics::Buffer*){});
+}
+
 struct BasicSurfaceTest : public testing::Test
 {
     std::string const name{"aa"};
@@ -113,6 +124,11 @@
         stub_configurator,
         std::shared_ptr<mg::CursorImage>(),
         report};
+
+    BasicSurfaceTest()
+    {
+        post_a_frame(surface);
+    }
 };
 
 }
@@ -264,6 +280,18 @@
     mir::graphics::Buffer* buffer = nullptr;
     auto const callback = [&](mir::graphics::Buffer* new_buffer) { buffer = new_buffer; };
 
+    // Must be a fresh surface to guarantee no frames posted yet...
+    ms::BasicSurface surface{
+        name,
+        rect,
+        false,
+        mock_buffer_stream,
+        std::shared_ptr<mi::InputChannel>(),
+        stub_input_sender,
+        stub_configurator,
+        std::shared_ptr<mg::CursorImage>(),
+        report};
+
     //not visible by default
     EXPECT_FALSE(surface.visible());
 
@@ -330,6 +358,7 @@
         report};
 
     surface.add_observer(observer);
+    post_a_frame(surface);
 
     std::vector<geom::Point> contained_pt
     {
@@ -354,6 +383,24 @@
     }
 }
 
+TEST_F(BasicSurfaceTest, default_invisible_surface_doesnt_get_input)
+{
+    ms::BasicSurface surface{
+        name,
+        geom::Rectangle{{0,0}, {100,100}},
+        false,
+        mock_buffer_stream,
+        std::shared_ptr<mi::InputChannel>(),
+        stub_input_sender,
+        stub_configurator,
+        std::shared_ptr<mg::CursorImage>(),
+        report};
+
+    EXPECT_FALSE(surface.input_area_contains({50,50}));
+    post_a_frame(surface);
+    EXPECT_TRUE(surface.input_area_contains({50,50}));
+}
+
 TEST_F(BasicSurfaceTest, set_input_region)
 {
     std::vector<geom::Rectangle> const rectangles = {