From b255ea799eead9668e7fd69a286349ac4a74a73c Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 29 Apr 2024 12:42:16 +1000
Subject: Add lua bindings for override input hooks

---
 src/input/include/input_hook.hpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/input/include/input_hook.hpp')

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_;
-- 
cgit v1.2.3


From 1736f7874b8f651ae42a21f48b6a15d90f30974a Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 29 Apr 2024 13:53:11 +1000
Subject: Use double-clicks instead of long-presses for wheel shortcuts

---
 src/input/include/input_hook.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/input/include/input_hook.hpp')

diff --git a/src/input/include/input_hook.hpp b/src/input/include/input_hook.hpp
index a257c04a..a8705210 100644
--- a/src/input/include/input_hook.hpp
+++ b/src/input/include/input_hook.hpp
@@ -45,9 +45,10 @@ class Hook {
 class TriggerHooks {
  public:
   TriggerHooks(std::string name, std::optional<HookCallback> cb)
-      : TriggerHooks(name, cb, cb, cb) {}
+      : TriggerHooks(name, cb, cb, cb, cb) {}
   TriggerHooks(std::string name,
                std::optional<HookCallback> click,
+               std::optional<HookCallback> double_click,
                std::optional<HookCallback> long_press,
                std::optional<HookCallback> repeat);
 
@@ -66,6 +67,7 @@ class TriggerHooks {
   Trigger trigger_;
 
   Hook click_;
+  Hook double_click_;
   Hook long_press_;
   Hook repeat_;
 };
-- 
cgit v1.2.3


From 1573a8c4cde1cd9528b422b2dcc598e37ffe94a7 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 2 May 2024 19:12:26 +1000
Subject: WIP merge cyclically dependent components into one big component

---
 src/input/include/input_hook.hpp | 75 ----------------------------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 src/input/include/input_hook.hpp

(limited to 'src/input/include/input_hook.hpp')

diff --git a/src/input/include/input_hook.hpp b/src/input/include/input_hook.hpp
deleted file mode 100644
index a8705210..00000000
--- a/src/input/include/input_hook.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2024 jacqueline <me@jacqueline.id.au>
- *
- * SPDX-License-Identifier: GPL-3.0-only
- */
-
-#pragma once
-
-#include <functional>
-#include <optional>
-#include <string>
-
-#include "hal/lv_hal_indev.h"
-#include "lua.hpp"
-
-#include "input_trigger.hpp"
-
-namespace input {
-
-struct HookCallback {
-  std::string name;
-  std::function<void(lv_indev_data_t*)> fn;
-};
-
-class Hook {
- public:
-  Hook(std::string name, std::optional<HookCallback> cb);
-
-  auto invoke(lv_indev_data_t*) -> void;
-  auto override(std::optional<HookCallback>) -> void;
-
-  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_;
-  std::optional<HookCallback> override_;
-};
-
-class TriggerHooks {
- public:
-  TriggerHooks(std::string name, std::optional<HookCallback> cb)
-      : TriggerHooks(name, cb, cb, cb, cb) {}
-  TriggerHooks(std::string name,
-               std::optional<HookCallback> click,
-               std::optional<HookCallback> double_click,
-               std::optional<HookCallback> long_press,
-               std::optional<HookCallback> repeat);
-
-  auto update(bool, lv_indev_data_t*) -> void;
-  auto override(Trigger::State, std::optional<HookCallback>) -> void;
-
-  auto name() const -> const std::string&;
-  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_;
-  Trigger trigger_;
-
-  Hook click_;
-  Hook double_click_;
-  Hook long_press_;
-  Hook repeat_;
-};
-
-}  // namespace input
-- 
cgit v1.2.3