callum keymap updates (#3402)

* change window focus shortcuts

* hangul

* macos goodness

* re-arrange tab keys

* remove tab switching keys

* left hand func

* glorious macro pad

* workspace rotation keys

* tabbing hotkeys

keyboards/planck/keymaps/callum/keymap.c

@@ -6,8 +6,8 @@ extern keymap_config_t keymap_config;
 #define G(X) LGUI(X)
 #define A(X) LALT(X)
 #define C(X) LCTL(X)
-#define GC(X) G(C(X))
+#define AC(X) A(C(X))
-#define GAC(X) G(A(C(X)))
+#define SC(X) S(C(X))
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
 
@@ -16,7 +16,7 @@ enum planck_layers {
     _QWERTY,
     _SYMB,
     _MOVE,
-    _FUNC
+    _FUNC,
 };
 
 enum planck_keycodes {
@@ -24,7 +24,7 @@ enum planck_keycodes {
     QWERTY,
     SYMB,
     MOVE,
-  FUNC
+    FUNC,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
      * |Shift|  Z  |  X  |  C  |  V  |  B  |  K  |  M  |  ,  |  .  |  /  |Shift|
      * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |Func |Super| Alt |Ctrl |Symb |Enter|Space|Move |Ctrl | Alt |Super|Func |
+     * |Func |Ctrl | Alt |Super|Symb |Enter|Space|Move |Super| Alt |Ctrl |Func |
      * `-----------------------------------------------------------------------'
      */
     [_COLEMAK] = {
@@ -57,9 +57,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_COMM,      KC_DOT,       KC_SLSH,      KC_RSFT
         },
         {
-    FUNC,         KC_LGUI,      KC_LALT,      KC_LCTL,
+            FUNC,         KC_LCTL,      KC_LALT,      KC_LGUI,
             SYMB,         KC_ENT,       KC_SPC,       MOVE,
-    KC_RCTL,      KC_RALT,      KC_RGUI,      FUNC
+            KC_RGUI,      KC_RALT,      KC_RCTL,      FUNC
         }
     },
 
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
      * |Shift|  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Shift|
      * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |Func |Super| Alt |Ctrl |Symb |Enter|Space|Move |Ctrl | Alt |Super|Func |
+     * |Func |Ctrl | Alt |Super|Symb |Enter|Space|Move |Super| Alt |Ctrl |Func |
      * `-----------------------------------------------------------------------'
      */
     [_QWERTY] = {
@@ -91,9 +91,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_COMM,      KC_DOT,       KC_SLSH,      KC_RSFT
         },
         {
-    FUNC,         KC_LGUI,      KC_LALT,      KC_LCTL,
+            FUNC,         KC_LCTL,      KC_LALT,      KC_LGUI,
             SYMB,         KC_ENT,       KC_SPC,       MOVE,
-    KC_RCTL,      KC_RALT,      KC_RGUI,      FUNC
+            KC_RGUI,      KC_RALT,      KC_RCTL,      FUNC
         }
     },
 
@@ -137,26 +137,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
      * |     |     |     |     |     |     |     |Left |Down |Right|Caps | Del |
      * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
- * |     |     |     |     |     |     |     |PgDn |PgUp |     |     |     |
+     * |     |     |     |     |     |     |     |PgDn |PgUp |TabL |TabR |     |
      * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
      * |     |     |     |     |     |     |     |     |     |     |     |     |
      * `-----------------------------------------------------------------------'
      */
     [_MOVE] = {
         {
-    GC(KC_UP),    GAC(KC_1),    G(KC_6),      G(KC_5),
+            AC(KC_A),     AC(KC_B),     AC(KC_C),     AC(KC_D),
-    G(KC_4),      GAC(KC_UP),   GAC(KC_RGHT), KC_HOME,
+            AC(KC_E),     AC(KC_F),     XXXXXXX,      KC_HOME,
-    KC_UP,        KC_END,       C(KC_SPC),    KC_ESC
+            KC_UP,        KC_END,       XXXXXXX,      KC_ESC
         },
         {
-    GC(KC_DOWN),  GAC(KC_2),    G(KC_3),      G(KC_2),
+            AC(KC_G),     AC(KC_H),     AC(KC_I),     AC(KC_J),
-    G(KC_1),      G(KC_F),      G(KC_C),      KC_LEFT,
+            AC(KC_K),     AC(KC_L),     XXXXXXX,      KC_LEFT,
             KC_DOWN,      KC_RGHT,      KC_CAPS,      KC_DEL
         },
         {
-    _______,      GAC(KC_3),    G(KC_9),      G(KC_8),
+            _______,      AC(KC_M),     AC(KC_N),     AC(KC_O),
-    G(KC_7),      GAC(KC_LEFT), GAC(KC_DOWN), KC_PGDN,
+            AC(KC_P),     AC(KC_Q),     XXXXXXX,      KC_PGDN,
-    KC_PGUP,      GC(KC_LEFT),  GC(KC_RGHT),  _______
+            KC_PGUP,      SC(KC_TAB),   C(KC_TAB),    _______
         },
         {
             _______,      _______,      _______,      _______,
@@ -198,7 +198,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             _______,      _______,      _______,      _______
         }
     }
-
 };
 
 #ifdef AUDIO_ENABLE
@@ -206,26 +205,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 float qwerty_song[][2] = SONG(QWERTY_SOUND);
 #endif
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+void set_colemak(void) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
 #ifdef AUDIO_ENABLE
     stop_all_notes();
     PLAY_SONG(colemak_song);
 #endif
     set_single_persistent_default_layer(_COLEMAK);
 }
-      return false;
+
-      break;
+void set_qwerty(void) {
-    case QWERTY:
-      if (record->event.pressed) {
 #ifdef AUDIO_ENABLE
     stop_all_notes();
     PLAY_SONG(qwerty_song);
 #endif
     set_single_persistent_default_layer(_QWERTY);
 }
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case COLEMAK:
+            if (record->event.pressed) {
+                set_colemak();
+            }
+            return false;
+            break;
+        case QWERTY:
+            if (record->event.pressed) {
+                set_qwerty();
+            }
             return false;
             break;
         case SYMB: