diff --git a/termkey.c b/termkey.c index 889dfad..20527a3 100644 --- a/termkey.c +++ b/termkey.c @@ -735,7 +735,7 @@ static void emit_codepoint(TermKey *tk, long codepoint, TermKeyKey *key) key->type = TERMKEY_TYPE_UNICODE; /* Generically modified Unicode ought not report the SHIFT state, or else * we get into complicationg trying to report Shift-; vs : and so on... - * In order to be able to represent Ctrl-Shift-A as CTRL modified + * In order to be able to represent Ctrl-Shift-A as CTRL modified * unicode A, we need to call Ctrl-A simply 'a', lowercase */ if(codepoint+0x40 >= 'A' && codepoint+0x40 <= 'Z') @@ -1268,7 +1268,7 @@ size_t termkey_strfkey(TermKey *tk, char *buffer, size_t len, TermKeyKey *key, T char sep = (format & TERMKEY_FORMAT_SPACEMOD) ? ' ' : '-'; - if(format & TERMKEY_FORMAT_CARETCTRL && + if(format & TERMKEY_FORMAT_CARETCTRL && key->type == TERMKEY_TYPE_UNICODE && key->modifiers == TERMKEY_KEYMOD_CTRL) { long codepoint = key->code.codepoint; diff --git a/termkey.h.in b/termkey.h.in index fe37cc7..5afe118 100644 --- a/termkey.h.in +++ b/termkey.h.in @@ -200,7 +200,7 @@ TermKeySym termkey_register_keyname(TermKey *tk, TermKeySym sym, const char *nam const char *termkey_get_keyname(TermKey *tk, TermKeySym sym); const char *termkey_lookup_keyname(TermKey *tk, const char *str, TermKeySym *sym); -TermKeySym termkey_keyname2sym(TermKey *tk, const char *keyname); +TermKeySym termkey_keyname2sym(TermKey *tk, const char *keyname); TermKeyResult termkey_interpret_mouse(TermKey *tk, const TermKeyKey *key, TermKeyMouseEvent *event, int *button, int *line, int *col);