diff options
Diffstat (limited to 'quantum/action.c')
| -rw-r--r-- | quantum/action.c | 83 | 
1 files changed, 45 insertions, 38 deletions
| diff --git a/quantum/action.c b/quantum/action.c index be135f18f2..208690f5e4 100644 --- a/quantum/action.c +++ b/quantum/action.c @@ -782,9 +782,10 @@ void register_code(uint8_t code) {      }  #endif -    else if IS_KEY (code) { -        // TODO: should push command_proc out of this block? -        if (command_proc(code)) return; +    else if +        IS_KEY(code) { +            // TODO: should push command_proc out of this block? +            if (command_proc(code)) return;  #ifndef NO_ACTION_ONESHOT  /* TODO: remove @@ -801,33 +802,35 @@ void register_code(uint8_t code) {          } else  */  #endif -        { -            // Force a new key press if the key is already pressed -            // without this, keys with the same keycode, but different -            // modifiers will be reported incorrectly, see issue #1708 -            if (is_key_pressed(keyboard_report, code)) { -                del_key(code); +            { +                // Force a new key press if the key is already pressed +                // without this, keys with the same keycode, but different +                // modifiers will be reported incorrectly, see issue #1708 +                if (is_key_pressed(keyboard_report, code)) { +                    del_key(code); +                    send_keyboard_report(); +                } +                add_key(code);                  send_keyboard_report();              } -            add_key(code); +        } +    else if +        IS_MOD(code) { +            add_mods(MOD_BIT(code));              send_keyboard_report();          } -    } else if IS_MOD (code) { -        add_mods(MOD_BIT(code)); -        send_keyboard_report(); -    }  #ifdef EXTRAKEY_ENABLE -    else if IS_SYSTEM (code) { -        host_system_send(KEYCODE2SYSTEM(code)); -    } else if IS_CONSUMER (code) { -        host_consumer_send(KEYCODE2CONSUMER(code)); -    } +    else if +        IS_SYSTEM(code) { host_system_send(KEYCODE2SYSTEM(code)); } +    else if +        IS_CONSUMER(code) { host_consumer_send(KEYCODE2CONSUMER(code)); }  #endif  #ifdef MOUSEKEY_ENABLE -    else if IS_MOUSEKEY (code) { -        mousekey_on(code); -        mousekey_send(); -    } +    else if +        IS_MOUSEKEY(code) { +            mousekey_on(code); +            mousekey_send(); +        }  #endif  } @@ -872,22 +875,26 @@ void unregister_code(uint8_t code) {      }  #endif -    else if IS_KEY (code) { -        del_key(code); -        send_keyboard_report(); -    } else if IS_MOD (code) { -        del_mods(MOD_BIT(code)); -        send_keyboard_report(); -    } else if IS_SYSTEM (code) { -        host_system_send(0); -    } else if IS_CONSUMER (code) { -        host_consumer_send(0); -    } +    else if +        IS_KEY(code) { +            del_key(code); +            send_keyboard_report(); +        } +    else if +        IS_MOD(code) { +            del_mods(MOD_BIT(code)); +            send_keyboard_report(); +        } +    else if +        IS_SYSTEM(code) { host_system_send(0); } +    else if +        IS_CONSUMER(code) { host_consumer_send(0); }  #ifdef MOUSEKEY_ENABLE -    else if IS_MOUSEKEY (code) { -        mousekey_off(code); -        mousekey_send(); -    } +    else if +        IS_MOUSEKEY(code) { +            mousekey_off(code); +            mousekey_send(); +        }  #endif  } | 
