From 0c6a8235fb7726b8ccec0b0f1f29ecd2c39d6ace Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Fri, 7 Oct 2022 14:38:36 +0100
Subject: use ModLayer keys instead of custom macro

---
 keymaps.h |  2 +-
 macros.h  | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/keymaps.h b/keymaps.h
index 02015a9..153f580 100644
--- a/keymaps.h
+++ b/keymaps.h
@@ -9,7 +9,7 @@ ColorKeymaps(
    CK(Key_PageUp,Base),   CK(Key_A,Base),         CK(Key_O,Base),     CK(Key_E,Base),      CK(Key_U,Base), CK(Key_I,Base),
    CK(Key_PageDown,Base), CK(Key_Semicolon,Base), CK(Key_Q,Base),     CK(Key_J,Base),      CK(Key_K,Base), CK(Key_X,Base), CK(Key_Escape,Base),
    CK(Key_LeftControl,Base), CK(Key_Backspace,Base), CK(Key_LeftGui,Base), CK(Key_LeftShift,Base),
-   CK(M(MACRO_FVWM),Base),
+   CK(ML(LeftAlt,FVWM),Base),
 
    CK(M(MACRO_ANY),Base),   CK(Key_6,Base), CK(Key_7,Base), CK(Key_8,Base), CK(Key_9,Base), CK(Key_0,Base), CK(___,Base),
    CK(Key_Enter,Base),      CK(Key_F,Base), CK(Key_G,Base), CK(Key_C,Base), CK(Key_R,Base), CK(Key_L,Base), CK(Key_Slash,Base),
diff --git a/macros.h b/macros.h
index 284a9f3..902b6a7 100644
--- a/macros.h
+++ b/macros.h
@@ -6,7 +6,6 @@
 
 enum { MACRO_VERSION_INFO,
        MACRO_ANY,
-       MACRO_FVWM,
      };
 
 #ifndef BUILD_INFORMATION
@@ -27,16 +26,6 @@ static void anyKeyMacro(KeyEvent &event) {
   }
 }
 
-static const macro_t *fvwmMacro(KeyEvent &event) {
-  if (keyToggledOn(event.state)) {
-    return MACRO(D(LeftAlt),Dr(ShiftToLayer(FVWM)));
-  }
-  else if (keyToggledOff(event.state)) {
-    return MACRO(Ur(ShiftToLayer(FVWM)),U(LeftAlt));
-  }
-  return MACRO_NONE;
-}
-
 const macro_t *macroAction(uint8_t macroIndex, KeyEvent &event) {
   switch (macroIndex) {
 
@@ -48,9 +37,6 @@ const macro_t *macroAction(uint8_t macroIndex, KeyEvent &event) {
     anyKeyMacro(event);
     break;
 
-  case MACRO_FVWM:
-    return fvwmMacro(event);
-    break;
   }
   return MACRO_NONE;
 }
-- 
cgit v1.2.3