Merge lp:~afrantzis/unity-system-compositor/fix-1488413-pointer-and-key-unblank into lp:unity-system-compositor

[Alexandros Frantzis]

Unblank the screen when a pointer or key event arrives

Unblank the screen when a pointer or key event arrives

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:265
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/326/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/326/rebuild

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

wow looks astonishing simple..

review: Approve

=== modified file 'src/screen_event_handler.cpp'
--- src/screen_event_handler.cpp	2015-11-07 13:29:29 +0000
+++ src/screen_event_handler.cpp	2016-01-20 21:26:16 +0000
@@ -71,16 +71,20 @@
         }
         else
         {
-            std::lock_guard<std::mutex> lock{guard};
-            screen->keep_display_on_temporarily();
+            keep_or_turn_screen_on();
         }
     }
-    else if (input_event_type == mir_input_event_type_touch ||
-             input_event_type == mir_input_event_type_pointer)
+    else if (input_event_type == mir_input_event_type_touch)
     {
         std::lock_guard<std::mutex> lock{guard};
         screen->keep_display_on_temporarily();
     }
+    else if (input_event_type == mir_input_event_type_pointer)
+    {
+        bool const filter_out_event = screen->get_screen_power_mode() != mir_power_mode_on;
+        keep_or_turn_screen_on();
+        return filter_out_event;
+    }
 
     return false;
 }
@@ -138,3 +142,18 @@
         MirPowerMode::mir_power_mode_on, PowerStateChangeReason::power_key);
     long_press_detected = true;
 }
+
+void usc::ScreenEventHandler::keep_or_turn_screen_on()
+{
+    std::lock_guard<std::mutex> lock{guard};
+
+    if (screen->get_screen_power_mode() == mir_power_mode_off)
+    {
+        screen->set_screen_power_mode(
+            MirPowerMode::mir_power_mode_on, PowerStateChangeReason::unknown);
+    }
+    else
+    {
+        screen->keep_display_on_temporarily();
+    }
+}

=== modified file 'src/screen_event_handler.h'
--- src/screen_event_handler.h	2015-04-29 14:39:19 +0000
+++ src/screen_event_handler.h	2016-01-20 21:26:16 +0000
@@ -56,6 +56,7 @@
     void power_key_down();
     void shutdown_alarm_notification();
     void long_press_notification();
+    void keep_or_turn_screen_on();
 
     std::mutex guard;
     std::shared_ptr<Screen> const screen;

=== modified file 'tests/unit-tests/test_screen_event_handler.cpp'
--- tests/unit-tests/test_screen_event_handler.cpp	2015-12-01 13:53:20 +0000
+++ tests/unit-tests/test_screen_event_handler.cpp	2016-01-20 21:26:16 +0000
@@ -203,23 +203,50 @@
     touch_screen();
 }
 
-TEST_F(AScreenEventHandler, keeps_display_on_temporarily_on_pointer_event)
-{
+TEST_F(AScreenEventHandler, turns_on_screen_and_filters_first_pointer_event_when_screen_is_off)
+{
+    mock_screen.mock_mode = MirPowerMode::mir_power_mode_off;
+    EXPECT_CALL(mock_screen,
+                set_screen_power_mode(MirPowerMode::mir_power_mode_on,
+                                      PowerStateChangeReason::unknown));
+
+    auto const event_filtered = screen_event_handler.handle(*pointer_event);
+    EXPECT_TRUE(event_filtered);
+}
+
+TEST_F(AScreenEventHandler, turns_on_screen_and_propagates_keys_when_screen_is_off)
+{
+    mock_screen.mock_mode = MirPowerMode::mir_power_mode_off;
+    EXPECT_CALL(mock_screen,
+                set_screen_power_mode(MirPowerMode::mir_power_mode_on,
+                                      PowerStateChangeReason::unknown));
+
+    auto const event_filtered = screen_event_handler.handle(*another_key_down_event);
+    EXPECT_FALSE(event_filtered);
+}
+
+TEST_F(AScreenEventHandler, keeps_display_on_temporarily_for_pointer_event_when_screen_is_on)
+{
+    mock_screen.mock_mode = MirPowerMode::mir_power_mode_on;
     EXPECT_CALL(mock_screen, keep_display_on_temporarily());
 
     move_pointer();
 }
 
-TEST_F(AScreenEventHandler, keeps_display_on_temporarily_on_other_keys)
+TEST_F(AScreenEventHandler, keeps_display_on_temporarily_key_event_when_screen_is_on)
 {
+    mock_screen.mock_mode = MirPowerMode::mir_power_mode_on;
     EXPECT_CALL(mock_screen, keep_display_on_temporarily());
 
     press_a_key();
 }
 
-TEST_F(AScreenEventHandler, does_not_keep_display_on_for_volume_keys)
+TEST_F(AScreenEventHandler, does_not_affect_screen_state_for_volume_keys)
 {
+    using namespace testing;
+
     EXPECT_CALL(mock_screen, keep_display_on_temporarily()).Times(0);
+    EXPECT_CALL(mock_screen, set_screen_power_mode(_,_)).Times(0);
 
     press_volume_keys();
 }
@@ -255,10 +282,12 @@
     release_power_key();
 }
 
-TEST_F(AScreenEventHandler, passes_through_all_handled_events)
+TEST_F(AScreenEventHandler, passes_through_all_handled_events_when_screen_is_on)
 {
     using namespace testing;
 
+    mock_screen.mock_mode = MirPowerMode::mir_power_mode_on;
+
     EXPECT_FALSE(screen_event_handler.handle(*power_key_down_event));
     EXPECT_FALSE(screen_event_handler.handle(*power_key_up_event));
     EXPECT_FALSE(screen_event_handler.handle(*touch_event));