commit 560440c4f693f3a9dbc5eb04917b30a077fa7877
parent a26f51991859e5e43b346ba9b9817cddf0baa592
Author: Jack Sangdahl <jack@pngu.org>
Date: Sun, 7 Dec 2025 09:35:33 +0100
Remove no longer used fancy unicode input
Diffstat:
5 files changed, 6 insertions(+), 312 deletions(-)
diff --git a/keyboards/splitkb/kyria/keymaps/jack/keymap.c b/keyboards/splitkb/kyria/keymaps/jack/keymap.c
@@ -19,9 +19,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[LAYER3] = LAYOUT_jack(
- _______, XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, UC_NOMODE, UC_SCRIPT, UC_BLOCKS, UC_REGIONAL, QK_MAKE, _______,
- _______, MS_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, UC_WIDE, UC_AUSSIE, UC_ZALGO, UC_SUPER, QK_BOOT, _______,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
+ _______, XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, _______, _______, _______, _______, QK_MAKE, _______,
+ _______, MS_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, _______, _______, _______, _______, QK_BOOT, _______,
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/users/jack/jack.h b/users/jack/jack.h
@@ -7,19 +7,7 @@ enum layers { LAYER0, LAYER1, LAYER3 };
enum tapdances { EM_DASH_MINS, PLY_NXT_PRV, CBRACKET, SBRACKET };
-enum custom_keycodes {
- UPDIR = QK_USER,
- REMOVE,
- MS_JIGGLE,
- UC_NOMODE,
- UC_WIDE,
- UC_SCRIPT,
- UC_BLOCKS,
- UC_REGIONAL,
- UC_AUSSIE,
- UC_ZALGO,
- UC_SUPER
-};
+enum custom_keycodes { UPDIR = QK_USER, REMOVE, MS_JIGGLE };
#define CMB(name, action, ...) name,
enum combos {
@@ -27,10 +15,6 @@ enum combos {
};
#undef CMB
-#ifdef UNICODE_COMMON_ENABLE
-bool process_record_unicode(uint16_t keycode, keyrecord_t *record);
-#endif
-
#ifdef TAP_DANCE_ENABLE
void em_dash_mins(tap_dance_state_t *state, void *user_data);
void ply_nxt_prv(tap_dance_state_t *state, void *user_data);
@@ -126,8 +110,8 @@ void housekeeping_task_keymap(void);
// #define ___LAYER12___ KC_VOLD, KC_6, KC_5, KC_4, _______, _______, _______, _______, _______, _______
// #define ___LAYER13___ _______, _______, _______, _______
-#define ___LAYER30___ XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, UC_NOMODE, UC_SCRIPT, UC_BLOCKS, UC_REGIONAL, QK_MAKE
-#define ___LAYER31___ MS_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, UC_WIDE, UC_AUSSIE, UC_ZALGO, UC_SUPER, QK_BOOT
+#define ___LAYER30___ XRGB_TOG, XRGB_NXT, XRGB_HUI, XRGB_SAI, XRGB_VAI, _______, _______, _______, _______, QK_MAKE
+#define ___LAYER31___ MS_JIGGLE, XRGB_PRV, XRGB_HUD, XRGB_SAD, XRGB_VAD, _______, _______, _______, _______, QK_BOOT
#define ___LAYER32___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10
#define ___LAYER33___ _______, _______, _______, _______
// clang-format on
diff --git a/users/jack/rules.mk b/users/jack/rules.mk
@@ -32,11 +32,6 @@ ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes)
SRC += $(USER_PATH)/painter.c $(USER_PATH)/fonts.qff.c
endif
-ifeq ($(strip $(UNICODE_COMMON)), yes)
- UNICODE_ENABLE = no
- SRC += $(USER_PATH)/unicode.c
-endif
-
ifeq ($(PLATFORM), CHIBIOS)
ifeq ($(MCU_SERIES), RP2040)
RP2040_MATH_IN_ROM = no
diff --git a/users/jack/tapping.c b/users/jack/tapping.c
@@ -59,10 +59,6 @@ void ply_nxt_prv(tap_dance_state_t *state, void *user_data) {
#endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef UNICODE_COMMON_ENABLE
- if (!process_record_unicode(keycode, record))
- return false;
-#endif
#ifdef RGB_MATRIX_ENABLE
if (!process_record_rgb_matrix(keycode, record))
return false;
diff --git a/users/jack/unicode.c b/users/jack/unicode.c
@@ -1,281 +0,0 @@
-// Copyright 2025 jack@pngu.org
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "jack.h"
-
-enum unicode_mode {
- NOMODE,
- WIDE,
- SCRIPT,
- BLOCKS,
- REGIONAL,
- AUSSIE,
- ZALGO,
- SUPER
-};
-
-uint8_t typing_mode = NOMODE;
-typedef uint32_t (*translator_function_t)(bool is_shifted, uint32_t keycode);
-
-void tap_unicode_glyph_nomods(uint32_t glyph) {
- uint8_t temp_mod = get_mods();
- clear_mods();
- register_unicode(glyph);
- set_mods(temp_mod);
-}
-
-void tap_code16_nomods(uint16_t kc) {
- uint8_t temp_mod = get_mods();
- clear_mods();
- tap_code16(kc);
- set_mods(temp_mod);
-}
-
-#define DEFINE_UNICODE_RANGE_TRANSLATOR(translator_name, lower_alpha, \
- upper_alpha, zero_glyph, number_one, \
- space_glyph) \
- static inline uint32_t translator_name(bool is_shifted, uint32_t keycode) { \
- switch (keycode) { \
- case KC_A ... KC_Z: \
- return (is_shifted ? upper_alpha : lower_alpha) + keycode - KC_A; \
- case KC_0: \
- return zero_glyph; \
- case KC_1 ... KC_9: \
- return (number_one + keycode - KC_1); \
- case KC_SPACE: \
- return space_glyph; \
- } \
- return keycode; \
- }
-
-#define DEFINE_UNICODE_LUT_TRANSLATOR(translator_name, ...) \
- static inline uint32_t translator_name(bool is_shifted, uint32_t keycode) { \
- static const uint32_t translation[] = {__VA_ARGS__}; \
- uint32_t ret = keycode; \
- if ((keycode - KC_A) < ARRAY_SIZE(translation)) \
- ret = translation[keycode - KC_A]; \
- return ret; \
- }
-
-bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record,
- translator_function_t translator) {
- uint8_t temp_mod = get_mods();
- bool is_shifted = (temp_mod)&MOD_MASK_SHIFT;
- if (((temp_mod) & (MOD_MASK_CTRL | MOD_MASK_ALT | MOD_MASK_GUI)) == 0) {
- if (KC_A <= keycode && keycode <= KC_Z) {
- if (record->event.pressed)
- tap_unicode_glyph_nomods(translator(is_shifted, keycode));
- return false;
- } else if (KC_1 <= keycode && keycode <= KC_0) {
- if (is_shifted)
- return true;
- if (record->event.pressed)
- register_unicode(translator(is_shifted, keycode));
- return false;
- } else if (keycode == KC_SPACE) {
- if (record->event.pressed)
- register_unicode(translator(is_shifted, keycode));
- return false;
- }
- }
- return true;
-}
-
-DEFINE_UNICODE_RANGE_TRANSLATOR(unicode_range_translator_wide, 0xFF41, 0xFF21,
- 0xFF10, 0xFF11, 0x2003);
-DEFINE_UNICODE_RANGE_TRANSLATOR(unicode_range_translator_script, 0x1D4EA,
- 0x1D4D0, 0x1D7CE, 0x1D7C1, 0x2002);
-DEFINE_UNICODE_RANGE_TRANSLATOR(unicode_range_translator_boxes, 0x1F170,
- 0x1F170, '0', '1', 0x2002);
-DEFINE_UNICODE_RANGE_TRANSLATOR(unicode_range_translator_regional, 0x1F1E6,
- 0x1F1E6, '0', '1', 0x2003);
-
-DEFINE_UNICODE_LUT_TRANSLATOR(unicode_lut_translator_aussie,
- 0x0250, // a
- 'q', // b
- 0x0254, // c
- 'p', // d
- 0x01DD, // e
- 0x025F, // f
- 0x0183, // g
- 0x0265, // h
- 0x1D09, // i
- 0x027E, // j
- 0x029E, // k
- 'l', // l
- 0x026F, // m
- 'u', // n
- 'o', // o
- 'd', // p
- 'b', // q
- 0x0279, // r
- 's', // s
- 0x0287, // t
- 'n', // u
- 0x028C, // v
- 0x028D, // w
- 0x2717, // x
- 0x028E, // y
- 'z', // z
- 0x0269, // 1
- 0x3139, // 2
- 0x0190, // 3
- 0x3123, // 4
- 0x03DB, // 5
- '9', // 6
- 0x3125, // 7
- '8', // 8
- '6', // 9
- '0' // 0
-);
-
-DEFINE_UNICODE_LUT_TRANSLATOR(unicode_lut_translator_super,
- 0x1D43, // a
- 0x1D47, // b
- 0x1D9C, // c
- 0x1D48, // d
- 0x1D49, // e
- 0x1DA0, // f
- 0x1D4D, // g
- 0x02B0, // h
- 0x2071, // i
- 0x02B2, // j
- 0x1D4F, // k
- 0x02E1, // l
- 0x1D50, // m
- 0x207F, // n
- 0x1D52, // o
- 0x1D56, // p
- 0x06F9, // q
- 0x02B3, // r
- 0x02E2, // s
- 0x1D57, // t
- 0x1D58, // u
- 0x1D5B, // v
- 0x02B7, // w
- 0x02E3, // x
- 0x02B8, // y
- 0x1DBB, // z
- 0x00B9, // 1
- 0x00B2, // 2
- 0x00B3, // 3
- 0x2074, // 4
- 0x2075, // 5
- 0x2076, // 6
- 0x2077, // 7
- 0x2078, // 8
- 0x2079, // 9
- 0x2070 // 0
-);
-
-bool process_record_aussie(uint16_t keycode, keyrecord_t *record) {
- bool is_shifted = (get_mods())&MOD_MASK_SHIFT;
- if ((KC_A <= keycode) && (keycode <= KC_0)) {
- if (record->event.pressed)
- if (!process_record_glyph_replacement(keycode, record,
- unicode_lut_translator_aussie)) {
- tap_code16_nomods(KC_LEFT);
- return false;
- }
- } else if (record->event.pressed && keycode == KC_SPACE) {
- tap_code16_nomods(KC_SPACE);
- tap_code16_nomods(KC_LEFT);
- return false;
- } else if (record->event.pressed && keycode == KC_ENTER) {
- tap_code16_nomods(KC_END);
- tap_code16_nomods(KC_ENTER);
- return false;
- } else if (record->event.pressed && keycode == KC_HOME) {
- tap_code16_nomods(KC_END);
- return false;
- } else if (record->event.pressed && keycode == KC_END) {
- tap_code16_nomods(KC_HOME);
- return false;
- } else if (record->event.pressed && keycode == KC_BSPC) {
- tap_code16_nomods(KC_DEL);
- return false;
- } else if (record->event.pressed && keycode == KC_DEL) {
- tap_code16_nomods(KC_BSPC);
- return false;
- } else if (record->event.pressed && keycode == KC_QUOT) {
- tap_unicode_glyph_nomods(is_shifted ? 0x201E : 0x201A);
- tap_code16_nomods(KC_LEFT);
- return false;
- } else if (record->event.pressed && keycode == KC_COMMA) {
- tap_unicode_glyph_nomods(is_shifted ? '<' : 0x2018);
- tap_code16_nomods(KC_LEFT);
- return false;
- } else if (record->event.pressed && keycode == KC_DOT) {
- tap_unicode_glyph_nomods(is_shifted ? '>' : 0x02D9);
- tap_code16_nomods(KC_LEFT);
- return false;
- } else if (record->event.pressed && keycode == KC_SLASH) {
- tap_unicode_glyph_nomods(is_shifted ? 0x00BF : '/');
- tap_code16_nomods(KC_LEFT);
- return false;
- }
- return true;
-}
-
-bool process_record_zalgo(uint16_t keycode, keyrecord_t *record) {
- if ((KC_A <= keycode) && (keycode <= KC_0)) {
- if (record->event.pressed) {
- tap_code16_nomods(keycode);
- int num = (rand() % (8 + 1 - 2)) + 2;
- for (int i = 0; i < num; i++) {
- uint16_t hex = (rand() % (0x036F + 1 - 0x0300)) + 0x0300;
- register_unicode(hex);
- }
- return false;
- }
- }
- return true;
-}
-
-bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case UC_NOMODE ... UC_SUPER:
- if (record->event.pressed) {
- if (typing_mode != keycode - UC_NOMODE)
- typing_mode = keycode - UC_NOMODE;
- else
- typing_mode = NOMODE;
- }
- break;
- }
- if (((get_mods()) & ~MOD_MASK_SHIFT) != 0)
- return true;
- if (((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
- (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) &&
- record->tap.count)
- keycode &= 0xFF;
- if (typing_mode == WIDE) {
- if (((KC_A <= keycode) && (keycode <= KC_0)) || keycode == KC_SPACE)
- return process_record_glyph_replacement(keycode, record,
- unicode_range_translator_wide);
- } else if (typing_mode == SCRIPT) {
- if (((KC_A <= keycode) && (keycode <= KC_0)) || keycode == KC_SPACE)
- return process_record_glyph_replacement(keycode, record,
- unicode_range_translator_script);
- } else if (typing_mode == BLOCKS) {
- if (((KC_A <= keycode) && (keycode <= KC_0)) || keycode == KC_SPACE)
- return process_record_glyph_replacement(keycode, record,
- unicode_range_translator_boxes);
- } else if (typing_mode == REGIONAL) {
- if (((KC_A <= keycode) && (keycode <= KC_0)) || keycode == KC_SPACE) {
- if (!process_record_glyph_replacement(
- keycode, record, unicode_range_translator_regional)) {
- wait_us(500);
- tap_unicode_glyph_nomods(0x200C);
- return false;
- }
- }
- } else if (typing_mode == SUPER) {
- if (((KC_A <= keycode) && (keycode <= KC_0)))
- return process_record_glyph_replacement(keycode, record,
- unicode_lut_translator_super);
- } else if (typing_mode == AUSSIE)
- return process_record_aussie(keycode, record);
- else if (typing_mode == ZALGO)
- return process_record_zalgo(keycode, record);
- return true;
-}
