Keymap update (#2045)

* linux shake-around

* move terminal and browser spawning keys

* add a shift to window resizing keys to free combo up for window management

* "jump to tab" shortcuts for firefox

* change window resize modifiers

* change wm keys

* change wm keys again, and reformat keymap to 80chars

* typos

* language key

* qwerty layer for SO, general cleanup

1 files changed, 198 insertions, 100 deletions

diff --git a/keyboards/planck/keymaps/callum/keymap.c b/keyboards/planck/keymaps/callum/keymap.c
index 98417a1c8c..4758ffacfc 100644
--- a/keyboards/planck/keymaps/callum/keymap.c
+++ b/keyboards/planck/keymaps/callum/keymap.c
@@ -1,148 +1,246 @@
 #include "planck.h"
 #include "action_layer.h"
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-#include "eeconfig.h"
 
 extern keymap_config_t keymap_config;
 
-#define _BASE 0
-#define _MOVE 1
-#define _SYMB 2
-#define _MORE 3
-#define _FUNC 4
-#define ENDASH LALT(KC_MINS)
-#define POUND LALT(KC_3)
-#define LDQUOT LALT(KC_LBRC)
-#define RDQUOT LALT(S(KC_LBRC))
-#define LSQUOT LALT(KC_RBRC)
-#define RSQUOT LALT(S(KC_RBRC))
-#define H(X) LALT(LCTL(X))
+#define G(X) LGUI(X)
+#define A(X) LALT(X)
+#define C(X) LCTL(X)
+#define GC(X) G(C(X))
+#define GAC(X) G(A(C(X)))
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
+
+enum planck_layers {
+    _COLEMAK,
+    _QWERTY,
+    _SYMB,
+    _MOVE,
+    _FUNC
+};
 
 enum planck_keycodes {
-  MOVE = SAFE_RANGE,
+  COLEMAK = SAFE_RANGE,
+  QWERTY,
   SYMB,
+  MOVE,
   FUNC
 };
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* BASE
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |   -  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Bksp |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |   '  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  | Shift|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Func | Ctrl |  Alt |  Cmd | Symb | Enter| Space| Move |  Cmd |  Alt | Ctrl | Func |
- * `-----------------------------------------------------------------------------------'
+/* COLEMAK
+ * ,-----------------------------------------------------------------------.
+ * |Tab  |  Q  |  W  |  F  |  P  |  G  |  J  |  L  |  U  |  Y  |  ;  |  -  |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Bksp |  A  |  R  |  S  |  T  |  D  |  H  |  N  |  E  |  I  |  O  |  '  |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Shift|  Z  |  X  |  C  |  V  |  B  |  K  |  M  |  ,  |  .  |  /  |Shift|
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Func |Super| Alt |Ctrl |Symb |Enter|Space|Move |Ctrl | Alt |Super|Func |
+ * `-----------------------------------------------------------------------'
  */
-[_BASE] = {
-  {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_MINS},
-  {KC_BSPC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT},
-  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT},
-  {FUNC,    KC_LCTL, KC_LALT, KC_LGUI, SYMB,    KC_ENT,  KC_SPC,  MOVE,    KC_RGUI, KC_RALT, KC_RCTL, FUNC   }
+[_COLEMAK] = {
+  {
+    KC_TAB,       KC_Q,         KC_W,         KC_F,
+    KC_P,         KC_G,         KC_J,         KC_L,
+    KC_U,         KC_Y,         KC_SCLN,      KC_MINS
+  },
+  {
+    KC_BSPC,      KC_A,         KC_R,         KC_S,
+    KC_T,         KC_D,         KC_H,         KC_N,
+    KC_E,         KC_I,         KC_O,         KC_QUOT
+  },
+  {
+    KC_LSFT,      KC_Z,         KC_X,         KC_C,
+    KC_V,         KC_B,         KC_K,         KC_M,
+    KC_COMM,      KC_DOT,       KC_SLSH,      KC_RSFT
+  },
+  {
+    FUNC,         KC_LGUI,      KC_LALT,      KC_LCTL,
+    SYMB,         KC_ENT,       KC_SPC,       MOVE,
+    KC_RCTL,      KC_RALT,      KC_RGUI,      FUNC
+  }
 },
 
-/* MOVE
- * ,-----------------------------------------------------------------------------------.
- * | H(F7)| H(F8)| H(6) | H(5) | H(4) | H(F9)|H(F10)| Home |  Up  |  End | H(A) |  Esc |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | H(F3)| H(F4)| H(3) | H(2) | H(1) | H(F5)| H(F6)| Left | Down | Right| Caps |  Del |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | H(0) | H(9) | H(8) | H(7) | H(F1)| H(F2)| Pg Dn| Pg Up|H(F11)|H(F12)|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
+/* QWERTY
+ * ,-----------------------------------------------------------------------.
+ * |Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  -  |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Bksp |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Shift|  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Shift|
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Func |Super| Alt |Ctrl |Symb |Enter|Space|Move |Ctrl | Alt |Super|Func |
+ * `-----------------------------------------------------------------------'
  */
-[_MOVE] = {
-  {H(KC_F7),H(KC_F8),H(KC_6), H(KC_5), H(KC_4), H(KC_F9),H(KC_F10),KC_HOME,KC_UP,   KC_END,  H(KC_A), KC_ESC },
-  {H(KC_F3),H(KC_F4),H(KC_3), H(KC_2), H(KC_1), H(KC_F5),H(KC_F6),KC_LEFT, KC_DOWN, KC_RGHT, KC_CAPS, KC_DEL },
-  {_______, H(KC_0), H(KC_9), H(KC_8), H(KC_7), H(KC_F1),H(KC_F2),KC_PGDN,KC_PGUP,H(KC_F11),H(KC_F12),_______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
+[_QWERTY] = {
+  {
+    KC_TAB,       KC_Q,         KC_W,         KC_E,
+    KC_R,         KC_T,         KC_Y,         KC_U,
+    KC_I,         KC_O,         KC_P,         KC_MINS
+  },
+  {
+    KC_BSPC,      KC_A,         KC_S,         KC_D,
+    KC_F,         KC_G,         KC_H,         KC_J,
+    KC_K,         KC_L,         KC_SCLN,      KC_QUOT
+  },
+  {
+    KC_LSFT,      KC_Z,         KC_X,         KC_C,
+    KC_V,         KC_B,         KC_N,         KC_M,
+    KC_COMM,      KC_DOT,       KC_SLSH,      KC_RSFT
+  },
+  {
+    FUNC,         KC_LGUI,      KC_LALT,      KC_LCTL,
+    SYMB,         KC_ENT,       KC_SPC,       MOVE,
+    KC_RCTL,      KC_RALT,      KC_RGUI,      FUNC
+  }
 },
 
 /* SYMB
- * ,-----------------------------------------------------------------------------------.
- * |  Esc |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   –  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Del |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   ’  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ~  |   `  |   +  |   =  |   |  |   \  |   [  |   ]  |   {  |   }  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
+ * ,-----------------------------------------------------------------------.
+ * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |     |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * | Del |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |     |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |     |  ~  |  `  |  +  |  =  |  |  |  \  |  [  |  ]  |  {  |  }  |     |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |     |     |     |     |     |     |     |     |
+ * `-----------------------------------------------------------------------'
  */
 [_SYMB] = {
-  {KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    ENDASH },
-  {KC_DEL,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, RSQUOT },
-  {_______, KC_TILD, KC_GRV,  KC_PLUS, KC_EQL,  KC_PIPE, KC_BSLS, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
+  {
+    KC_ESC,       KC_1,         KC_2,         KC_3,
+    KC_4,         KC_5,         KC_6,         KC_7,
+    KC_8,         KC_9,         KC_0,         _______
+  },
+  {
+    KC_DEL,       KC_EXLM,      KC_AT,        KC_HASH,
+    KC_DLR,       KC_PERC,      KC_CIRC,      KC_AMPR,
+    KC_ASTR,      KC_LPRN,      KC_RPRN,      _______
+  },
+  {
+    _______,      KC_TILD,      KC_GRV,       KC_PLUS,
+    KC_EQL,       KC_PIPE,      KC_BSLS,      KC_LBRC,
+    KC_RBRC,      KC_LCBR,      KC_RCBR,      _______
+  },
+  {
+    _______,      _______,      _______,      _______,
+    _______,      _______,      _______,      _______,
+    _______,      _______,      _______,      _______
+  }
 },
 
-/* MORE
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |   £  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   “  |   ”  |   ‘  |   ’  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
+/* MOVE
+ * ,-----------------------------------------------------------------------.
+ * |     |     |     |     |     |     |     |Home | Up  | End |     | Esc |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |     |     |     |Left |Down |Right|Caps | Del |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |     |     |     |PgDn |PgUp |     |     |     |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |     |     |     |     |     |     |     |     |
+ * `-----------------------------------------------------------------------'
  */
-[_MORE] = {
-  {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
-  {XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, POUND,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX},
-  {_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LDQUOT,  RDQUOT,  LSQUOT,  RSQUOT,  _______},
-  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
+[_MOVE] = {
+  {
+    GC(KC_UP),    GAC(KC_1),    G(KC_6),      G(KC_5),
+    G(KC_4),      GAC(KC_UP),   GAC(KC_RGHT), KC_HOME,
+    KC_UP,        KC_END,       C(KC_SPC),    KC_ESC
+  },
+  {
+    GC(KC_DOWN),  GAC(KC_2),    G(KC_3),      G(KC_2),
+    G(KC_1),      G(KC_F),      G(KC_C),      KC_LEFT,
+    KC_DOWN,      KC_RGHT,      KC_CAPS,      KC_DEL
+  },
+  {
+    _______,      GAC(KC_3),    G(KC_9),      G(KC_8),
+    G(KC_7),      GAC(KC_LEFT), GAC(KC_DOWN), KC_PGDN,
+    KC_PGUP,      GC(KC_LEFT),  GC(KC_RGHT),  _______
+  },
+  {
+    _______,      _______,      _______,      _______,
+    _______,      _______,      _______,      _______,
+    _______,      _______,      _______,      _______
+  }
 },
 
 /* FUNC
- * ,-----------------------------------------------------------------------------------.
- * | Reset|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | Vol+ |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Power|  F11 |  F12 |  F13 |  F14 |  F15 |  F16 |  F17 |  F18 |  F19 |  F20 | Vol- |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  F21 |  F22 |  F23 |  F24 |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      | Prev | Mute | Play | Next |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
+ * ,-----------------------------------------------------------------------.
+ * |Reset| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 |VolUp|
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |Power| F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |VolDn|
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |     | F21 | F22 | F23 | F24 |     |     |     |     |Clmak|Qwrty|     |
+ * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+ * |     |     |     |     |Prev |Mute |Play |Next |     |     |     |     |
+ * `-----------------------------------------------------------------------'
  */
 [_FUNC] = {
-  {RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_VOLU},
-  {KC_POWER,KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_VOLD},
-  {_______, KC_F21,  KC_F22,  KC_F23,  KC_F24,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______},
-  {_______, _______, _______, _______, KC_MPRV, KC_MUTE, KC_MPLY, KC_MNXT, _______, _______, _______, _______}
+  {
+    RESET,        KC_F1,        KC_F2,        KC_F3,
+    KC_F4,        KC_F5,        KC_F6,        KC_F7,
+    KC_F8,        KC_F9,        KC_F10,       KC_VOLU
+  },
+  {
+    KC_POWER,     KC_F11,       KC_F12,       KC_F13,
+    KC_F14,       KC_F15,       KC_F16,       KC_F17,
+    KC_F18,       KC_F19,       KC_F20,       KC_VOLD
+  },
+  {
+    _______,      KC_F21,       KC_F22,       KC_F23,
+    KC_F24,       XXXXXXX,      XXXXXXX,      XXXXXXX,
+    XXXXXXX,      COLEMAK,      QWERTY,       _______
+  },
+  {
+    _______,      _______,      _______,      _______,
+    KC_MPRV,      KC_MUTE,      KC_MPLY,      KC_MNXT,
+    _______,      _______,      _______,      _______
+  }
 }
 
 };
 
+#ifdef AUDIO_ENABLE
+  float colemak_song[][2] = SONG(COLEMAK_SOUND);
+  float qwerty_song[][2] = SONG(QWERTY_SOUND);
+#endif
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
-    case MOVE:
+    case COLEMAK:
       if (record->event.pressed) {
-        layer_on(_MOVE);
-        update_tri_layer(_MOVE, _SYMB, _MORE);
-      } else {
-        layer_off(_MOVE);
-        update_tri_layer(_MOVE, _SYMB, _MORE);
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+          PLAY_SONG(colemak_song);
+        #endif
+        set_single_persistent_default_layer(_COLEMAK);
+      }
+      return false;
+      break;
+    case QWERTY:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+          PLAY_SONG(qwerty_song);
+        #endif
+        set_single_persistent_default_layer(_QWERTY);
       }
       return false;
       break;
     case SYMB:
       if (record->event.pressed) {
         layer_on(_SYMB);
-        update_tri_layer(_MOVE, _SYMB, _MORE);
       } else {
         layer_off(_SYMB);
-        update_tri_layer(_MOVE, _SYMB, _MORE);
+      }
+      return false;
+      break;
+    case MOVE:
+      if (record->event.pressed) {
+        layer_on(_MOVE);
+      } else {
+        layer_off(_MOVE);
       }
       return false;
       break;