From b255ea799eead9668e7fd69a286349ac4a74a73c Mon Sep 17 00:00:00 2001 From: jacqueline Date: Mon, 29 Apr 2024 12:42:16 +1000 Subject: Add lua bindings for override input hooks --- src/input/input_hook.cpp | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/input/input_hook.cpp') diff --git a/src/input/input_hook.cpp b/src/input/input_hook.cpp index 1bb92196..48d6c2a4 100644 --- a/src/input/input_hook.cpp +++ b/src/input/input_hook.cpp @@ -85,23 +85,8 @@ auto TriggerHooks::name() const -> const std::string& { return name_; } -auto TriggerHooks::pushHooks(lua_State* L) -> void { - lua_newtable(L); - - auto add_trigger = [&](Hook& h) { - lua_pushlstring(L, h.name().data(), h.name().size()); - auto cb = h.callback(); - if (cb) { - lua_pushlstring(L, cb->name.data(), cb->name.size()); - } else { - lua_pushnil(L); - } - lua_rawset(L, -3); - }; - - add_trigger(click_); - add_trigger(long_press_); - add_trigger(repeat_); +auto TriggerHooks::hooks() -> std::vector> { + return {click_, long_press_, repeat_}; } } // namespace input -- cgit v1.2.3 From 1736f7874b8f651ae42a21f48b6a15d90f30974a Mon Sep 17 00:00:00 2001 From: jacqueline Date: Mon, 29 Apr 2024 13:53:11 +1000 Subject: Use double-clicks instead of long-presses for wheel shortcuts --- src/input/input_hook.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/input/input_hook.cpp') diff --git a/src/input/input_hook.cpp b/src/input/input_hook.cpp index 48d6c2a4..bf9f3596 100644 --- a/src/input/input_hook.cpp +++ b/src/input/input_hook.cpp @@ -39,10 +39,12 @@ auto Hook::callback() -> std::optional { TriggerHooks::TriggerHooks(std::string name, std::optional click, + std::optional double_click, std::optional long_press, std::optional repeat) : name_(name), click_("click", click), + double_click_("double_click", double_click), long_press_("long_press", long_press), repeat_("repeat", repeat) {} @@ -51,6 +53,9 @@ auto TriggerHooks::update(bool pressed, lv_indev_data_t* d) -> void { case Trigger::State::kClick: click_.invoke(d); break; + case Trigger::State::kDoubleClick: + double_click_.invoke(d); + break; case Trigger::State::kLongPress: long_press_.invoke(d); break; -- cgit v1.2.3 From 1573a8c4cde1cd9528b422b2dcc598e37ffe94a7 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 2 May 2024 19:12:26 +1000 Subject: WIP merge cyclically dependent components into one big component --- src/input/input_hook.cpp | 97 ------------------------------------------------ 1 file changed, 97 deletions(-) delete mode 100644 src/input/input_hook.cpp (limited to 'src/input/input_hook.cpp') diff --git a/src/input/input_hook.cpp b/src/input/input_hook.cpp deleted file mode 100644 index bf9f3596..00000000 --- a/src/input/input_hook.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2024 jacqueline - * - * SPDX-License-Identifier: GPL-3.0-only - */ - -#include "input_hook.hpp" - -#include -#include -#include "hal/lv_hal_indev.h" -#include "input_trigger.hpp" -#include "lua.h" - -namespace input { - -Hook::Hook(std::string name, std::optional cb) - : name_(name), default_(cb), override_() {} - -auto Hook::invoke(lv_indev_data_t* d) -> void { - auto cb = callback(); - if (cb) { - std::invoke(cb->fn, d); - } -} - -auto Hook::override(std::optional cb) -> void { - override_ = cb; -} - -auto Hook::callback() -> std::optional { - if (override_) { - return override_; - } else if (default_) { - return default_; - } - return {}; -} - -TriggerHooks::TriggerHooks(std::string name, - std::optional click, - std::optional double_click, - std::optional long_press, - std::optional repeat) - : name_(name), - click_("click", click), - double_click_("double_click", double_click), - long_press_("long_press", long_press), - repeat_("repeat", repeat) {} - -auto TriggerHooks::update(bool pressed, lv_indev_data_t* d) -> void { - switch (trigger_.update(pressed)) { - case Trigger::State::kClick: - click_.invoke(d); - break; - case Trigger::State::kDoubleClick: - double_click_.invoke(d); - break; - case Trigger::State::kLongPress: - long_press_.invoke(d); - break; - case Trigger::State::kRepeatPress: - repeat_.invoke(d); - break; - case Trigger::State::kNone: - default: - break; - } -} - -auto TriggerHooks::override(Trigger::State s, std::optional cb) - -> void { - switch (s) { - case Trigger::State::kClick: - click_.override(cb); - break; - case Trigger::State::kLongPress: - long_press_.override(cb); - break; - case Trigger::State::kRepeatPress: - repeat_.override(cb); - break; - case Trigger::State::kNone: - default: - break; - } -} - -auto TriggerHooks::name() const -> const std::string& { - return name_; -} - -auto TriggerHooks::hooks() -> std::vector> { - return {click_, long_press_, repeat_}; -} - -} // namespace input -- cgit v1.2.3