Merge into development-branch : fix-1549701 : Code : Mir

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-04-11
Alberto Aguirre (community)			Approve on 2016-04-01
Alan Griffiths			Approve on 2016-04-01
Kevin DuBois (community)			Approve on 2016-03-31
Cemil Azizoglu (community)		2016-03-29	Approve on 2016-03-29
Review via email: mp+290366@code.launchpad.net

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-29:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-03-29:

#

Ugh all the device specific names/vars are a bit messy but I see why you'd need them.

review: Approve

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2016-03-30:

#

209 "#include "linux/input-event-codes.h"

I guess this is only available for newer kernels...

review: Needs Fixing

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-03-30:

#

The abbreviations(?) "mtk_tpd" and "mtk" are used without explanation: e.g. KeyRepeatDispatcher::set_mtk_device() and disable_repeat_on_mtk_touchpad.

Could we find better names?

review: Needs Information

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-31:

#

FAILED: Continuous integration, rev:3429
https://mir-jenkins.ubuntu.com/job/mir-ci/700/
Executed test runs:
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-mir/661/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/698
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/690
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/690

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-03-31:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-03-31:

#

lgtm

review: Approve

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-04-01:

#

Better

review: Approve

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2016-04-01:

#

OK.

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-01:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-04:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-05:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-05:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-06:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-06:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-08:

#

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

FAILED: Continuous integration, rev:3432
https://mir-jenkins.ubuntu.com/job/mir-ci/791/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/786/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/823
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/814
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/814
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/795
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/795/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/795
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/795/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/795/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/795/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/795
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/795/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/795
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/795/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-08:

#

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

FAILED: Continuous integration, rev:3432
https://mir-jenkins.ubuntu.com/job/mir-ci/797/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/792/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/829
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/820
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/820
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/801
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/801/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/801
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/801/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/801/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/801/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/801
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/801/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/801
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/801/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-04-11:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) on 2016-04-11:

#

review: Approve (continuous-integration)

Mir

Merge lp:~andreas-pokorny/mir/fix-1549701 into lp:mir

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'src/server/input/default_configuration.cpp'
 --- src/server/input/default_configuration.cpp	2016-04-05 21:20:21 +0000
 +++ src/server/input/default_configuration.cpp	2016-04-08 06:59:01 +0000
@@ -48,6 +48,7 @@
  #include "mir/abnormal_exit.h"
  #include "mir/glib_main_loop.h"
  #include "mir/log.h"
++#include "mir/shared_library.h"
  #include "mir/dispatch/action_queue.h"
  #include "mir_toolkit/cursors.h"
@@ -60,6 +61,41 @@
  namespace msh = mir::shell;
  namespace md = mir::dispatch;
++namespace
++{
++
++bool is_arale()
++{
++#ifdef __ARM_EABI__
++    try
++    {
++        auto const android_properties = "libandroid-properties.so.1";
++        auto const arale_device_name = "arale";
++        int const property_value_max = 92;
++
++        mir::SharedLibrary android_properties_lib(android_properties);
++        int (*property_get)(char const*, char*, char const*) = nullptr;
++        property_get = android_properties_lib.load_function<decltype(property_get)>("property_get");
++
++        char default_value[] = "";
++        char value[property_value_max];
++
++        if (property_get == nullptr)
++            return false;
++
++        property_get("ro.product.device", value, default_value);
++
++        return std::strcmp(arale_device_name, value) == 0;
++    }
++    catch(...)
++    {
++    }
++#endif
++    return false;
++}
++
++}
++
  std::shared_ptr<mi::InputRegion> mir::DefaultServerConfiguration::the_input_region()
+ {
      return input_region(
@@ -151,7 +187,7 @@
              return std::make_shared<mi::KeyRepeatDispatcher>(
                  the_event_filter_chain_dispatcher(), the_main_loop(), the_cookie_authority(),
--                enable_repeat, key_repeat_timeout, key_repeat_delay);
++                enable_repeat, key_repeat_timeout, key_repeat_delay, is_arale());
          });
+ }
 === modified file 'src/server/input/key_repeat_dispatcher.cpp'
 --- src/server/input/key_repeat_dispatcher.cpp	2016-04-01 20:44:08 +0000
 +++ src/server/input/key_repeat_dispatcher.cpp	2016-04-08 06:59:01 +0000
@@ -37,11 +37,16 @@
+ {
  struct DeviceRemovalFilter : mi::InputDeviceObserver
+ {
--    DeviceRemovalFilter(std::function<void(MirInputDeviceId)> const& on_removal)
--        : on_removal(on_removal) {}
++    DeviceRemovalFilter(mi::KeyRepeatDispatcher* dispatcher)
++        : dispatcher{dispatcher} {}
--    void device_added(std::shared_ptr<mi::Device> const&) override
++    void device_added(std::shared_ptr<mi::Device> const& device) override
+     {
++        if (device->name() == "mtk-tpd")
++        {
++            dispatcher->set_touch_button_device(device->id());
++        }
++
+     }
      void device_changed(std::shared_ptr<mi::Device> const&) override
@@ -50,13 +55,13 @@
      void device_removed(std::shared_ptr<mi::Device> const& device) override
+     {
--        on_removal(device->id());
++        dispatcher->remove_device(device->id());
+     }
      void changes_complete() override
+     {
+     }
--    std::function<void(MirInputDeviceId)> on_removal;
++    mi::KeyRepeatDispatcher* dispatcher;
  };
+ }
@@ -67,25 +72,35 @@
      std::shared_ptr<mir::cookie::Authority> const& cookie_authority,
      bool repeat_enabled,
      std::chrono::milliseconds repeat_timeout,
--    std::chrono::milliseconds repeat_delay)
++    std::chrono::milliseconds repeat_delay,
++    bool disable_repeat_on_touchscreen)
      : next_dispatcher(next_dispatcher),
        alarm_factory(factory),
        cookie_authority(cookie_authority),
        repeat_enabled(repeat_enabled),
        repeat_timeout(repeat_timeout),
--      repeat_delay(repeat_delay)
++      repeat_delay(repeat_delay),
++      disable_repeat_on_touchscreen(disable_repeat_on_touchscreen)
+ {
+ }
  void mi::KeyRepeatDispatcher::set_input_device_hub(std::shared_ptr<InputDeviceHub> const& hub)
+ {
--    hub->add_observer(std::make_shared<DeviceRemovalFilter>(
--            [this](MirInputDeviceId id)
--            {
--                std::unique_lock<std::mutex> lock(repeat_state_mutex);
--                repeat_state_by_device.erase(id); // destructor cancels alarms
--            }
--            ));
++    hub->add_observer(std::make_shared<DeviceRemovalFilter>(this));
++}
++
++void mi::KeyRepeatDispatcher::set_touch_button_device(MirInputDeviceId id)
++{
++    std::lock_guard<std::mutex> lock(repeat_state_mutex);
++    touch_button_device = id;
++}
++
++void mi::KeyRepeatDispatcher::remove_device(MirInputDeviceId id)
++{
++    std::lock_guard<std::mutex> lock(repeat_state_mutex);
++    repeat_state_by_device.erase(id); // destructor cancels alarms
++    if (touch_button_device.is_set() && touch_button_device.value() == id)
++        touch_button_device.consume();
+ }
  mi::KeyRepeatDispatcher::KeyboardState& mi::KeyRepeatDispatcher::ensure_state_for_device_locked(std::lock_guard<std::mutex> const&, MirInputDeviceId id)
@@ -100,12 +115,16 @@
+     {
  	return next_dispatcher->dispatch(event);
+     }
--
++
      if (mir_event_get_type(&event) == mir_event_type_input)
+     {
          auto iev = mir_event_get_input_event(&event);
          if (mir_input_event_get_type(iev) != mir_input_event_type_key)
              return next_dispatcher->dispatch(event);
++        auto device_id = mir_input_event_get_device_id(iev);
++        if (disable_repeat_on_touchscreen && touch_button_device.is_set() && device_id == touch_button_device.value())
++            return next_dispatcher->dispatch(event);
++
          if (!handle_key_input(mir_input_event_get_device_id(iev), mir_input_event_get_keyboard_event(iev)))
              return next_dispatcher->dispatch(event);
          else
 === modified file 'src/server/input/key_repeat_dispatcher.h'
 --- src/server/input/key_repeat_dispatcher.h	2016-03-23 06:39:56 +0000
 +++ src/server/input/key_repeat_dispatcher.h	2016-04-08 06:59:01 +0000
@@ -21,6 +21,7 @@
  #include "mir/input/input_dispatcher.h"
  #include "mir/input/input_device_observer.h"
++#include "mir/optional_value.h"
  #include <memory>
  #include <chrono>
@@ -49,7 +50,8 @@
                          std::shared_ptr<cookie::Authority> const& cookie_authority,
                          bool repeat_enabled,
                          std::chrono::milliseconds repeat_timeout, /* timeout before sending first repeat */
--                        std::chrono::milliseconds repeat_delay /* delay between repeated keys */);
++                        std::chrono::milliseconds repeat_delay, /* delay between repeated keys */
++                        bool disable_repeat_on_touchscreen);
      // InputDispatcher
      bool dispatch(MirEvent const& event) override;
@@ -58,6 +60,8 @@
      void set_input_device_hub(std::shared_ptr<InputDeviceHub> const& hub);
++    void set_touch_button_device(MirInputDeviceId id);
++    void remove_device(MirInputDeviceId id);
  private:
      std::mutex repeat_state_mutex;
@@ -67,6 +71,8 @@
      bool const repeat_enabled;
      std::chrono::milliseconds repeat_timeout;
      std::chrono::milliseconds repeat_delay;
++    bool const disable_repeat_on_touchscreen;
++    optional_value<MirInputDeviceId> touch_button_device;
      struct KeyboardState
+     {
 === modified file 'tests/unit-tests/input/test_key_repeat_dispatcher.cpp'
 --- tests/unit-tests/input/test_key_repeat_dispatcher.cpp	2016-04-04 00:07:12 +0000
 +++ tests/unit-tests/input/test_key_repeat_dispatcher.cpp	2016-04-08 06:59:01 +0000
@@ -76,10 +76,18 @@
  struct StubDevice : public mi::Device
+ {
      MirInputDeviceId device_id;
++    std::string device_name;
++
      StubDevice(MirInputDeviceId id) : device_id(id) {}
--    MirInputDeviceId id() const { return device_id;}
++    StubDevice(MirInputDeviceId id, std::string device_name) : device_id{id}, device_name{device_name}
++    {
++    }
++    MirInputDeviceId id() const
++    {
++        return device_id;
++    }
      mi::DeviceCapabilities capabilities() const {return mi::DeviceCapability::keyboard;}
--    std::string name() const {return {};}
++    std::string name() const {return device_name;}
      std::string unique_id() const {return {};}
      mir::optional_value<mi::PointerConfiguration> pointer_configuration() const {return {};}
@@ -90,8 +98,8 @@
  struct KeyRepeatDispatcher : public testing::Test
+ {
--    KeyRepeatDispatcher()
--        : dispatcher(mock_next_dispatcher, mock_alarm_factory, cookie_authority, true, repeat_time, repeat_delay)
++    KeyRepeatDispatcher(bool on_arale = false)
++        : dispatcher(mock_next_dispatcher, mock_alarm_factory, cookie_authority, true, repeat_time, repeat_delay, on_arale)
+     {
          ON_CALL(hub,add_observer(_)).WillByDefault(SaveArg<0>(&observer));
          dispatcher.set_input_device_hub(mt::fake_shared(hub));
@@ -123,6 +131,25 @@
          return mev::make_event(test_device, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, mir_keyboard_action_up, 0, 0, mir_input_event_modifier_alt);
+     }
  };
++
++struct KeyRepeatDispatcherOnArale : KeyRepeatDispatcher
++{
++    KeyRepeatDispatcherOnArale() : KeyRepeatDispatcher(true){};
++    MirInputDeviceId mtk_id = 32;
++    void add_mtk_tpd()
++    {
++        StubDevice dev(mtk_id, "mtk-tpd");
++        observer->device_added(mt::fake_shared(dev));
++        observer->changes_complete();
++    }
++
++    mir::EventUPtr mtk_key_down_event()
++    {
++        auto const home_button = 53;
++        return mev::make_event(mtk_id, std::chrono::nanoseconds(0), std::vector<uint8_t>{}, mir_keyboard_action_down, 0,
++                               home_button, mir_input_event_modifier_none);
++    }
++};
+ }
  TEST_F(KeyRepeatDispatcher, forwards_start_stop)
@@ -182,3 +209,31 @@
      simulate_device_removal();
      EXPECT_THAT(alarm_canceled, Eq(true));
+ }
++
++TEST_F(KeyRepeatDispatcherOnArale, no_repeat_alarm_on_mtk_tpd)
++{
++    EXPECT_CALL(*mock_alarm_factory, create_alarm_adapter(_)).Times(0);
++    EXPECT_CALL(*mock_next_dispatcher, dispatch(mt::KeyDownEvent())).Times(1);
++    EXPECT_CALL(*mock_next_dispatcher, dispatch(mt::KeyRepeatEvent())).Times(0);
++
++    add_mtk_tpd();
++    dispatcher.dispatch(*mtk_key_down_event());
++}
++
++TEST_F(KeyRepeatDispatcherOnArale, repeat_for_regular_keys)
++{
++    MockAlarm *mock_alarm = new MockAlarm;
++    std::function<void()> alarm_function;
++
++    EXPECT_CALL(*mock_alarm_factory, create_alarm_adapter(_)).Times(1).
++        WillOnce(DoAll(SaveArg<0>(&alarm_function), Return(mock_alarm)));
++    // Once for initial down and again when invoked
++    EXPECT_CALL(*mock_alarm, reschedule_in(repeat_delay)).Times(1).WillOnce(Return(true));
++    EXPECT_CALL(*mock_alarm, reschedule_in(repeat_time)).Times(1).WillOnce(Return(true));
++    EXPECT_CALL(*mock_next_dispatcher, dispatch(mt::KeyDownEvent())).Times(1);
++    EXPECT_CALL(*mock_next_dispatcher, dispatch(mt::KeyRepeatEvent())).Times(1);
++
++    add_mtk_tpd();
++    dispatcher.dispatch(*a_key_down_event());
++    alarm_function();
++}