diff options
| author | Ryan <fauxpark@gmail.com> | 2022-11-01 08:15:12 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 21:15:12 +0000 |
| commit | 5974d989fe72f6c576901a065bee4487a58c351d (patch) | |
| tree | a88a796ec2c0a11d4d554325fa92e53d9fbb82c2 /users | |
| parent | 743524df32ef265fdc3999518cdaba45cd4abf22 (diff) | |
Normalise Unicode keycodes (#18898)
* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV`
* `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*`
* `UC_MAC` -> `UNICODE_MODE_MACOS`
* `UC_LNX` -> `UNICODE_MODE_LINUX`
* `UC_WIN` -> `UNICODE_MODE_WINDOWS`
* `UC_BSD` -> `UNICODE_MODE_BSD`
* `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE`
* `UC_EMACS` -> `UNICODE_MODE_EMACS`
* `UC__COUNT` -> `UNICODE_MODE_COUNT`
* `UC_M_MA` -> `UC_MAC`
* `UC_M_LN` -> `UC_LINX`
* `UC_M_WI` -> `UC_WIN`
* `UC_M_BS` -> `UC_BSD`
* `UC_M_WC` -> `UC_WINC`
* `UC_M_EM` -> `UC_EMAC`
* Docs
* Update quantum/unicode/unicode.h
Diffstat (limited to 'users')
| -rw-r--r-- | users/arkag/arkag.c | 6 | ||||
| -rw-r--r-- | users/drashna/config.h | 2 | ||||
| -rw-r--r-- | users/konstantin/config.h | 2 | ||||
| -rw-r--r-- | users/kuchosauronad0/kuchosauronad0.c | 4 | ||||
| -rw-r--r-- | users/ridingqwerty/ridingqwerty.c | 2 | ||||
| -rw-r--r-- | users/romus/romus.c | 6 | ||||
| -rw-r--r-- | users/rupa/config.h | 2 | ||||
| -rw-r--r-- | users/rupa/wrappers.h | 2 | ||||
| -rw-r--r-- | users/rverst/rverst.c | 6 | ||||
| -rw-r--r-- | users/rverst/unicode.h | 2 | ||||
| -rw-r--r-- | users/sigma/sigma.c | 6 | ||||
| -rw-r--r-- | users/spidey3/config.h | 2 | ||||
| -rw-r--r-- | users/spidey3/layer_rgb.c | 22 | ||||
| -rw-r--r-- | users/spidey3/spidey3.c | 6 | ||||
| -rw-r--r-- | users/spidey3/spidey3_unicode.c | 2 | ||||
| -rw-r--r-- | users/uqs/config.h | 2 | ||||
| -rw-r--r-- | users/uqs/uqs.c | 4 | ||||
| -rw-r--r-- | users/yet-another-developer/yet-another-developer.c | 4 |
18 files changed, 41 insertions, 41 deletions
diff --git a/users/arkag/arkag.c b/users/arkag/arkag.c index fccae5ad6d..e7c8218587 100644 --- a/users/arkag/arkag.c +++ b/users/arkag/arkag.c | |||
| @@ -190,15 +190,15 @@ void set_os (uint8_t os, bool update) { | |||
| 190 | } | 190 | } |
| 191 | switch (os) { | 191 | switch (os) { |
| 192 | case OS_MAC: | 192 | case OS_MAC: |
| 193 | set_unicode_input_mode(UC_MAC); | 193 | set_unicode_input_mode(UNICODE_MODE_MACOS); |
| 194 | underglow = (Color){ 213, 255, 255 }; | 194 | underglow = (Color){ 213, 255, 255 }; |
| 195 | break; | 195 | break; |
| 196 | case OS_WIN: | 196 | case OS_WIN: |
| 197 | set_unicode_input_mode(UC_WINC); | 197 | set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE); |
| 198 | underglow = (Color){ 128, 255, 255 }; | 198 | underglow = (Color){ 128, 255, 255 }; |
| 199 | break; | 199 | break; |
| 200 | case OS_NIX: | 200 | case OS_NIX: |
| 201 | set_unicode_input_mode(UC_LNX); | 201 | set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 202 | underglow = (Color){ 43, 255, 255 }; | 202 | underglow = (Color){ 43, 255, 255 }; |
| 203 | break; | 203 | break; |
| 204 | default: | 204 | default: |
diff --git a/users/drashna/config.h b/users/drashna/config.h index 57b26786b3..5c5c131e36 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | # endif | 63 | # endif |
| 64 | #endif // !AUDIO_ENABLE | 64 | #endif // !AUDIO_ENABLE |
| 65 | 65 | ||
| 66 | #define UNICODE_SELECTED_MODES UC_WINC, UC_MAC | 66 | #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS |
| 67 | 67 | ||
| 68 | // #define WPM_ESTIMATED_WORD_SIZE 5 | 68 | // #define WPM_ESTIMATED_WORD_SIZE 5 |
| 69 | #define WPM_ALLOW_COUNT_REGRESSION | 69 | #define WPM_ALLOW_COUNT_REGRESSION |
diff --git a/users/konstantin/config.h b/users/konstantin/config.h index f5247cf5a9..26c7ecc0c7 100644 --- a/users/konstantin/config.h +++ b/users/konstantin/config.h | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | 53 | ||
| 54 | // Unicode | 54 | // Unicode |
| 55 | #define UNICODE_CYCLE_PERSIST false | 55 | #define UNICODE_CYCLE_PERSIST false |
| 56 | #define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX | 56 | #define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX |
| 57 | #define UNICODE_KEY_WINC KC_RGUI | 57 | #define UNICODE_KEY_WINC KC_RGUI |
| 58 | 58 | ||
| 59 | // Firmware size reduction | 59 | // Firmware size reduction |
diff --git a/users/kuchosauronad0/kuchosauronad0.c b/users/kuchosauronad0/kuchosauronad0.c index 4e9e856107..2c63eadfd1 100644 --- a/users/kuchosauronad0/kuchosauronad0.c +++ b/users/kuchosauronad0/kuchosauronad0.c | |||
| @@ -19,9 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 19 | 19 | ||
| 20 | userspace_config_t userspace_config; | 20 | userspace_config_t userspace_config; |
| 21 | #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) | 21 | #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) |
| 22 | # define KUCHOSAURONAD0_UNICODE_MODE UC_WINC | 22 | # define KUCHOSAURONAD0_UNICODE_MODE UNICODE_MODE_WINCOMPOSE |
| 23 | #else | 23 | #else |
| 24 | # define KUCHOSAURONAD0_UNICODE_MODE 2 // set to 2 for UC_WIN, set to 4 for UC_WINC | 24 | # define KUCHOSAURONAD0_UNICODE_MODE 2 // set to 2 for UNICODE_MODE_WINDOWS, set to 4 for UNICODE_MODE_WINCOMPOSE |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| 27 | 27 | ||
diff --git a/users/ridingqwerty/ridingqwerty.c b/users/ridingqwerty/ridingqwerty.c index 19b417a80f..8934b9365b 100644 --- a/users/ridingqwerty/ridingqwerty.c +++ b/users/ridingqwerty/ridingqwerty.c | |||
| @@ -7,7 +7,7 @@ void matrix_init_user(void) { | |||
| 7 | matrix_init_keymap(); | 7 | matrix_init_keymap(); |
| 8 | 8 | ||
| 9 | #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) | 9 | #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) |
| 10 | set_unicode_input_mode(UC_LNX); | 10 | set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 11 | #endif | 11 | #endif |
| 12 | 12 | ||
| 13 | //set_single_persistent_default_layer(_QWERTY); | 13 | //set_single_persistent_default_layer(_QWERTY); |
diff --git a/users/romus/romus.c b/users/romus/romus.c index a41a6df578..7b2e330228 100644 --- a/users/romus/romus.c +++ b/users/romus/romus.c | |||
| @@ -142,7 +142,7 @@ void matrix_init_user (void) { | |||
| 142 | 142 | ||
| 143 | // Correct unicode | 143 | // Correct unicode |
| 144 | #ifdef UNICODE_ENABLE | 144 | #ifdef UNICODE_ENABLE |
| 145 | set_unicode_input_mode(UC_LNX); | 145 | set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 146 | #endif | 146 | #endif |
| 147 | 147 | ||
| 148 | // Make beginning layer DVORAK | 148 | // Make beginning layer DVORAK |
| @@ -272,7 +272,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 272 | stop_all_notes(); | 272 | stop_all_notes(); |
| 273 | PLAY_SONG(tone_linux); | 273 | PLAY_SONG(tone_linux); |
| 274 | #endif | 274 | #endif |
| 275 | set_unicode_input_mode(UC_LNX); | 275 | set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 276 | } | 276 | } |
| 277 | return false; | 277 | return false; |
| 278 | break; | 278 | break; |
| @@ -282,7 +282,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 282 | stop_all_notes(); | 282 | stop_all_notes(); |
| 283 | PLAY_SONG(tone_windows); | 283 | PLAY_SONG(tone_windows); |
| 284 | #endif | 284 | #endif |
| 285 | set_unicode_input_mode(UC_WIN); | 285 | set_unicode_input_mode(UNICODE_MODE_WINDOWS); |
| 286 | } | 286 | } |
| 287 | return false; | 287 | return false; |
| 288 | break; | 288 | break; |
diff --git a/users/rupa/config.h b/users/rupa/config.h index 723d9b3b5f..42a1708f9c 100644 --- a/users/rupa/config.h +++ b/users/rupa/config.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | #define UNICODE_SELECTED_MODES UC_MAC, UC_LNX | 3 | #define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX |
| 4 | 4 | ||
| 5 | #define ONESHOT_TAP_TOGGLE 5 | 5 | #define ONESHOT_TAP_TOGGLE 5 |
| 6 | #define ONESHOT_TIMEOUT 5000 | 6 | #define ONESHOT_TIMEOUT 5000 |
diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h index 199404a760..b5794c8fad 100644 --- a/users/rupa/wrappers.h +++ b/users/rupa/wrappers.h | |||
| @@ -111,7 +111,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 111 | #define ____65_ADJUST______________ROW1 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______ | 111 | #define ____65_ADJUST______________ROW1 _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______ |
| 112 | #define ____65_ADJUST______________ROW2 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______ | 112 | #define ____65_ADJUST______________ROW2 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______ |
| 113 | #define ____65_ADJUST______________ROW3 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______ | 113 | #define ____65_ADJUST______________ROW3 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______ |
| 114 | #define ____65_ADJUST______________ROW4 _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, UC_MOD, _______, _______ | 114 | #define ____65_ADJUST______________ROW4 _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, UC_NEXT, _______, _______ |
| 115 | #define ____65_ADJUST______________ROW5 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 115 | #define ____65_ADJUST______________ROW5 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 116 | 116 | ||
| 117 | #define ____65_ADJUST__________RGB_ROW2 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, RESET, _______ | 117 | #define ____65_ADJUST__________RGB_ROW2 _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, RESET, _______ |
diff --git a/users/rverst/rverst.c b/users/rverst/rverst.c index 2cbffbc478..df37ba9b5f 100644 --- a/users/rverst/rverst.c +++ b/users/rverst/rverst.c | |||
| @@ -75,13 +75,13 @@ void switch_mode(uint8_t mode) { | |||
| 75 | #ifdef UNICODEMAP_ENABLE | 75 | #ifdef UNICODEMAP_ENABLE |
| 76 | switch (mode) { | 76 | switch (mode) { |
| 77 | case MAC_UNI: | 77 | case MAC_UNI: |
| 78 | set_unicode_input_mode(UC_MAC); | 78 | set_unicode_input_mode(UNICODE_MODE_MACOS); |
| 79 | break; | 79 | break; |
| 80 | case WINDOWS_UNI: | 80 | case WINDOWS_UNI: |
| 81 | set_unicode_input_mode(UC_WINC); | 81 | set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE); |
| 82 | break; | 82 | break; |
| 83 | case LINUX_UNI: | 83 | case LINUX_UNI: |
| 84 | set_unicode_input_mode(UC_LNX); | 84 | set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 85 | break; | 85 | break; |
| 86 | } | 86 | } |
| 87 | #endif | 87 | #endif |
diff --git a/users/rverst/unicode.h b/users/rverst/unicode.h index 2268ffb594..45d1585809 100644 --- a/users/rverst/unicode.h +++ b/users/rverst/unicode.h | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #ifdef UNICODE_SELECTED_MODES | 19 | #ifdef UNICODE_SELECTED_MODES |
| 20 | # undef UNICODE_SELECTED_MODES | 20 | # undef UNICODE_SELECTED_MODES |
| 21 | # define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC | 21 | # define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE |
| 22 | #endif | 22 | #endif |
| 23 | 23 | ||
| 24 | enum unicode_names { BANG, IRONY, SNEK }; | 24 | enum unicode_names { BANG, IRONY, SNEK }; |
diff --git a/users/sigma/sigma.c b/users/sigma/sigma.c index 70a76d4c01..9a0786233b 100644 --- a/users/sigma/sigma.c +++ b/users/sigma/sigma.c | |||
| @@ -67,13 +67,13 @@ void set_os(uint8_t os) { | |||
| 67 | #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) | 67 | #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE) |
| 68 | switch (os) { | 68 | switch (os) { |
| 69 | case _OS_MACOS: | 69 | case _OS_MACOS: |
| 70 | set_unicode_input_mode(UC_MAC); | 70 | set_unicode_input_mode(UNICODE_MODE_MACOS); |
| 71 | break; | 71 | break; |
| 72 | case _OS_LINUX: | 72 | case _OS_LINUX: |
| 73 | set_unicode_input_mode(UC_LNX); | 73 | set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 74 | break; | 74 | break; |
| 75 | case _OS_WINDOWS: | 75 | case _OS_WINDOWS: |
| 76 | set_unicode_input_mode(UC_WIN); | 76 | set_unicode_input_mode(UNICODE_MODE_WINDOWS); |
| 77 | break; | 77 | break; |
| 78 | } | 78 | } |
| 79 | #endif | 79 | #endif |
diff --git a/users/spidey3/config.h b/users/spidey3/config.h index 15f46a1f4a..0b3bf8f723 100644 --- a/users/spidey3/config.h +++ b/users/spidey3/config.h | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | #endif | 32 | #endif |
| 33 | 33 | ||
| 34 | #define UNICODE_SELECTED_MODES UC_MAC, UC_LNX, UC_WINC, UC_EMACS | 34 | #define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_EMACS |
| 35 | 35 | ||
| 36 | #define SPI_DEBUG_SCAN_RATE | 36 | #define SPI_DEBUG_SCAN_RATE |
| 37 | 37 | ||
diff --git a/users/spidey3/layer_rgb.c b/users/spidey3/layer_rgb.c index 102848fc90..75a4b4c0a1 100644 --- a/users/spidey3/layer_rgb.c +++ b/users/spidey3/layer_rgb.c | |||
| @@ -61,9 +61,9 @@ const rgblight_segment_t PROGMEM _huh_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNE | |||
| 61 | 61 | ||
| 62 | #define UNICODE_OFFSET 12 | 62 | #define UNICODE_OFFSET 12 |
| 63 | const rgblight_segment_t PROGMEM _uc_mac_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_PURPLE)); | 63 | const rgblight_segment_t PROGMEM _uc_mac_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_PURPLE)); |
| 64 | // No indicator for UC_LNX | 64 | // No indicator for UNICODE_MODE_LINUX |
| 65 | // UC_WIN disabled in config.h | 65 | // UNICODE_MODE_WINDOWS disabled in config.h |
| 66 | // UC_BSD not implemented | 66 | // UNICODE_MODE_BSD not implemented |
| 67 | const rgblight_segment_t PROGMEM _uc_winc_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_CYAN)); | 67 | const rgblight_segment_t PROGMEM _uc_winc_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_CYAN)); |
| 68 | const rgblight_segment_t PROGMEM _uc_emacs_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_GREEN)); | 68 | const rgblight_segment_t PROGMEM _uc_emacs_layer[] = RGBLIGHT_LAYER_SEGMENTS(CORNER_BR(HSV_GREEN)); |
| 69 | 69 | ||
| @@ -85,14 +85,14 @@ const rgblight_segment_t *const PROGMEM _rgb_layers[] = { | |||
| 85 | [ACK_OFFSET + ACK_MEH] = _meh_layer, | 85 | [ACK_OFFSET + ACK_MEH] = _meh_layer, |
| 86 | [ACK_OFFSET + ACK_HUH] = _huh_layer, | 86 | [ACK_OFFSET + ACK_HUH] = _huh_layer, |
| 87 | 87 | ||
| 88 | [UNICODE_OFFSET + UC_MAC] = _uc_mac_layer, | 88 | [UNICODE_OFFSET + UNICODE_MODE_MACOS] = _uc_mac_layer, |
| 89 | [UNICODE_OFFSET + UC_LNX] = _none, | 89 | [UNICODE_OFFSET + UNICODE_MODE_LINUX] = _none, |
| 90 | [UNICODE_OFFSET + UC_WIN] = _none, | 90 | [UNICODE_OFFSET + UNICODE_MODE_WINDOWS] = _none, |
| 91 | [UNICODE_OFFSET + UC_BSD] = _none, | 91 | [UNICODE_OFFSET + UNICODE_MODE_BSD] = _none, |
| 92 | [UNICODE_OFFSET + UC_WINC] = _uc_winc_layer, | 92 | [UNICODE_OFFSET + UNICODE_MODE_WINCOMPOSE] = _uc_winc_layer, |
| 93 | [UNICODE_OFFSET + UC_EMACS] = _uc_emacs_layer, | 93 | [UNICODE_OFFSET + UNICODE_MODE_EMACS] = _uc_emacs_layer, |
| 94 | 94 | ||
| 95 | [UNICODE_OFFSET + UC__COUNT] = NULL | 95 | [UNICODE_OFFSET + UNICODE_MODE_COUNT] = NULL |
| 96 | }; | 96 | }; |
| 97 | 97 | ||
| 98 | // clang-format on | 98 | // clang-format on |
| @@ -113,7 +113,7 @@ void do_rgb_layers(layer_state_t state, uint8_t start, uint8_t end) { | |||
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | void do_rgb_unicode(uint8_t uc_mode) { | 115 | void do_rgb_unicode(uint8_t uc_mode) { |
| 116 | for (uint8_t i = 0; i < UC__COUNT; i++) { | 116 | for (uint8_t i = 0; i < UNICODE_MODE_COUNT; i++) { |
| 117 | bool is_on = i == uc_mode; | 117 | bool is_on = i == uc_mode; |
| 118 | rgblight_set_layer_state(UNICODE_OFFSET + i, is_on); | 118 | rgblight_set_layer_state(UNICODE_OFFSET + i, is_on); |
| 119 | } | 119 | } |
diff --git a/users/spidey3/spidey3.c b/users/spidey3/spidey3.c index 0955bef3c3..3cf458d460 100644 --- a/users/spidey3/spidey3.c +++ b/users/spidey3/spidey3.c | |||
| @@ -224,7 +224,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 224 | // to determine what Print Screen key should do. The | 224 | // to determine what Print Screen key should do. The |
| 225 | // idea here is to make it consistent across hosts. | 225 | // idea here is to make it consistent across hosts. |
| 226 | switch (get_unicode_input_mode()) { | 226 | switch (get_unicode_input_mode()) { |
| 227 | case UC_MAC: | 227 | case UNICODE_MODE_MACOS: |
| 228 | if ((mods | osm) & MOD_MASK_ALT) { | 228 | if ((mods | osm) & MOD_MASK_ALT) { |
| 229 | // Window screenshot | 229 | // Window screenshot |
| 230 | clear_mods(); | 230 | clear_mods(); |
| @@ -247,8 +247,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 247 | } | 247 | } |
| 248 | break; | 248 | break; |
| 249 | 249 | ||
| 250 | case UC_WIN: | 250 | case UNICODE_MODE_WINDOWS |
| 251 | case UC_WINC: | 251 | case UNICODE_MODE_WINCOMPOSE: |
| 252 | if ((mods | osm) & MOD_MASK_ALT) { | 252 | if ((mods | osm) & MOD_MASK_ALT) { |
| 253 | // Window screenshot | 253 | // Window screenshot |
| 254 | // Alt+PrintScreen should work as is | 254 | // Alt+PrintScreen should work as is |
diff --git a/users/spidey3/spidey3_unicode.c b/users/spidey3/spidey3_unicode.c index c2804d8805..bda0876b54 100644 --- a/users/spidey3/spidey3_unicode.c +++ b/users/spidey3/spidey3_unicode.c | |||
| @@ -24,5 +24,5 @@ const uint32_t PROGMEM unicode_map[] = { | |||
| 24 | 24 | ||
| 25 | void eeconfig_init_user_unicode(void) { | 25 | void eeconfig_init_user_unicode(void) { |
| 26 | // Default to Linux style | 26 | // Default to Linux style |
| 27 | set_unicode_input_mode(UC_LNX); | 27 | set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 28 | } | 28 | } |
diff --git a/users/uqs/config.h b/users/uqs/config.h index 5530417de1..4bb793532b 100644 --- a/users/uqs/config.h +++ b/users/uqs/config.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #define LEADER_TIMEOUT 400 | 22 | #define LEADER_TIMEOUT 400 |
| 23 | #define LEADER_PER_KEY_TIMING | 23 | #define LEADER_PER_KEY_TIMING |
| 24 | 24 | ||
| 25 | #define UNICODE_SELECTED_MODES UC_LNX | 25 | #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX |
| 26 | 26 | ||
| 27 | // make KC_ACL0 et al work when held. | 27 | // make KC_ACL0 et al work when held. |
| 28 | #define MK_COMBINED | 28 | #define MK_COMBINED |
diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c index ede34d4556..82cf70c439 100644 --- a/users/uqs/uqs.c +++ b/users/uqs/uqs.c | |||
| @@ -560,13 +560,13 @@ void matrix_scan_user(void) { | |||
| 560 | } | 560 | } |
| 561 | // tableflip (LEADER - TF) | 561 | // tableflip (LEADER - TF) |
| 562 | SEQ_TWO_KEYS(KC_T, KC_F) { | 562 | SEQ_TWO_KEYS(KC_T, KC_F) { |
| 563 | //set_unicode_input_mode(UC_LNX); | 563 | //set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 564 | //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); | 564 | //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); |
| 565 | send_unicode_string("(╯°□°)╯︵ ┻━┻"); | 565 | send_unicode_string("(╯°□°)╯︵ ┻━┻"); |
| 566 | } | 566 | } |
| 567 | // untableflip | 567 | // untableflip |
| 568 | SEQ_THREE_KEYS(KC_U, KC_T, KC_F) { | 568 | SEQ_THREE_KEYS(KC_U, KC_T, KC_F) { |
| 569 | //set_unicode_input_mode(UC_LNX); | 569 | //set_unicode_input_mode(UNICODE_MODE_LINUX); |
| 570 | //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); | 570 | //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); |
| 571 | send_unicode_string("┬─┬ノ( º _ ºノ)"); | 571 | send_unicode_string("┬─┬ノ( º _ ºノ)"); |
| 572 | } | 572 | } |
diff --git a/users/yet-another-developer/yet-another-developer.c b/users/yet-another-developer/yet-another-developer.c index b729c06219..0e62d0cc88 100644 --- a/users/yet-another-developer/yet-another-developer.c +++ b/users/yet-another-developer/yet-another-developer.c | |||
| @@ -4,9 +4,9 @@ | |||
| 4 | userspace_config_t userspace_config; | 4 | userspace_config_t userspace_config; |
| 5 | 5 | ||
| 6 | #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) | 6 | #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) |
| 7 | #define YAD_UNICODE_MODE UC_WIN | 7 | #define YAD_UNICODE_MODE UNICODE_MODE_WINDOWS |
| 8 | #else | 8 | #else |
| 9 | // set to 2 for UC_WIN, set to 4 for UC_WINC | 9 | // set to 2 for UNICODE_MODE_WINDOWS, set to 4 for UNICODE_MODE_WINCOMPOSE |
| 10 | #define YAD_UNICODE_MODE 2 | 10 | #define YAD_UNICODE_MODE 2 |
| 11 | #endif | 11 | #endif |
| 12 | 12 | ||
