Merge branch 'color-picker'

1 files changed, 21 insertions, 21 deletions

diff --git a/keymaps.h b/keymaps.h
index 0887b8d..4932ab1 100644
--- a/keymaps.h
+++ b/keymaps.h
@@ -54,38 +54,38 @@ ColorKeymaps(
 
    CK(M(MACRO_VERSION_INFO),Base), CK(XXX,Off), CK(Key_Keypad7,Num), CK(Key_Keypad8,Num),   CK(Key_Keypad9,Num),        CK(Key_KeypadSubtract,Num), CK(___,NumBreathe),
    CK(XXX,Off),                    CK(XXX,Off), CK(Key_Keypad4,Num), CK(Key_Keypad5,Num),   CK(Key_Keypad6,Num),        CK(Key_KeypadAdd,Num),      CK(XXX,Off),
-                                   CK(XXX,Off), CK(Key_Keypad1,Num), CK(Key_Keypad2,Num),   CK(Key_Keypad3,Num),        CK(Key_Equals,Num),         CK(XXX,Off),
-   CK(XXX,Off),                    CK(XXX,Off), CK(Key_Keypad0,Num), CK(Key_KeypadDot,Num), CK(Key_KeypadMultiply,Num), CK(Key_KeypadDivide,Num),   CK(Key_Enter,Num),
+                                   CK(XXX,Off), CK(Key_Keypad1,Num), CK(Key_Keypad2,Num),   CK(Key_Keypad3,Num),        CK(Key_KeypadEquals,Num),   CK(XXX,Off),
+   CK(XXX,Off),                    CK(XXX,Off), CK(Key_Keypad0,Num), CK(Key_KeypadDot,Num), CK(Key_KeypadMultiply,Num), CK(Key_KeypadDivide,Num),   CK(Key_KeypadEnter,Num),
    CK(___,Off), CK(___,Off), CK(___,Off), CK(___,Off),
    CK(___,Off)),
 
   [FUNCTION] =  KEYMAP_STACKED
-  (CK(XXX,Off),       CK(Key_F1,Func),          CK(Key_F2,Func),     CK(Key_F3,Func),   CK(Key_F4,Func),       CK(Key_F5,Func),          CK(Key_CapsLock,Func),
-   CK(Key_Tab,Func),  CK(XXX,Off),              CK(Key_mouseUp,Ms),  CK(XXX,Off),       CK(Key_mouseBtnR,MsB), CK(Key_mouseWarpEnd,MsW), CK(Key_mouseWarpNE,MsW),
-   CK(Key_Home,Func), CK(Key_mouseL,Ms),        CK(Key_mouseDn,Ms),  CK(Key_mouseR,Ms), CK(Key_mouseBtnL,MsB), CK(Key_mouseWarpNW,MsW),
-   CK(Key_End,Func),  CK(Key_PrintScreen,Func), CK(Key_Insert,Func), CK(XXX,Off),       CK(Key_mouseBtnM,MsB), CK(Key_mouseWarpSW,MsW),  CK(Key_mouseWarpSE,MsW),
-   CK(___,Off), CK(Key_Delete,Func), CK(___,Off), CK(___,Off),
+  (CK(XXX,Off),        CK(Key_F1,Func),           CK(Key_F2,Func),      CK(Key_F3,Func),   CK(Key_F4,Func),       CK(Key_F5,Func),          CK(___,Off),
+   CK(Key_Tab,Func2),  CK(XXX,Off),               CK(Key_mouseUp,Ms),   CK(XXX,Off),       CK(Key_mouseBtnR,MsB), CK(Key_mouseWarpEnd,MsW), CK(Key_mouseWarpNE,MsW),
+   CK(Key_Home,Func2), CK(Key_mouseL,Ms),         CK(Key_mouseDn,Ms),   CK(Key_mouseR,Ms), CK(Key_mouseBtnL,MsB), CK(Key_mouseWarpNW,MsW),
+   CK(Key_End,Func2),  CK(Key_PrintScreen,Func2), CK(Key_Insert,Func2), CK(XXX,Off),       CK(Key_mouseBtnM,MsB), CK(Key_mouseWarpSW,MsW),  CK(Key_mouseWarpSE,MsW),
+   CK(___,Off), CK(Key_Delete,Func2), CK(___,Off), CK(___,Off),
    CK(___,Off),
 
-   CK(XXX,Off),                CK(Key_F6,Func),        CK(Key_F7,Func),               CK(Key_F8,Func),                CK(Key_F9,Func),          CK(Key_F10,Func),          CK(Key_F11,Func),
-   CK(XXX,Off),                CK(XXX,Off),            CK(Key_LeftCurlyBracket,Func), CK(Key_RightCurlyBracket,Func), CK(Key_LeftBracket,Func), CK(Key_RightBracket,Func), CK(Key_F12,Func),
-                               CK(Key_LeftArrow,Func), CK(Key_DownArrow,Func),        CK(Key_UpArrow,Func),           CK(Key_RightArrow,Func),  CK(XXX,Off),               CK(XXX,Off),
-   CK(Key_PcApplication,Func), CK(XXX,Off),            CK(XXX,Off),                   CK(XXX,Off),                    CK(XXX,Off),              CK(Key_Backslash,Func),    CK(Key_Pipe,Func),
-   CK(___,Off), CK(___,Off), CK(Key_Enter,Func), CK(___,Off),
+   CK(XXX,Off),                 CK(Key_F6,Func),         CK(Key_F7,Func),                CK(Key_F8,Func),                 CK(Key_F9,Func),           CK(Key_F10,Func),           CK(Key_F11,Func),
+   CK(XXX,Off),                 CK(XXX,Off),             CK(Key_LeftCurlyBracket,Base2), CK(Key_RightCurlyBracket,Base2), CK(Key_LeftBracket,Base2), CK(Key_RightBracket,Base2), CK(Key_F12,Func),
+                                CK(Key_LeftArrow,Base2), CK(Key_DownArrow,Base2),        CK(Key_UpArrow,Base2),           CK(Key_RightArrow,Base2),  CK(XXX,Off),                CK(XXX,Off),
+   CK(Key_PcApplication,Func2), CK(XXX,Off),             CK(XXX,Off),                    CK(XXX,Off),                     CK(XXX,Off),               CK(Key_Backslash,Base2),    CK(Key_Pipe,Base2),
+   CK(___,Off), CK(___,Off), CK(Key_Enter,Func2), CK(___,Off),
    CK(___,Off)),
 
   [FVWM] =  KEYMAP_STACKED
-  (CK(XXX,Off), CK(Key_BacklightDown,Lnch),  CK(Key_BacklightUp,Lnch),   CK(LALT(Key_F1),Lnch),      CK(LALT(Key_F2),Lnch),      CK(XXX,Off),                CK(___,Off),
-   CK(XXX,Off), CK(XXX,Off),                 CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),
-   CK(XXX,Off), CK(XXX,Off),                 CK(LALT(Key_Keypad4),Wind), CK(LALT(Key_Keypad2),Wind), CK(LALT(Key_Keypad8),Wind), CK(LALT(Key_Keypad6),Wind),
-   CK(XXX,Off), CK(XXX,Off),                 CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),                CK(LALT(Key_KeypadMultiply),Wind),
-   CK(___,Off), CK(LALT(Key_Backtick),Lnch), CK(LSHIFT(LALT(Key_Backtick)),Lnch), CK(___,Off),
+  (CK(XXX,Off),          CK(Key_BacklightDown,Screen), CK(Key_BacklightUp,Screen), CK(LALT(Key_F1),Lnch),      CK(LALT(Key_F2),Lnch),      CK(XXX,Off),                CK(___,Off),
+   CK(XXX,Off),          CK(XXX,Off),                  CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),
+   CK(XXX,Off),          CK(XXX,Off),                  CK(LALT(Key_Keypad4),Wind), CK(LALT(Key_Keypad2),Wind), CK(LALT(Key_Keypad8),Wind), CK(LALT(Key_Keypad6),Wind),
+   CK(LALT(Key_W),Wind), CK(XXX,Off),                  CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),                CK(XXX,Off),                CK(LALT(Key_KeypadMultiply),Wind),
+   CK(___,Off),          CK(LALT(Key_Backtick),Lnch),  CK(LSHIFT(LALT(Key_Backtick)),Lnch), CK(___,Off),
    CK(___,Off),
 
-   CK(XXX,Off),              CK(Consumer_Mute,Lnch),       CK(Consumer_VolumeDecrement,Lnch), CK(Consumer_VolumeIncrement,Lnch), CK(XXX,Off),                   CK(Consumer_Eject,Lnch), CK(___,Off),
-   CK(XXX,Off),              CK(XXX,Off),                  CK(XXX,Off),                       CK(XXX,Off),                       CK(XXX,Off),                   CK(XXX,Off),             CK(LSHIFT(LALT(Key_KeypadDivide)),Wind),
-                             CK(LALT(Key_LeftArrow),View), CK(LALT(Key_DownArrow),View),      CK(LALT(Key_UpArrow),View),        CK(LALT(Key_RightArrow),View), CK(XXX,Off),             CK(LSHIFT(LALT(Key_KeypadEnter)),Wind),
-   CK(LALT(Key_Pause),Lnch), CK(XXX,Off),                  CK(XXX,Off),                       CK(XXX,Off),                       CK(XXX,Off),                   CK(LALT(Key_M),Wind),    CK(LSHIFT(LALT(Key_KeypadDot)),Wind),
+   CK(XXX,Off),              CK(Consumer_Mute,Media),      CK(Consumer_VolumeDecrement,Media), CK(Consumer_VolumeIncrement,Media), CK(XXX,Off),                   CK(Consumer_Eject,Media), CK(___,Off),
+   CK(XXX,Off),              CK(XXX,Off),                  CK(XXX,Off),                        CK(XXX,Off),                        CK(XXX,Off),                   CK(XXX,Off),              CK(LSHIFT(LALT(Key_KeypadDivide)),Wind),
+                             CK(LALT(Key_LeftArrow),View), CK(LALT(Key_DownArrow),View),       CK(LALT(Key_UpArrow),View),         CK(LALT(Key_RightArrow),View), CK(XXX,Off),              CK(LSHIFT(LALT(Key_KeypadEnter)),Wind),
+   CK(LALT(Key_Pause),Lnch), CK(XXX,Off),                  CK(XXX,Off),                        CK(XXX,Off),                        CK(XXX,Off),                   CK(LALT(Key_M),Wind),     CK(LSHIFT(LALT(Key_KeypadDot)),Wind),
    CK(___,Off), CK(___,Off), CK(___,Off), CK(___,Off),
    CK(___,Off))
 );