diff options
| author | Xyverz <[email protected]> | 2016-08-17 23:53:56 -0700 | 
|---|---|---|
| committer | Xyverz <[email protected]> | 2016-08-17 23:53:56 -0700 | 
| commit | 385b827c858d492e8ebafd85bac32ab738292d41 (patch) | |
| tree | 169024032cff358909387b08ad31fed4ceee8617 /quantum/process_keycode | |
| parent | 5c5c3e626b7f2e4a5835988c069c7154f347c4ca (diff) | |
| parent | 8144ce8852f690d5772d80ed2b96ae4af201e266 (diff) | |
| download | qmk_firmware-385b827c858d492e8ebafd85bac32ab738292d41.tar.gz qmk_firmware-385b827c858d492e8ebafd85bac32ab738292d41.zip | |
Merge remote-tracking branch 'upstream/master'
this merge is necessary,
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 122 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 9 | ||||
| -rw-r--r-- | quantum/process_keycode/process_unicode.c | 203 | ||||
| -rw-r--r-- | quantum/process_keycode/process_unicode.h | 38 | 
4 files changed, 279 insertions, 93 deletions
| diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 5429e34383..e152f23508 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -1,18 +1,8 @@  #include "quantum.h" +#include "action_tapping.h" -static qk_tap_dance_state_t qk_tap_dance_state; -bool td_debug_enable = false; - -#if CONSOLE_ENABLE -#define td_debug(s) if (td_debug_enable) \ -    { \ -      xprintf ("D:tap_dance:%s:%s = { keycode = %d, count = %d, active = %d, pressed = %d }\n", __FUNCTION__, s, \ -               qk_tap_dance_state.keycode, qk_tap_dance_state.count, \ -               qk_tap_dance_state.active, qk_tap_dance_state.pressed);  \ -    } -#else -#define td_debug(s) -#endif +static uint16_t last_td; +static int8_t highest_td = -1;  void qk_tap_dance_pair_finished (qk_tap_dance_state_t *state, void *user_data) {    qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; @@ -35,98 +25,110 @@ void qk_tap_dance_pair_reset (qk_tap_dance_state_t *state, void *user_data) {  }  static inline void _process_tap_dance_action_fn (qk_tap_dance_state_t *state, -                                          void *user_data, -                                          qk_tap_dance_user_fn_t fn) +                                                 void *user_data, +                                                 qk_tap_dance_user_fn_t fn)  {    if (fn) {      fn(state, user_data);    }  } -static inline void process_tap_dance_action_on_each_tap (qk_tap_dance_action_t action) +static inline void process_tap_dance_action_on_each_tap (qk_tap_dance_action_t *action)  { -  td_debug("trigger"); -  _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_each_tap); +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_each_tap);  } -static inline void process_tap_dance_action_on_dance_finished (qk_tap_dance_action_t action) +static inline void process_tap_dance_action_on_dance_finished (qk_tap_dance_action_t *action)  { -  td_debug("trigger"); -  _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_dance_finished); +  if (action->state.finished) +    return; +  action->state.finished = true; +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_dance_finished);  } -static inline void process_tap_dance_action_on_reset (qk_tap_dance_action_t action) +static inline void process_tap_dance_action_on_reset (qk_tap_dance_action_t *action)  { -  td_debug("trigger") -  _process_tap_dance_action_fn (&qk_tap_dance_state, action.user_data, action.fn.on_reset); +  _process_tap_dance_action_fn (&action->state, action->user_data, action->fn.on_reset);  }  bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { -  bool r = true;    uint16_t idx = keycode - QK_TAP_DANCE; -  qk_tap_dance_action_t action; +  qk_tap_dance_action_t *action; + +  if (last_td && last_td != keycode) { +    (&tap_dance_actions[last_td - QK_TAP_DANCE])->state.interrupted = true; +  }    switch(keycode) {    case QK_TAP_DANCE ... QK_TAP_DANCE_MAX: -    action = tap_dance_actions[idx]; - -    process_tap_dance_action_on_each_tap (action); -    if (qk_tap_dance_state.keycode && qk_tap_dance_state.keycode != keycode) { -      process_tap_dance_action_on_dance_finished (action); -    } else if (qk_tap_dance_state.active && qk_tap_dance_state.pressed) { -      reset_tap_dance (&qk_tap_dance_state); -    } else { -      r = false; -    } +    if ((int16_t)idx > highest_td) +      highest_td = idx; +    action = &tap_dance_actions[idx]; -    qk_tap_dance_state.active = true; -    qk_tap_dance_state.pressed = record->event.pressed; +    action->state.keycode = keycode; +    action->state.pressed = record->event.pressed;      if (record->event.pressed) { -      qk_tap_dance_state.keycode = keycode; -      qk_tap_dance_state.timer = timer_read (); -      qk_tap_dance_state.count++; +      action->state.count++; +      action->state.timer = timer_read(); + +      if (last_td && last_td != keycode) { +        qk_tap_dance_action_t *paction = &tap_dance_actions[last_td - QK_TAP_DANCE]; +        paction->state.interrupted = true; +        process_tap_dance_action_on_dance_finished (paction); +        reset_tap_dance (&paction->state); +      }      } +    last_td = keycode; +      break;    default: -    if (qk_tap_dance_state.keycode) { -      // if we are here, the tap dance was interrupted by a different key -      idx = qk_tap_dance_state.keycode - QK_TAP_DANCE; -      action = tap_dance_actions[idx]; +    if (!record->event.pressed) +      return true; + +    if (highest_td == -1) +      return true; -      process_tap_dance_action_on_each_tap (action); +    for (int i = 0; i <= highest_td; i++) { +      action = &tap_dance_actions[i]; +      if (action->state.count == 0) +        continue; +      action->state.interrupted = true;        process_tap_dance_action_on_dance_finished (action); -      reset_tap_dance (&qk_tap_dance_state); -      qk_tap_dance_state.active = false; +      reset_tap_dance (&action->state);      }      break;    } -  return r; +  return true;  }  void matrix_scan_tap_dance () { -  if (qk_tap_dance_state.active && timer_elapsed (qk_tap_dance_state.timer) > TAPPING_TERM) { -    // if we are here, the tap dance was timed out -    uint16_t idx = qk_tap_dance_state.keycode - QK_TAP_DANCE; -    qk_tap_dance_action_t action = tap_dance_actions[idx]; +  if (highest_td == -1) +    return; + +  for (int i = 0; i <= highest_td; i++) { +    qk_tap_dance_action_t *action = &tap_dance_actions[i]; -    process_tap_dance_action_on_dance_finished (action); -    reset_tap_dance (&qk_tap_dance_state); +    if (action->state.count && timer_elapsed (action->state.timer) > TAPPING_TERM) { +      process_tap_dance_action_on_dance_finished (action); +      reset_tap_dance (&action->state); +    }    }  }  void reset_tap_dance (qk_tap_dance_state_t *state) { -  uint16_t idx = state->keycode - QK_TAP_DANCE; -  qk_tap_dance_action_t action; +  qk_tap_dance_action_t *action;    if (state->pressed)      return; -  action = tap_dance_actions[idx]; +  action = &tap_dance_actions[state->keycode - QK_TAP_DANCE]; +    process_tap_dance_action_on_reset (action); -  state->keycode = 0;    state->count = 0; -  state->active = false; +  state->interrupted = false; +  state->finished = false; +  last_td = 0;  } diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index 6a1258067e..d7b857bdc6 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -11,8 +11,9 @@ typedef struct    uint8_t count;    uint16_t keycode;    uint16_t timer; -  bool active:1; -  bool pressed:1; +  bool interrupted; +  bool pressed; +  bool finished;  } qk_tap_dance_state_t;  #define TD(n) (QK_TAP_DANCE + n) @@ -26,6 +27,7 @@ typedef struct      qk_tap_dance_user_fn_t on_dance_finished;      qk_tap_dance_user_fn_t on_reset;    } fn; +  qk_tap_dance_state_t state;    void *user_data;  } qk_tap_dance_action_t; @@ -48,8 +50,7 @@ typedef struct      .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_reset } \    } -extern const qk_tap_dance_action_t tap_dance_actions[]; -extern bool td_debug_enable; +extern qk_tap_dance_action_t tap_dance_actions[];  /* To be used internally */ diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c index 3fcac15ce3..72c809c30e 100644 --- a/quantum/process_keycode/process_unicode.c +++ b/quantum/process_keycode/process_unicode.c @@ -18,40 +18,187 @@ void set_unicode_input_mode(uint8_t os_target)    input_mode = os_target;  } +void unicode_input_start (void) { +  switch(input_mode) { +  case UC_OSX: +    register_code(KC_LALT); +    break; +  case UC_LNX: +    register_code(KC_LCTL); +    register_code(KC_LSFT); +    register_code(KC_U); +    unregister_code(KC_U); +    unregister_code(KC_LSFT); +    unregister_code(KC_LCTL); +    break; +  case UC_WIN: +    register_code(KC_LALT); +    register_code(KC_PPLS); +    unregister_code(KC_PPLS); +    break; +  } +  wait_ms(UNICODE_TYPE_DELAY); +} + +void unicode_input_finish (void) { +  switch(input_mode) { +  case UC_OSX: +  case UC_WIN: +    unregister_code(KC_LALT); +    break; +  case UC_LNX: +    register_code(KC_SPC); +    unregister_code(KC_SPC); +    break; +  } +} + +void register_hex(uint16_t hex) { +  for(int i = 3; i >= 0; i--) { +    uint8_t digit = ((hex >> (i*4)) & 0xF); +    register_code(hex_to_keycode(digit)); +    unregister_code(hex_to_keycode(digit)); +  } +} +  bool process_unicode(uint16_t keycode, keyrecord_t *record) {    if (keycode > QK_UNICODE && record->event.pressed) {      uint16_t unicode = keycode & 0x7FFF; -    switch(input_mode) { -      case UC_OSX: -        register_code(KC_LALT); -        break; -      case UC_LNX: -        register_code(KC_LCTL); -        register_code(KC_LSFT); -        register_code(KC_U); -        unregister_code(KC_U); -        break; -      case UC_WIN: -        register_code(KC_LALT); -        register_code(KC_PPLS); -        unregister_code(KC_PPLS); -        break; +    unicode_input_start(); +    register_hex(unicode); +    unicode_input_finish(); +  } +  return true; +} + +#ifdef UCIS_ENABLE +void qk_ucis_start(void) { +  qk_ucis_state.count = 0; +  qk_ucis_state.in_progress = true; + +  qk_ucis_start_user(); +} + +__attribute__((weak)) +void qk_ucis_start_user(void) { +  unicode_input_start(); +  register_hex(0x2328); +  unicode_input_finish(); +} + +static bool is_uni_seq(char *seq) { +  uint8_t i; + +  for (i = 0; seq[i]; i++) { +    uint16_t code; +    if (('1' <= seq[i]) && (seq[i] <= '0')) +      code = seq[i] - '1' + KC_1; +    else +      code = seq[i] - 'a' + KC_A; + +    if (i > qk_ucis_state.count || qk_ucis_state.codes[i] != code) +      return false; +  } + +  return (qk_ucis_state.codes[i] == KC_ENT || +          qk_ucis_state.codes[i] == KC_SPC); +} + +__attribute__((weak)) +void qk_ucis_symbol_fallback (void) { +  for (uint8_t i = 0; i < qk_ucis_state.count - 1; i++) { +    uint8_t code = qk_ucis_state.codes[i]; +    register_code(code); +    unregister_code(code); +    wait_ms(UNICODE_TYPE_DELAY); +  } +} + +void register_ucis(const char *hex) { +  for(int i = 0; hex[i]; i++) { +    uint8_t kc = 0; +    char c = hex[i]; + +    switch (c) { +    case '0': +      kc = KC_0; +      break; +    case '1' ... '9': +      kc = c - '1' + KC_1; +      break; +    case 'a' ... 'f': +      kc = c - 'a' + KC_A; +      break; +    case 'A' ... 'F': +      kc = c - 'A' + KC_A; +      break;      } -    for(int i = 3; i >= 0; i--) { -        uint8_t digit = ((unicode >> (i*4)) & 0xF); -        register_code(hex_to_keycode(digit)); -        unregister_code(hex_to_keycode(digit)); + +    if (kc) { +      register_code (kc); +      unregister_code (kc); +      wait_ms (UNICODE_TYPE_DELAY);      } -    switch(input_mode) { -      case UC_OSX: -      case UC_WIN: -        unregister_code(KC_LALT); -        break; -      case UC_LNX: -        unregister_code(KC_LCTL); -        unregister_code(KC_LSFT); +  } +} + +bool process_ucis (uint16_t keycode, keyrecord_t *record) { +  uint8_t i; + +  if (!qk_ucis_state.in_progress) +    return true; + +  if (qk_ucis_state.count >= UCIS_MAX_SYMBOL_LENGTH && +      !(keycode == KC_BSPC || keycode == KC_ESC || keycode == KC_SPC || keycode == KC_ENT)) { +    return false; +  } + +  if (!record->event.pressed) +    return true; + +  qk_ucis_state.codes[qk_ucis_state.count] = keycode; +  qk_ucis_state.count++; + +  if (keycode == KC_BSPC) { +    if (qk_ucis_state.count >= 2) { +      qk_ucis_state.count -= 2; +      return true; +    } else { +      qk_ucis_state.count--; +      return false; +    } +  } + +  if (keycode == KC_ENT || keycode == KC_SPC || keycode == KC_ESC) { +    bool symbol_found = false; + +    for (i = qk_ucis_state.count; i > 0; i--) { +      register_code (KC_BSPC); +      unregister_code (KC_BSPC); +      wait_ms(UNICODE_TYPE_DELAY); +    } + +    if (keycode == KC_ESC) { +      qk_ucis_state.in_progress = false; +      return false; +    } + +    unicode_input_start(); +    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 + 2);          break; +      }      } +    if (!symbol_found) { +      qk_ucis_symbol_fallback(); +    } +    unicode_input_finish(); + +    qk_ucis_state.in_progress = false; +    return false;    }    return true; -}
\ No newline at end of file +} +#endif diff --git a/quantum/process_keycode/process_unicode.h b/quantum/process_keycode/process_unicode.h index ca17f8f669..85364e8eb3 100644 --- a/quantum/process_keycode/process_unicode.h +++ b/quantum/process_keycode/process_unicode.h @@ -8,10 +8,46 @@  #define UC_WIN 2  #define UC_BSD 3 +#ifndef UNICODE_TYPE_DELAY +#define UNICODE_TYPE_DELAY 10 +#endif +  void set_unicode_input_mode(uint8_t os_target); +void unicode_input_start(void); +void unicode_input_finish(void); +void register_hex(uint16_t hex);  bool process_unicode(uint16_t keycode, keyrecord_t *record); +#ifdef UCIS_ENABLE +#ifndef UCIS_MAX_SYMBOL_LENGTH +#define UCIS_MAX_SYMBOL_LENGTH 32 +#endif + +typedef struct { +  char *symbol; +  char *code; +} qk_ucis_symbol_t; + +struct { +  uint8_t count; +  uint16_t codes[UCIS_MAX_SYMBOL_LENGTH]; +  bool in_progress:1; +} qk_ucis_state; + +#define UCIS_TABLE(...) {__VA_ARGS__, {NULL, NULL}} +#define UCIS_SYM(name, code) {name, #code} + +extern const qk_ucis_symbol_t ucis_symbol_table[]; + +void qk_ucis_start(void); +void qk_ucis_start_user(void); +void qk_ucis_symbol_fallback (void); +void register_ucis(const char *hex); +bool process_ucis (uint16_t keycode, keyrecord_t *record); + +#endif +  #define UC_BSPC	UC(0x0008)  #define UC_SPC	UC(0x0020) @@ -119,4 +155,4 @@ bool process_unicode(uint16_t keycode, keyrecord_t *record);  #define UC_TILD	UC(0x007E)  #define UC_DEL	UC(0x007F) -#endif
\ No newline at end of file +#endif | 
