From 9bc82bf61c342ca96e6f942b169b7c88b6bf95cf Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 13 Feb 2013 11:47:19 +0900
Subject: Change action API

---
 common/action.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'common/action.c')

diff --git a/common/action.c b/common/action.c
index 710300eb30..840d70f34c 100644
--- a/common/action.c
+++ b/common/action.c
@@ -26,6 +26,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action.h"
 
 
+/* default layer indicates base layer */
+uint8_t default_layer = 0;
+/* current layer indicates active layer at this time */
+uint8_t current_layer = 0;
+
+
 static void process_action(keyrecord_t *record);
 static bool process_tapping(keyrecord_t *record);
 static void waiting_buffer_scan_tap(void);
@@ -203,12 +209,12 @@ void action_exec(keyevent_t event)
 
 static action_t get_action(key_t key)
 {
-    action_t action = keymap_get_action(current_layer, key.pos.row, key.pos.col);
+    action_t action = action_for_key(current_layer, key);
 
     /* Transparently use default layer */
     if (action.code == ACTION_TRANSPARENT) {
         // TODO: layer stacking
-        action = keymap_get_action(default_layer, key.pos.row, key.pos.col);
+        action = action_for_key(default_layer, key);
         debug("TRNASPARENT: "); debug_hex16(action.code); debug("\n");
     }
     return action;
@@ -509,12 +515,12 @@ static void process_action(keyrecord_t *record)
 
         /* Extentions */
         case ACT_MACRO:
+            // TODO
             break;
         case ACT_COMMAND:
             break;
         case ACT_FUNCTION:
-            // TODO
-            keymap_call_function(record, action.func.id, action.func.opt);
+            action_function(record, action.func.id, action.func.opt);
             break;
         default:
             break;
-- 
cgit v1.2.3


From c4421f585b085d3eef5e468ff1defcbc3b4ec8d3 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 13 Feb 2013 12:16:24 +0900
Subject: Change struct key_t

---
 common/action.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/action.c')

diff --git a/common/action.c b/common/action.c
index 840d70f34c..6528cd46c8 100644
--- a/common/action.c
+++ b/common/action.c
@@ -859,7 +859,7 @@ bool is_tap_key(key_t key)
  */
 static void debug_event(keyevent_t event)
 {
-    debug_hex16(event.key.raw);
+    debug_hex16((event.key.row<<8) | event.key.col);
     if (event.pressed) debug("d("); else debug("u(");
     debug_dec(event.time); debug(")");
 }
-- 
cgit v1.2.3