Fix InputMapper issue jahnf#144

In case, when two different input sequence of same length and same end
KeyEvent are defined then InputMapper fails to map to correct action.

This commit fixes the issue with InputMapper. The correct action is
decided on the basis of all keys pressed (instead of last key pressed
in earlier version of code).

src/deviceinput.cc

@@ -503,6 +503,7 @@ struct InputMapper::Impl
 
   std::pair<DeviceKeyMap::Result, const RefPair*> m_lastState;
   std::vector<input_event> m_events;
+  KeyEventSequence m_keyEventSeq;
   InputMapConfig m_config;
   bool m_recordingMode = false;
 };
@@ -561,7 +562,8 @@ void InputMapper::Impl::sequenceTimeout()
     // other sequences could have been possible.
     if (m_lastState.second->second)
     {
-      execAction(m_lastState.second->second->action, DeviceKeyMap::Result::PartialHit);
+      auto action = m_parent->getAction(m_keyEventSeq);
+      if (action) execAction(action, DeviceKeyMap::Result::PartialHit);
     }
     else if (m_vdev && m_events.size())
     {
@@ -577,6 +579,7 @@ void InputMapper::Impl::resetState()
 {
   m_keymap.resetState();
   m_events.resize(0);
+  m_keyEventSeq.clear();
 }
 
 // -------------------------------------------------------------------------------------------------
@@ -707,6 +710,7 @@ void InputMapper::addEvents(const input_event* input_events, size_t num)
   }
 
   const auto res = impl->m_keymap.feed(input_events, num-1); // exclude syn event for keymap feed
+  impl->m_keyEventSeq.emplace_back(KeyEvent{input_events, input_events + num - 1});
 
   if (res == DeviceKeyMap::Result::Miss)
   { // key sequence miss, send all buffered events so far + current event
@@ -736,7 +740,8 @@ void InputMapper::addEvents(const input_event* input_events, size_t num)
     if (impl->m_vdev)
     {
       if (impl->m_keymap.state()->second) {
-        impl->execAction(impl->m_keymap.state()->second->action, DeviceKeyMap::Result::Hit);
+        auto action = getAction(impl->m_keyEventSeq);
+        if (action) impl->execAction(action, DeviceKeyMap::Result::Hit);
       }
       else
       {
@@ -757,6 +762,20 @@ void InputMapper::addEvents(const input_event* input_events, size_t num)
   }
 }
 
+// -------------------------------------------------------------------------------------------------
+std::shared_ptr<Action> InputMapper::getAction(KeyEventSequence kes)
+{
+  if (kes.empty()) return nullptr;
+
+  auto conf = configuration();
+  const auto find_it = std::find_if(conf.cbegin(), conf.cend(), [kes](auto c) {
+    return kes == c.first;
+  });
+
+  if (find_it != conf.cend() && find_it->second.action) return find_it->second.action;
+  return nullptr;
+}
+
 // -------------------------------------------------------------------------------------------------
 void InputMapper::resetState()
 {

src/deviceinput.h

@@ -230,6 +230,8 @@ class InputMapper : public QObject
   void setConfiguration(InputMapConfig&& config);
   const InputMapConfig& configuration() const;
 
+  std::shared_ptr<Action> getAction(KeyEventSequence kes);
+
 signals:
   void configurationChanged();
   void recordingModeChanged(bool recording);