5 files changed, 100 insertions, 9 deletions
diff --git a/quantum/process_keycode/process_grave_esc.c b/quantum/process_keycode/process_grave_esc.c
new file mode 100644
index 0000000000..41c50f5cb8
--- /dev/null
+++ b/quantum/process_keycode/process_grave_esc.c
@@ -0,0 +1,71 @@
+/* Copyright 2020
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "process_grave_esc.h"
+
+/* true if the last press of GRAVE_ESC was shifted (i.e. GUI or SHIFT were pressed), false otherwise.
+ * Used to ensure that the correct keycode is released if the key is released.
+ */
+static bool grave_esc_was_shifted = false;
+
+bool process_grave_esc(uint16_t keycode, keyrecord_t *record) {
+    if (keycode == GRAVE_ESC) {
+        const uint8_t mods    = get_mods();
+        uint8_t       shifted = mods & MOD_MASK_SG;
+
+#ifdef GRAVE_ESC_ALT_OVERRIDE
+        // if ALT is pressed, ESC is always sent
+        // this is handy for the cmd+opt+esc shortcut on macOS, among other things.
+        if (mods & MOD_MASK_ALT) {
+            shifted = 0;
+        }
+#endif
+
+#ifdef GRAVE_ESC_CTRL_OVERRIDE
+        // if CTRL is pressed, ESC is always sent
+        // this is handy for the ctrl+shift+esc shortcut on windows, among other things.
+        if (mods & MOD_MASK_CTRL) {
+            shifted = 0;
+        }
+#endif
+
+#ifdef GRAVE_ESC_GUI_OVERRIDE
+        // if GUI is pressed, ESC is always sent
+        if (mods & MOD_MASK_GUI) {
+            shifted = 0;
+        }
+#endif
+
+#ifdef GRAVE_ESC_SHIFT_OVERRIDE
+        // if SHIFT is pressed, ESC is always sent
+        if (mods & MOD_MASK_SHIFT) {
+            shifted = 0;
+        }
+#endif
+
+        if (record->event.pressed) {
+            grave_esc_was_shifted = shifted;
+            add_key(shifted ? KC_GRAVE : KC_ESCAPE);
+        } else {
+            del_key(grave_esc_was_shifted ? KC_GRAVE : KC_ESCAPE);
+        }
+
+        send_keyboard_report();
+        return false;
+    }
+
+    // Not a grave keycode so continue processing
+    return true;
+}
diff --git a/quantum/process_keycode/process_grave_esc.h b/quantum/process_keycode/process_grave_esc.h
new file mode 100644
index 0000000000..bbf4483763
--- /dev/null
+++ b/quantum/process_keycode/process_grave_esc.h
@@ -0,0 +1,20 @@
+/* Copyright 2020
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+bool process_grave_esc(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_rgb.c b/quantum/process_keycode/process_rgb.c
index c76166342f..627e5986fb 100644
--- a/quantum/process_keycode/process_rgb.c
+++ b/quantum/process_keycode/process_rgb.c
@@ -20,8 +20,8 @@ typedef void (*rgb_func_pointer)(void);
 
 /**
  * Wrapper for inc/dec rgb keycode
- * 
- * noinline to optimise for firmware size not speed (not in hot path) 
+ *
+ * noinline to optimise for firmware size not speed (not in hot path)
  */
 static void __attribute__((noinline)) handleKeycodeRGB(const uint8_t is_shifted, const rgb_func_pointer inc_func, const rgb_func_pointer dec_func) {
     if (is_shifted) {
@@ -35,10 +35,10 @@ static void __attribute__((noinline)) handleKeycodeRGB(const uint8_t is_shifted,
  * Wrapper for animation mode
  *   - if not in animation family -> jump to that animation
  *   - otherwise -> wrap round animation speed
- * 
- * noinline to optimise for firmware size not speed (not in hot path) 
+ *
+ * noinline to optimise for firmware size not speed (not in hot path)
  */
-static void __attribute__((noinline,unused)) handleKeycodeRGBMode(const uint8_t start, const uint8_t end) {
+static void __attribute__((noinline, unused)) handleKeycodeRGBMode(const uint8_t start, const uint8_t end) {
     if ((start <= rgblight_get_mode()) && (rgblight_get_mode() < end)) {
         rgblight_step();
     } else {
diff --git a/quantum/process_keycode/process_steno.c b/quantum/process_keycode/process_steno.c
index e0b33ec861..57e279f211 100644
--- a/quantum/process_keycode/process_steno.c
+++ b/quantum/process_keycode/process_steno.c
@@ -73,7 +73,9 @@ static void steno_clear_state(void) {
 static void send_steno_state(uint8_t size, bool send_empty) {
     for (uint8_t i = 0; i < size; ++i) {
         if (chord[i] || send_empty) {
+#ifdef VIRTSER_ENABLE
             virtser_send(chord[i]);
+#endif
         }
     }
 }
@@ -105,7 +107,9 @@ static void send_steno_chord(void) {
         switch (mode) {
             case STENO_MODE_BOLT:
                 send_steno_state(BOLT_STATE_SIZE, false);
+#ifdef VIRTSER_ENABLE
                 virtser_send(0);  // terminating byte
+#endif
                 break;
             case STENO_MODE_GEMINI:
                 chord[0] |= 0x80;  // Indicate start of packet
diff --git a/quantum/process_keycode/process_steno.h b/quantum/process_keycode/process_steno.h
index 3675423728..ed049eb13f 100644
--- a/quantum/process_keycode/process_steno.h
+++ b/quantum/process_keycode/process_steno.h
@@ -18,10 +18,6 @@
 
 #include "quantum.h"
 
-#if defined(STENO_ENABLE) && !defined(VIRTSER_ENABLE)
-#    error "must have virtser enabled to use steno"
-#endif
-
 typedef enum { STENO_MODE_BOLT, STENO_MODE_GEMINI } steno_mode_t;
 
 bool     process_steno(uint16_t keycode, keyrecord_t *record);