From ce4d9ca83967217c0fbeae10292836c63ae6a55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Sun, 26 Feb 2017 00:26:33 +0100
Subject: [PATCH] Rewrite layer switcher handling.

---
 right/src/action.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/right/src/action.c b/right/src/action.c
index 09b09df..d13c55e 100644
--- a/right/src/action.c
+++ b/right/src/action.c
@@ -73,18 +73,6 @@ static bool handleKey(key_action_t key, int scancodeIdx, usb_keyboard_report_t *
             return pressKey(key, scancodeIdx, report);
         }
         break;
-    case KEY_ACTION_SWITCH_LAYER:
-        if (hasKeyPressed(prevKeyStates, currKeyStates, keyId)) {
-            ActiveLayer = key.switchLayer.layer;
-        }
-        if (hasKeyReleased(prevKeyStates, currKeyStates, keyId)) {
-            ActiveLayer = LAYER_ID_BASE;
-        }
-        //LedDisplay_SetLayerLed(ActiveLayer);
-        return false;
-        break;
-    default:
-        break;
     }
     return false;
 }
@@ -158,6 +146,18 @@ void HandleMouseKey(usb_mouse_report_t *report, key_action_t key, const uint8_t
 void HandleKeyboardEvents(usb_keyboard_report_t *keyboardReport, usb_mouse_report_t *mouseReport) {
     int scancodeIdx = 0;
 
+    ActiveLayer = LAYER_ID_BASE;
+    for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
+        for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {
+            if (CurrentKeyStates[slotId][keyId]) {
+                key_action_t action =  CurrentKeymap[LAYER_ID_BASE][slotId][keyId];
+                if (action.type == KEY_ACTION_SWITCH_LAYER) {
+                    ActiveLayer = action.switchLayer.layer;
+                }
+            }
+        }
+    }
+
     for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
         clearKeymask(CurrentKeyStates[slotId]);
         for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {