andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

process_unicode: Use uint32_t for UCIS purposes 

Use a single uint32_t to store the unicode of a symbol, instead of an
array of uint16_ts.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
master
Gergely Nagy 2016-08-14 14:34:52 +02:00
parent 234dd276cf
commit a312cbf712
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
quantum/process_keycode/process_unicode.c
View File

@ -60,6 +60,14 @@ void register_hex(uint16_t hex) {
} }
} }
void register_hex32(uint32_t hex) {
for(int i = 7; i >= 0; i--) {
uint8_t digit = ((hex >> (i*8)) & 0xF);
register_code(hex_to_keycode(digit));
unregister_code(hex_to_keycode(digit));
}
}
bool process_unicode(uint16_t keycode, keyrecord_t *record) { bool process_unicode(uint16_t keycode, keyrecord_t *record) {
if (keycode > QK_UNICODE && record->event.pressed) { if (keycode > QK_UNICODE && record->event.pressed) {
uint16_t unicode = keycode & 0x7FFF; uint16_t unicode = keycode & 0x7FFF;
@ -156,9 +164,7 @@ bool process_ucis (uint16_t keycode, keyrecord_t *record) {
for (i = 0; ucis_symbol_table[i].symbol; i++) { for (i = 0; ucis_symbol_table[i].symbol; i++) {
if (is_uni_seq (ucis_symbol_table[i].symbol)) { if (is_uni_seq (ucis_symbol_table[i].symbol)) {
symbol_found = true; symbol_found = true;
for (uint8_t j = 0; ucis_symbol_table[i].codes[j]; j++) { register_hex32(ucis_symbol_table[i].code);
register_hex(ucis_symbol_table[i].codes[j]);
}
break; break;
} }
} }

7
quantum/process_keycode/process_unicode.h
View File

@ -12,6 +12,7 @@ void set_unicode_input_mode(uint8_t os_target);
void unicode_input_start(void); void unicode_input_start(void);
void unicode_input_finish(void); void unicode_input_finish(void);
void register_hex(uint16_t hex); void register_hex(uint16_t hex);
void register_hex32(uint32_t hex);
bool process_unicode(uint16_t keycode, keyrecord_t *record); bool process_unicode(uint16_t keycode, keyrecord_t *record);
@ -22,7 +23,7 @@ bool process_unicode(uint16_t keycode, keyrecord_t *record);
typedef struct { typedef struct {
char *symbol; char *symbol;
uint16_t codes[4]; uint32_t code;
} qk_ucis_symbol_t; } qk_ucis_symbol_t;
struct { struct {
@ -31,8 +32,8 @@ struct {
bool in_progress:1; bool in_progress:1;
} qk_ucis_state; } qk_ucis_state;
#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, {}}} #define UCIS_TABLE(...) {__VA_ARGS__, {NULL, 0}}
#define UCIS_SYM(name, ...) {name, {__VA_ARGS__, 0}} #define UCIS_SYM(name, code) {name, code}
extern const qk_ucis_symbol_t ucis_symbol_table[]; extern const qk_ucis_symbol_t ucis_symbol_table[];