summaryrefslogtreecommitdiff
path: root/quantum/process_keycode
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r--quantum/process_keycode/process_ucis.c120
-rw-r--r--quantum/process_keycode/process_ucis.h42
-rw-r--r--quantum/process_keycode/process_unicode.c1
-rw-r--r--quantum/process_keycode/process_unicode.h1
-rw-r--r--quantum/process_keycode/process_unicode_common.c15
-rw-r--r--quantum/process_keycode/process_unicode_common.h1
-rw-r--r--quantum/process_keycode/process_unicodemap.c35
-rw-r--r--quantum/process_keycode/process_unicodemap.h7
8 files changed, 37 insertions, 185 deletions
diff --git a/quantum/process_keycode/process_ucis.c b/quantum/process_keycode/process_ucis.c
index 3aa09d5948..91a038bab1 100644
--- a/quantum/process_keycode/process_ucis.c
+++ b/quantum/process_keycode/process_ucis.c
@@ -15,110 +15,30 @@
*/
#include "process_ucis.h"
-#include "unicode.h"
-#include "keycode.h"
-#include "wait.h"
+#include "ucis.h"
+#include "keycodes.h"
-ucis_state_t ucis_state;
-
-void ucis_start(void) {
- ucis_state.count = 0;
- ucis_state.in_progress = true;
-
- ucis_start_user();
-}
-
-__attribute__((weak)) void ucis_start_user(void) {
- register_unicode(0x2328); // ⌨
-}
-
-__attribute__((weak)) void ucis_success(uint8_t symbol_index) {}
-
-static bool is_uni_seq(char *seq) {
- uint8_t i;
- for (i = 0; seq[i]; i++) {
- uint16_t keycode;
- if ('1' <= seq[i] && seq[i] <= '0') {
- keycode = seq[i] - '1' + KC_1;
- } else {
- keycode = seq[i] - 'a' + KC_A;
- }
- if (i > ucis_state.count || ucis_state.codes[i] != keycode) {
+bool process_ucis(uint16_t keycode, keyrecord_t *record) {
+ if (ucis_active() && record->event.pressed) {
+ bool special = keycode == KC_SPACE || keycode == KC_ENTER || keycode == KC_ESCAPE || keycode == KC_BACKSPACE;
+ if (ucis_count() >= UCIS_MAX_INPUT_LENGTH && !special) {
return false;
}
- }
- return ucis_state.codes[i] == KC_ENTER || ucis_state.codes[i] == KC_SPACE;
-}
-
-__attribute__((weak)) void ucis_symbol_fallback(void) {
- for (uint8_t i = 0; i < ucis_state.count - 1; i++) {
- tap_code(ucis_state.codes[i]);
- }
-}
-
-__attribute__((weak)) void ucis_cancel(void) {}
-
-void register_ucis(const uint32_t *code_points) {
- for (int i = 0; i < UCIS_MAX_CODE_POINTS && code_points[i]; i++) {
- register_unicode(code_points[i]);
- }
-}
-bool process_ucis(uint16_t keycode, keyrecord_t *record) {
- if (!ucis_state.in_progress || !record->event.pressed) {
- return true;
- }
-
- bool special = keycode == KC_SPACE || keycode == KC_ENTER || keycode == KC_ESCAPE || keycode == KC_BACKSPACE;
- if (ucis_state.count >= UCIS_MAX_SYMBOL_LENGTH && !special) {
- return false;
- }
-
- ucis_state.codes[ucis_state.count] = keycode;
- ucis_state.count++;
-
- switch (keycode) {
- case KC_BACKSPACE:
- if (ucis_state.count >= 2) {
- ucis_state.count -= 2;
- return true;
- } else {
- ucis_state.count--;
- return false;
- }
-
- case KC_SPACE:
- case KC_ENTER:
- case KC_ESCAPE:
- for (uint8_t i = 0; i < ucis_state.count; i++) {
- tap_code(KC_BACKSPACE);
- }
-
- if (keycode == KC_ESCAPE) {
- ucis_state.in_progress = false;
- ucis_cancel();
- return false;
- }
-
- uint8_t i;
- bool symbol_found = false;
- for (i = 0; ucis_symbol_table[i].symbol; i++) {
- if (is_uni_seq(ucis_symbol_table[i].symbol)) {
- symbol_found = true;
- register_ucis(ucis_symbol_table[i].code_points);
- break;
- }
+ if (!ucis_add(keycode)) {
+ switch (keycode) {
+ case KC_BACKSPACE:
+ return ucis_remove_last();
+ case KC_ESCAPE:
+ ucis_cancel();
+ return false;
+ case KC_SPACE:
+ case KC_ENTER:
+ ucis_finish();
+ return false;
}
- if (symbol_found) {
- ucis_success(i);
- } else {
- ucis_symbol_fallback();
- }
-
- ucis_state.in_progress = false;
- return false;
-
- default:
- return true;
+ }
}
+
+ return true;
}
diff --git a/quantum/process_keycode/process_ucis.h b/quantum/process_keycode/process_ucis.h
index 54eb9413d4..6282df7893 100644
--- a/quantum/process_keycode/process_ucis.h
+++ b/quantum/process_keycode/process_ucis.h
@@ -18,48 +18,6 @@
#include <stdbool.h>
#include <stdint.h>
-
#include "action.h"
-#ifndef UCIS_MAX_SYMBOL_LENGTH
-# define UCIS_MAX_SYMBOL_LENGTH 32
-#endif
-#ifndef UCIS_MAX_CODE_POINTS
-# define UCIS_MAX_CODE_POINTS 3
-#endif
-
-typedef struct {
- char * symbol;
- uint32_t code_points[UCIS_MAX_CODE_POINTS];
-} ucis_symbol_t;
-
-typedef struct {
- uint8_t count;
- uint16_t codes[UCIS_MAX_SYMBOL_LENGTH];
- bool in_progress : 1;
-} ucis_state_t;
-
-extern ucis_state_t ucis_state;
-
-// clang-format off
-
-#define UCIS_TABLE(...) \
- { \
- __VA_ARGS__, \
- { NULL, {} } \
- }
-#define UCIS_SYM(name, ...) \
- { name, {__VA_ARGS__} }
-
-// clang-format on
-
-extern const ucis_symbol_t ucis_symbol_table[];
-
-void ucis_start(void);
-void ucis_start_user(void);
-void ucis_symbol_fallback(void);
-void ucis_success(uint8_t symbol_index);
-
-void register_ucis(const uint32_t *code_points);
-
bool process_ucis(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index 1ec76245a3..8ee6fcd7fc 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -16,6 +16,7 @@
#include "process_unicode.h"
#include "unicode.h"
+#include "keycodes.h"
#include "quantum_keycodes.h"
bool process_unicode(uint16_t keycode, keyrecord_t *record) {
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 341bc8d861..9a51ffaf7c 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -18,7 +18,6 @@
#include <stdbool.h>
#include <stdint.h>
-
#include "action.h"
bool process_unicode(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index a0b9010027..f43770977a 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -17,7 +17,8 @@
#include "process_unicode_common.h"
#include "unicode.h"
#include "action_util.h"
-#include "keycode.h"
+#include "keycodes.h"
+#include "modifiers.h"
#if defined(UNICODE_ENABLE)
# include "process_unicode.h"
@@ -32,10 +33,18 @@ bool process_unicode_common(uint16_t keycode, keyrecord_t *record) {
bool shifted = get_mods() & MOD_MASK_SHIFT;
switch (keycode) {
case QK_UNICODE_MODE_NEXT:
- cycle_unicode_input_mode(shifted ? -1 : +1);
+ if (shifted) {
+ unicode_input_mode_step_reverse();
+ } else {
+ unicode_input_mode_step();
+ }
break;
case QK_UNICODE_MODE_PREVIOUS:
- cycle_unicode_input_mode(shifted ? +1 : -1);
+ if (shifted) {
+ unicode_input_mode_step();
+ } else {
+ unicode_input_mode_step_reverse();
+ }
break;
case QK_UNICODE_MODE_MACOS:
set_unicode_input_mode(UNICODE_MODE_MACOS);
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index fd09a41818..0465830079 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -18,7 +18,6 @@
#include <stdbool.h>
#include <stdint.h>
-
#include "action.h"
bool process_unicode_common(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c
index 195c093e6e..a85568521c 100644
--- a/quantum/process_keycode/process_unicodemap.c
+++ b/quantum/process_keycode/process_unicodemap.c
@@ -15,41 +15,12 @@
*/
#include "process_unicodemap.h"
-#include "unicode.h"
-#include "quantum_keycodes.h"
-#include "keycode.h"
-#include "action_util.h"
-#include "host.h"
-
-__attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
- if (keycode >= QK_UNICODEMAP_PAIR) {
- // Keycode is a pair: extract index based on Shift / Caps Lock state
- uint16_t index;
-
- uint8_t mods = get_mods() | get_weak_mods();
-#ifndef NO_ACTION_ONESHOT
- mods |= get_oneshot_mods();
-#endif
-
- bool shift = mods & MOD_MASK_SHIFT;
- bool caps = host_keyboard_led_state().caps_lock;
- if (shift ^ caps) {
- index = QK_UNICODEMAP_PAIR_GET_SHIFTED_INDEX(keycode);
- } else {
- index = QK_UNICODEMAP_PAIR_GET_UNSHIFTED_INDEX(keycode);
- }
-
- return index;
- } else {
- // Keycode is a regular index
- return QK_UNICODEMAP_GET_INDEX(keycode);
- }
-}
+#include "unicodemap.h"
+#include "keycodes.h"
bool process_unicodemap(uint16_t keycode, keyrecord_t *record) {
if (keycode >= QK_UNICODEMAP && keycode <= QK_UNICODEMAP_PAIR_MAX && record->event.pressed) {
- uint32_t code_point = pgm_read_dword(unicode_map + unicodemap_index(keycode));
- register_unicode(code_point);
+ register_unicodemap(unicodemap_index(keycode));
}
return true;
}
diff --git a/quantum/process_keycode/process_unicodemap.h b/quantum/process_keycode/process_unicodemap.h
index 5a3aeb0000..f07082e9ef 100644
--- a/quantum/process_keycode/process_unicodemap.h
+++ b/quantum/process_keycode/process_unicodemap.h
@@ -18,11 +18,6 @@
#include <stdbool.h>
#include <stdint.h>
-
#include "action.h"
-#include "progmem.h"
-
-extern const uint32_t unicode_map[] PROGMEM;
-uint16_t unicodemap_index(uint16_t keycode);
-bool process_unicodemap(uint16_t keycode, keyrecord_t *record);
+bool process_unicodemap(uint16_t keycode, keyrecord_t *record);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 07:13:00 +0000