summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorGergely Nagy <algernon@madhouse-project.org>2016-08-13 11:14:42 +0200
committerGergely Nagy <algernon@madhouse-project.org>2016-08-15 10:08:53 +0200
commit857aa5bef6a74f8785a7039feea5286c07bf7067 (patch)
tree5b6df0c634bf756874e61f3e2e968921cf139b08 /quantum
parent0b6861827faea747345ea38202d64c8004ab128c (diff)
downloadqmk_firmware-857aa5bef6a74f8785a7039feea5286c07bf7067.tar.gz
qmk_firmware-857aa5bef6a74f8785a7039feea5286c07bf7067.tar.xz
process_unicode: Call process_ucis() automatically
If UCIS is enabled, call process_ucis() automatically from process_record_quantum(). Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Diffstat (limited to 'quantum')
-rw-r--r--quantum/process_keycode/process_unicode.c2
-rw-r--r--quantum/process_keycode/process_unicode.h2
-rw-r--r--quantum/quantum.c3
3 files changed, 5 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index 851a96eaa..d71434411 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -107,7 +107,7 @@ void qk_ucis_symbol_fallback (void) {
}
}
-bool process_record_ucis (uint16_t keycode, keyrecord_t *record) {
+bool process_ucis (uint16_t keycode, keyrecord_t *record) {
uint8_t i;
if (!qk_ucis_state.in_progress)
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 372ea2f0d..c5005897e 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -38,7 +38,7 @@ extern const qk_ucis_symbol_t ucis_symbol_table[];
void qk_ucis_start(void);
void qk_ucis_symbol_fallback (void);
-bool process_record_ucis (uint16_t keycode, keyrecord_t *record);
+bool process_ucis (uint16_t keycode, keyrecord_t *record);
#endif
diff --git a/quantum/quantum.c b/quantum/quantum.c
index bc2da510f..a4c5c2ddb 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -87,6 +87,9 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef UNICODE_ENABLE
process_unicode(keycode, record) &&
#endif
+ #ifdef UCIS_ENABLE
+ process_ucis(keycode, record) &&
+ #endif
true)) {
return false;
}