diff options
| author | nicm <nicm> | 2015-11-14 11:45:43 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-11-14 11:45:43 +0000 |
| commit | 205d15e82d9e4aa90c7980b509d3489ad8eb6c2a (patch) | |
| tree | df0a0b3b1181ca5822722638eae32721d7711463 /key-string.c | |
| parent | f401791a5689799ddf3cfa6ecee7da60318febf7 (diff) | |
All these return values from utf8_* are confusing, use an enum.
Diffstat (limited to 'key-string.c')
| -rw-r--r-- | key-string.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/key-string.c b/key-string.c index ad7cbf50..9a44892d 100644 --- a/key-string.c +++ b/key-string.c @@ -144,10 +144,11 @@ key_string_lookup_string(const char *string) static const char *other = "!#()+,-.0123456789:;<=>?'\r\t"; key_code key; u_short u; - int size, more; + int size; key_code modifiers; struct utf8_data ud; u_int i; + enum utf8_state more; /* Is this a hexadecimal value? */ if (string[0] == '0' && string[1] == 'x') { @@ -173,13 +174,12 @@ key_string_lookup_string(const char *string) return (KEYC_NONE); } else { /* Try as a UTF-8 key. */ - if (utf8_open(&ud, (u_char)*string)) { + if ((more = utf8_open(&ud, (u_char)*string)) == UTF8_MORE) { if (strlen(string) != ud.size) return (KEYC_NONE); - more = 1; for (i = 1; i < ud.size; i++) more = utf8_append(&ud, (u_char)string[i]); - if (more != 0) + if (more != UTF8_DONE) return (KEYC_NONE); key = utf8_combine(&ud); return (key | modifiers); @@ -256,7 +256,7 @@ key_string_lookup_key(key_code key) /* Is this a UTF-8 key? */ if (key > 127 && key < KEYC_BASE) { - if (utf8_split(key, &ud) == 0) { + if (utf8_split(key, &ud) == UTF8_DONE) { memcpy(out, ud.data, ud.size); out[ud.size] = '\0'; return (out); |