From 754350cc341c94ab7ebcdcc80ecad5bfdf1c68aa Mon Sep 17 00:00:00 2001
From: Thomas Baart <mail@thomasbaart.nl>
Date: Tue, 18 Dec 2018 16:08:36 +0100
Subject: [PATCH] Added callbacks to one shot modifier changes

---
 tmk_core/common/action_util.c | 72 ++++++++++++++++++++++++++++++++++-
 tmk_core/common/action_util.h |  9 +++++
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c
index afd4ae8b25..7f948b3a58 100644
--- a/tmk_core/common/action_util.c
+++ b/tmk_core/common/action_util.c
@@ -47,12 +47,72 @@ extern inline void add_key(uint8_t key);
 extern inline void del_key(uint8_t key);
 extern inline void clear_keys(void);
 
+/** \brief Callback which is called when the one shot modifiers have been locked.
+ */
+__attribute__((weak))
+void oneshot_locked_mods_set_user(uint8_t mods) { }
+
+/** \brief Callback which is called when the locked one shot modifiers have been locked.
+ */
+__attribute__((weak))
+void oneshot_locked_mods_set_kb(uint8_t mods) {
+    oneshot_locked_mods_set_user(mods);
+}
+
+/** \brief Callback which is called when the one shot modifiers have been locked.
+ */
+__attribute__((weak))
+void oneshot_locked_mods_cleared_user() { }
+
+/** \brief Callback which is called when the locked one shot modifiers have been locked.
+ */
+__attribute__((weak))
+void oneshot_locked_mods_cleared_kb() {
+    oneshot_locked_mods_cleared_user();
+}
+
+/** \brief Callback which is called when the one shot modifiers have been set.
+ */
+__attribute__((weak))
+void oneshot_mods_set_user(uint8_t mods) { }
+
+/** \brief Callback which is called when the one shot modifiers have been cleared.
+ */
+__attribute__((weak))
+void oneshot_mods_cleared_user() { }
+
+/** \brief Callback which is called when the one shot modifiers have been set.
+ */
+__attribute__((weak))
+void oneshot_mods_set_kb(uint8_t mods) {
+    oneshot_mods_set_user(mods);
+}
+
+/** \brief Callback which is called when the one shot modifiers have been cleared.
+ */
+__attribute__((weak))
+void oneshot_mods_cleared_kb() {
+    oneshot_mods_cleared_user();
+}
+
 #ifndef NO_ACTION_ONESHOT
 static int8_t oneshot_mods = 0;
 static int8_t oneshot_locked_mods = 0;
 int8_t get_oneshot_locked_mods(void) { return oneshot_locked_mods; }
-void set_oneshot_locked_mods(int8_t mods) { oneshot_locked_mods = mods; }
-void clear_oneshot_locked_mods(void) { oneshot_locked_mods = 0; }
+void set_oneshot_locked_mods(int8_t mods) {
+    uint8_t original_oneshot_locked_mods = oneshot_locked_mods;
+    oneshot_locked_mods = mods;
+    if (original_oneshot_locked_mods != oneshot_locked_mods) {
+        oneshot_locked_mods_set_kb(oneshot_locked_mods);
+    }
+}
+void clear_oneshot_locked_mods(void) {
+    uint8_t original_oneshot_locked_mods = oneshot_locked_mods;
+    oneshot_locked_mods = 0;
+    if (original_oneshot_locked_mods != oneshot_locked_mods) {
+        oneshot_locked_mods_cleared_kb();
+    }
+}
 #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
 static int16_t oneshot_time = 0;
 bool has_oneshot_mods_timed_out(void) {
@@ -245,10 +305,14 @@ void clear_macro_mods(void) { macro_mods = 0; }
  */
 void set_oneshot_mods(uint8_t mods)
 {
+    uint8_t original_oneshot_mods = oneshot_mods;
     oneshot_mods = mods;
 #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
     oneshot_time = timer_read();
 #endif
+    if (original_oneshot_mods != oneshot_mods) {
+        oneshot_mods_set_kb(oneshot_mods);
+    }
 }
 /** \brief clear oneshot mods
  *
@@ -256,10 +320,14 @@ void set_oneshot_mods(uint8_t mods)
  */
 void clear_oneshot_mods(void)
 {
+    uint8_t original_oneshot_mods = oneshot_mods;
     oneshot_mods = 0;
 #if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
     oneshot_time = 0;
 #endif
+    if (original_oneshot_mods != oneshot_mods) {
+        oneshot_mods_cleared_kb();
+    }
 }
 /** \brief get oneshot mods
  *
diff --git a/tmk_core/common/action_util.h b/tmk_core/common/action_util.h
index 3458931514..2ac99ff748 100644
--- a/tmk_core/common/action_util.h
+++ b/tmk_core/common/action_util.h
@@ -28,6 +28,15 @@ extern report_keyboard_t *keyboard_report;
 
 void send_keyboard_report(void);
 
+void oneshot_locked_mods_set_user(uint8_t mods);
+void oneshot_locked_mods_set_kb(uint8_t mods);
+void oneshot_locked_mods_cleared_user();
+void oneshot_locked_mods_cleared_kb();
+void oneshot_mods_set_user(uint8_t mods);
+void oneshot_mods_set_kb(uint8_t mods);
+void oneshot_mods_cleared_user();
+void oneshot_mods_cleared_kb();
+
 /* key */
 inline void add_key(uint8_t key) {
   add_key_to_report(keyboard_report, key);