From dffdeb50b79d3c623e2ed9fd1c1d82d6d0ae7bf0 Mon Sep 17 00:00:00 2001
From: coderkun <olli@coderkun.de>
Date: Sun, 21 Aug 2016 20:25:19 +0200
Subject: Add method to set Unicode input key for ISO 14755
https://github.com/jackhumbert/qmk_firmware/issues/672
---
quantum/process_keycode/process_unicode.c | 10 ++++++++--
quantum/process_keycode/process_unicode.h | 5 +++++
2 files changed, 13 insertions(+), 2 deletions(-)
(limited to 'quantum/process_keycode')
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index 72c809c30e..422217b6d1 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -1,6 +1,7 @@
#include "process_unicode.h"
static uint8_t input_mode;
+static uint16_t linux_key = UNICODE_LNX_KEY;
uint16_t hex_to_keycode(uint8_t hex)
{
@@ -18,6 +19,11 @@ void set_unicode_input_mode(uint8_t os_target)
input_mode = os_target;
}
+void set_unicode_input_key_lnx(uint16_t key)
+{
+ linux_key = key;
+}
+
void unicode_input_start (void) {
switch(input_mode) {
case UC_OSX:
@@ -26,8 +32,8 @@ void unicode_input_start (void) {
case UC_LNX:
register_code(KC_LCTL);
register_code(KC_LSFT);
- register_code(KC_U);
- unregister_code(KC_U);
+ register_code(linux_key);
+ unregister_code(linux_key);
unregister_code(KC_LSFT);
unregister_code(KC_LCTL);
break;
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 85364e8eb3..60a116ab74 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -8,11 +8,16 @@
#define UC_WIN 2
#define UC_BSD 3
+#ifndef UNICODE_LNX_KEY
+#define UNICODE_LNX_KEY KC_A
+#endif
+
#ifndef UNICODE_TYPE_DELAY
#define UNICODE_TYPE_DELAY 10
#endif
void set_unicode_input_mode(uint8_t os_target);
+void set_unicode_input_key_lnx(uint16_t linux_key);
void unicode_input_start(void);
void unicode_input_finish(void);
void register_hex(uint16_t hex);
--
cgit v1.2.3
From 81594c7883deefedbcd317c72c1b1f1d32e65cd7 Mon Sep 17 00:00:00 2001
From: coderkun <olli@coderkun.de>
Date: Sun, 21 Aug 2016 21:02:18 +0200
Subject: =?UTF-8?q?Drop=20method=20to=20set=20Unicode=20input=20key=20and?=
=?UTF-8?q?=20declare=20start=20and=20finish=20methods=20as=20=E2=80=9Cwea?=
=?UTF-8?q?k=E2=80=9D=20instead?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
quantum/process_keycode/process_unicode.c | 12 ++++--------
quantum/process_keycode/process_unicode.h | 5 -----
2 files changed, 4 insertions(+), 13 deletions(-)
(limited to 'quantum/process_keycode')
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index 422217b6d1..a1be8d2fc3 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -1,7 +1,6 @@
#include "process_unicode.h"
static uint8_t input_mode;
-static uint16_t linux_key = UNICODE_LNX_KEY;
uint16_t hex_to_keycode(uint8_t hex)
{
@@ -19,11 +18,7 @@ void set_unicode_input_mode(uint8_t os_target)
input_mode = os_target;
}
-void set_unicode_input_key_lnx(uint16_t key)
-{
- linux_key = key;
-}
-
+__attribute__((weak))
void unicode_input_start (void) {
switch(input_mode) {
case UC_OSX:
@@ -32,8 +27,8 @@ void unicode_input_start (void) {
case UC_LNX:
register_code(KC_LCTL);
register_code(KC_LSFT);
- register_code(linux_key);
- unregister_code(linux_key);
+ register_code(KC_U);
+ unregister_code(KC_U);
unregister_code(KC_LSFT);
unregister_code(KC_LCTL);
break;
@@ -46,6 +41,7 @@ void unicode_input_start (void) {
wait_ms(UNICODE_TYPE_DELAY);
}
+__attribute__((weak))
void unicode_input_finish (void) {
switch(input_mode) {
case UC_OSX:
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 60a116ab74..85364e8eb3 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -8,16 +8,11 @@
#define UC_WIN 2
#define UC_BSD 3
-#ifndef UNICODE_LNX_KEY
-#define UNICODE_LNX_KEY KC_A
-#endif
-
#ifndef UNICODE_TYPE_DELAY
#define UNICODE_TYPE_DELAY 10
#endif
void set_unicode_input_mode(uint8_t os_target);
-void set_unicode_input_key_lnx(uint16_t linux_key);
void unicode_input_start(void);
void unicode_input_finish(void);
void register_hex(uint16_t hex);
--
cgit v1.2.3
From a058ae40e268b34ba5db45f5fd5d557d50fa5437 Mon Sep 17 00:00:00 2001
From: Gergely Nagy <algernon@madhouse-project.org>
Date: Wed, 24 Aug 2016 15:39:23 +0200
Subject: quantum: Move qk_ucis_state to process_unicode.c
In order to not declare the same variable in multiple objects (which
happens when building UCIS-enabled keymap for both the ErgoDox EZ and
the ErgoDox Infinity), move the declaration to the .c file, and keep
only an extern reference in the header.
Many thanks to @fredizzimo for spotting the error in Travis, and
suggesting the fix.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
---
quantum/process_keycode/process_unicode.c | 2 ++
quantum/process_keycode/process_unicode.h | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
(limited to 'quantum/process_keycode')
diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c
index a1be8d2fc3..06c1694f2e 100644
--- a/quantum/process_keycode/process_unicode.c
+++ b/quantum/process_keycode/process_unicode.c
@@ -74,6 +74,8 @@ bool process_unicode(uint16_t keycode, keyrecord_t *record) {
}
#ifdef UCIS_ENABLE
+qk_ucis_state_t qk_ucis_state;
+
void qk_ucis_start(void) {
qk_ucis_state.count = 0;
qk_ucis_state.in_progress = true;
diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h
index 85364e8eb3..02ce3dd7e0 100644
--- a/quantum/process_keycode/process_unicode.h
+++ b/quantum/process_keycode/process_unicode.h
@@ -29,11 +29,13 @@ typedef struct {
char *code;
} qk_ucis_symbol_t;
-struct {
+typedef struct {
uint8_t count;
uint16_t codes[UCIS_MAX_SYMBOL_LENGTH];
bool in_progress:1;
-} qk_ucis_state;
+} qk_ucis_state_t;
+
+extern qk_ucis_state_t qk_ucis_state;
#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}}
#define UCIS_SYM(name, code) {name, #code}
--
cgit v1.2.3