Merge lp:~robertcarr/mir/fix-input-obscurance into lp:~mir-team/mir/trunk

[Robert Carr]

Fix obscurance of touch events according to stacking.

The refactoring of InputDispatcher to use the InputTargetEnumerator interface resulted in an error on my part breaking obscurance of touch events by surfaces. This branch introduces an acceptance test to cover the case and contains a fix.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:827
http://jenkins.qa.ubuntu.com/job/mir-ci/945/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/183
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/586

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/945/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/432/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/725/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1117
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/86/console

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

looks good to me too

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2013-05-30 19:24:29 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2013-07-08 20:03:25 +0000
@@ -1151,8 +1151,6 @@
 
         // Traverse windows from front to back to find touched window and outside targets.
         mEnumerator->for_each([&](sp<InputWindowHandle> const& windowHandle){
-            if (newTouchedWindowHandle != NULL)
-                return;
             const InputWindowInfo* windowInfo = windowHandle->getInfo();
             int32_t flags = windowInfo->layoutParamsFlags;
 
 
=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2013-07-02 20:25:39 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2013-07-08 20:03:25 +0000
@@ -23,6 +23,8 @@
 #include "mir/shell/placement_strategy.h"
 #include "mir/shell/surface_factory.h"
 #include "mir/shell/surface.h"
+#include "mir/surfaces/surface_controller.h"
+#include "mir/surfaces/surface_stack_model.h"
 
 #include "src/server/input/android/android_input_manager.h"
 #include "src/server/input/android/android_input_targeter.h"
@@ -643,3 +645,127 @@
     } client_config;
     launch_client_process(client_config);
 }
+
+namespace
+{
+typedef std::map<std::string, ms::DepthId> DepthList;
+
+struct StackingSurfaceController : public ms::SurfaceController
+{
+    StackingSurfaceController(std::shared_ptr<ms::SurfaceStackModel> const& surface_stack_model, DepthList const& depths)
+        : SurfaceController(surface_stack_model),
+          surface_depths_by_name(depths)
+    {
+    }
+    
+    std::weak_ptr<ms::Surface> create_surface(msh::SurfaceCreationParameters const& params) override
+    {
+        return surface_stack->create_surface(params, surface_depths_by_name[params.name]);
+    }
+    
+    DepthList surface_depths_by_name;
+};
+}
+
+TEST_F(TestClientInput, surfaces_obscure_motion_events_by_stacking)
+{
+    using namespace ::testing;
+    
+    static std::string const test_client_name_1 = "1";
+    static std::string const test_client_name_2 = "2";
+
+    static int const screen_width = 100;
+    static int const screen_height = 100;
+    
+    static geom::Rectangle const screen_geometry{geom::Point{geom::X{0}, geom::Y{0}},
+        geom::Size{geom::Width{screen_width}, geom::Height{screen_height}}};
+
+    struct ServerConiguration : mtf::InputTestingServerConfiguration
+    {
+        std::shared_ptr<msh::PlacementStrategy> the_shell_placement_strategy() override
+        {
+            static GeometryList positions;
+            positions[test_client_name_1] = screen_geometry;
+            
+            auto smaller_geometry = screen_geometry;
+            smaller_geometry.size.width = geom::Width{screen_width/2};
+            positions[test_client_name_2] = smaller_geometry;
+            
+            return std::make_shared<StaticPlacementStrategy>(positions);
+       }
+        
+        std::shared_ptr<msh::SurfaceBuilder> the_surface_builder() override
+        {
+            static DepthList depths;
+            depths[test_client_name_1] = ms::DepthId{0};
+            depths[test_client_name_2] = ms::DepthId{1};
+            
+            return std::make_shared<StackingSurfaceController>(the_surface_stack_model(), depths);
+        }
+        
+        void inject_input() override
+        {
+            wait_until_client_appears(test_client_name_1);
+            wait_until_client_appears(test_client_name_2);
+            
+            // First we will move the cursor in to the region where client 2 obscures client 1
+            fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 1));
+            fake_event_hub->synthesize_event(mis::a_button_down_event().of_button(BTN_LEFT).with_action(mis::EventAction::Down));
+            fake_event_hub->synthesize_event(mis::a_button_up_event().of_button(BTN_LEFT));
+            // Now we move to the unobscured region of client 1
+            fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(50, 0));
+            fake_event_hub->synthesize_event(mis::a_button_down_event().of_button(BTN_LEFT).with_action(mis::EventAction::Down));
+            fake_event_hub->synthesize_event(mis::a_button_up_event().of_button(BTN_LEFT));
+        }
+    } server_config;
+    
+    launch_server_process(server_config);
+
+    struct ClientConfigOne : InputClient
+    {
+        ClientConfigOne()
+            : InputClient(test_client_name_1)
+        {
+        }
+
+        void expect_input(mt::WaitCondition& events_received) override
+        {
+            EXPECT_CALL(*handler, handle_input(HoverEnterEvent())).Times(AnyNumber());
+            EXPECT_CALL(*handler, handle_input(HoverExitEvent())).Times(AnyNumber());
+            EXPECT_CALL(*handler, handle_input(MovementEvent())).Times(AnyNumber());
+
+            {
+                // We should only see one button event sequence.
+                InSequence seq;
+                EXPECT_CALL(*handler, handle_input(ButtonDownEvent(51, 1))).Times(1);
+                EXPECT_CALL(*handler, handle_input(ButtonUpEvent(51, 1))).Times(1)
+                    .WillOnce(mt::WakeUp(&events_received));
+            }
+        }
+    } client_config_1;
+    launch_client_process(client_config_1);
+
+    struct ClientConfigTwo : InputClient
+    {
+        ClientConfigTwo()
+            : InputClient(test_client_name_2)
+        {
+        }
+
+        void expect_input(mt::WaitCondition& events_received) override
+        {
+            EXPECT_CALL(*handler, handle_input(HoverEnterEvent())).Times(AnyNumber());
+            EXPECT_CALL(*handler, handle_input(HoverExitEvent())).Times(AnyNumber());
+            EXPECT_CALL(*handler, handle_input(MovementEvent())).Times(AnyNumber());
+
+            {
+                // Likewise we should only see one button sequence.
+              InSequence seq;
+              EXPECT_CALL(*handler, handle_input(ButtonDownEvent(1, 1))).Times(1);
+              EXPECT_CALL(*handler, handle_input(ButtonUpEvent(1, 1))).Times(1)
+                  .WillOnce(mt::WakeUp(&events_received));
+            }
+        }
+    } client_config_2;
+    launch_client_process(client_config_2);
+}