summaryrefslogtreecommitdiff
path: root/src/input/include
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2024-04-29 12:42:16 +1000
committerjacqueline <me@jacqueline.id.au>2024-04-29 12:42:16 +1000
commitb255ea799eead9668e7fd69a286349ac4a74a73c (patch)
tree747e8038de0ff048ab253ac1d6f481df601e8449 /src/input/include
parent920345b940bb3993c389d9e9be1a75a8041d431d (diff)
downloadtangara-fw-b255ea799eead9668e7fd69a286349ac4a74a73c.tar.gz
Add lua bindings for override input hooks
Diffstat (limited to 'src/input/include')
-rw-r--r--src/input/include/input_device.hpp4
-rw-r--r--src/input/include/input_hook.hpp10
-rw-r--r--src/input/include/input_nav_buttons.hpp2
-rw-r--r--src/input/include/input_touch_dpad.hpp2
-rw-r--r--src/input/include/input_touch_wheel.hpp2
-rw-r--r--src/input/include/input_volume_buttons.hpp2
-rw-r--r--src/input/include/lvgl_input_driver.hpp52
7 files changed, 68 insertions, 6 deletions
diff --git a/src/input/include/input_device.hpp b/src/input/include/input_device.hpp
index 59456351..d944c3bf 100644
--- a/src/input/include/input_device.hpp
+++ b/src/input/include/input_device.hpp
@@ -29,7 +29,9 @@ class IInputDevice {
virtual auto read(lv_indev_data_t* data) -> void = 0;
virtual auto name() -> std::string = 0;
- virtual auto hooks() -> std::vector<TriggerHooks> { return {}; }
+ virtual auto triggers() -> std::vector<std::reference_wrapper<TriggerHooks>> {
+ return {};
+ }
};
} // namespace input
diff --git a/src/input/include/input_hook.hpp b/src/input/include/input_hook.hpp
index 81eb80d9..a257c04a 100644
--- a/src/input/include/input_hook.hpp
+++ b/src/input/include/input_hook.hpp
@@ -32,6 +32,10 @@ class Hook {
auto name() const -> const std::string& { return name_; }
auto callback() -> std::optional<HookCallback>;
+ // Not copyable or movable.
+ Hook(const Hook&) = delete;
+ Hook& operator=(const Hook&) = delete;
+
private:
std::string name_;
std::optional<HookCallback> default_;
@@ -51,7 +55,11 @@ class TriggerHooks {
auto override(Trigger::State, std::optional<HookCallback>) -> void;
auto name() const -> const std::string&;
- auto pushHooks(lua_State*) -> void;
+ auto hooks() -> std::vector<std::reference_wrapper<Hook>>;
+
+ // Not copyable or movable.
+ TriggerHooks(const TriggerHooks&) = delete;
+ TriggerHooks& operator=(const TriggerHooks&) = delete;
private:
std::string name_;
diff --git a/src/input/include/input_nav_buttons.hpp b/src/input/include/input_nav_buttons.hpp
index 4e4952c9..9feeb375 100644
--- a/src/input/include/input_nav_buttons.hpp
+++ b/src/input/include/input_nav_buttons.hpp
@@ -26,7 +26,7 @@ class NavButtons : public IInputDevice {
auto read(lv_indev_data_t* data) -> void override;
auto name() -> std::string override;
- auto hooks() -> std::vector<TriggerHooks> override;
+ auto triggers() -> std::vector<std::reference_wrapper<TriggerHooks>> override;
private:
drivers::IGpios& gpios_;
diff --git a/src/input/include/input_touch_dpad.hpp b/src/input/include/input_touch_dpad.hpp
index 691e3243..0c45b2d9 100644
--- a/src/input/include/input_touch_dpad.hpp
+++ b/src/input/include/input_touch_dpad.hpp
@@ -25,7 +25,7 @@ class TouchDPad : public IInputDevice {
auto read(lv_indev_data_t* data) -> void override;
auto name() -> std::string override;
- auto hooks() -> std::vector<TriggerHooks> override;
+ auto triggers() -> std::vector<std::reference_wrapper<TriggerHooks>> override;
private:
drivers::TouchWheel& wheel_;
diff --git a/src/input/include/input_touch_wheel.hpp b/src/input/include/input_touch_wheel.hpp
index 1f116da9..764cc68d 100644
--- a/src/input/include/input_touch_wheel.hpp
+++ b/src/input/include/input_touch_wheel.hpp
@@ -28,7 +28,7 @@ class TouchWheel : public IInputDevice {
auto read(lv_indev_data_t* data) -> void override;
auto name() -> std::string override;
- auto hooks() -> std::vector<TriggerHooks> override;
+ auto triggers() -> std::vector<std::reference_wrapper<TriggerHooks>> override;
auto sensitivity() -> lua::Property&;
diff --git a/src/input/include/input_volume_buttons.hpp b/src/input/include/input_volume_buttons.hpp
index a684aa48..e3246df4 100644
--- a/src/input/include/input_volume_buttons.hpp
+++ b/src/input/include/input_volume_buttons.hpp
@@ -25,7 +25,7 @@ class VolumeButtons : public IInputDevice {
auto read(lv_indev_data_t* data) -> void override;
auto name() -> std::string override;
- auto hooks() -> std::vector<TriggerHooks> override;
+ auto triggers() -> std::vector<std::reference_wrapper<TriggerHooks>> override;
private:
drivers::IGpios& gpios_;
diff --git a/src/input/include/lvgl_input_driver.hpp b/src/input/include/lvgl_input_driver.hpp
index 9f43d27f..9adaf143 100644
--- a/src/input/include/lvgl_input_driver.hpp
+++ b/src/input/include/lvgl_input_driver.hpp
@@ -18,6 +18,8 @@
#include "hal/lv_hal_indev.h"
#include "input_device.hpp"
+#include "input_hook.hpp"
+#include "lua_thread.hpp"
#include "nvs.hpp"
#include "property.hpp"
#include "touchwheel.hpp"
@@ -54,6 +56,56 @@ class LvglInputDriver {
std::vector<std::shared_ptr<IInputDevice>> inputs_;
std::vector<std::shared_ptr<IFeedbackDevice>> feedbacks_;
+ /*
+ * Key for identifying which device, trigger, and specific hook are being
+ * overriden by Lua.
+ */
+ struct OverrideSelector {
+ std::string device_name;
+ std::string trigger_name;
+ std::string hook_name;
+
+ friend bool operator<(const OverrideSelector& l,
+ const OverrideSelector& r) {
+ return std::tie(l.device_name, l.trigger_name, l.hook_name) <
+ std::tie(r.device_name, r.trigger_name, r.hook_name);
+ }
+ };
+
+ /* Userdata object for tracking the Lua mirror of a TriggerHooks object. */
+ class LuaTrigger {
+ public:
+ LuaTrigger(LvglInputDriver&, IInputDevice&, TriggerHooks&);
+
+ static auto get(lua_State*, int idx) -> LuaTrigger&;
+ static auto luaGc(lua_State*) -> int;
+ static auto luaToString(lua_State*) -> int;
+ static auto luaNewIndex(lua_State*) -> int;
+
+ static constexpr struct luaL_Reg kFuncs[] = {{"__gc", luaGc},
+ {"__tostring", luaToString},
+ {"__newindex", luaNewIndex},
+ {NULL, NULL}};
+
+ private:
+ LvglInputDriver* driver_;
+
+ std::string device_;
+ std::string trigger_;
+ std::map<std::string, std::string> hooks_;
+ };
+
+ /* A hook override implemented as a lua callback */
+ struct LuaOverride {
+ lua_State* L;
+ int ref;
+ };
+
+ std::map<OverrideSelector, LuaOverride> overrides_;
+
+ auto setOverride(lua_State* L, const OverrideSelector&) -> void;
+ auto applyOverride(const OverrideSelector&, LuaOverride&) -> void;
+
bool is_locked_;
};