diff options
author | Jason Stillwell <dragonfax@gmail.com> | 2018-03-16 13:41:01 -0700 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-03-16 16:41:01 -0400 |
commit | 00b4dce605bc44a2ee6babaf93dbe3640e735d2e (patch) | |
tree | f146f9f64439a7ea0b16bf91f5f7e89e172a4368 /quantum | |
parent | bb5c98699fe622a8978c6fc62dc5829d227fdec5 (diff) | |
download | qmk_firmware-00b4dce605bc44a2ee6babaf93dbe3640e735d2e.tar.gz qmk_firmware-00b4dce605bc44a2ee6babaf93dbe3640e735d2e.zip |
Rule to enable Modifiers with Auto-Shift (#2542)
* Re-enable modifiers with auto-shift
* Auto-shift modifiers rule
* missed a line
* Documentation
* fixing whitespace
Diffstat (limited to 'quantum')
-rw-r--r-- | quantum/process_keycode/process_auto_shift.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c index fcce91849..098bdeaa7 100644 --- a/quantum/process_keycode/process_auto_shift.c +++ b/quantum/process_keycode/process_auto_shift.c | |||
@@ -92,7 +92,9 @@ bool autoshift_state(void) { | |||
92 | } | 92 | } |
93 | 93 | ||
94 | bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { | 94 | bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { |
95 | #ifndef AUTO_SHIFT_MODIFIERS | ||
95 | static uint8_t any_mod_pressed; | 96 | static uint8_t any_mod_pressed; |
97 | #endif | ||
96 | 98 | ||
97 | if (record->event.pressed) { | 99 | if (record->event.pressed) { |
98 | switch (keycode) { | 100 | switch (keycode) { |
@@ -175,6 +177,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { | |||
175 | autoshift_flush(); | 177 | autoshift_flush(); |
176 | if (!autoshift_enabled) return true; | 178 | if (!autoshift_enabled) return true; |
177 | 179 | ||
180 | #ifndef AUTO_SHIFT_MODIFIERS | ||
178 | any_mod_pressed = get_mods() & ( | 181 | any_mod_pressed = get_mods() & ( |
179 | MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)| | 182 | MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)| |
180 | MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)| | 183 | MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT)| |
@@ -185,6 +188,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) { | |||
185 | if (any_mod_pressed) { | 188 | if (any_mod_pressed) { |
186 | return true; | 189 | return true; |
187 | } | 190 | } |
191 | #endif | ||
188 | 192 | ||
189 | autoshift_on(keycode); | 193 | autoshift_on(keycode); |
190 | return false; | 194 | return false; |