fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename utf8_ord() to utf8_decode()

Browse Source 
Purely for readability and in preparation for the counterpart utf8_encode().

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen 2018-05-28 21:07:49 +02:00 committed by Lukas Fleischer
parent 30f411257a
commit 431e4a00e7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calcurse.h
View File

@ -1115,7 +1115,7 @@ int ui_todo_get_view(void);
void ui_todo_set_view(int); void ui_todo_set_view(int);
/* utf8.c */ /* utf8.c */
int utf8_ord(const char *); int utf8_decode(const char *);
int utf8_width(char *); int utf8_width(char *);
int utf8_strwidth(char *); int utf8_strwidth(char *);
int utf8_chop(char *, int); int utf8_chop(char *, int);

2
src/keys.c
View File

@ -266,7 +266,7 @@ int keys_wgetch(WINDOW *win)
buf[0] = ch; buf[0] = ch;
for (i = 1; i < UTF8_LENGTH(buf[0]); i++) for (i = 1; i < UTF8_LENGTH(buf[0]); i++)
buf[i] = wgetch(win); buf[i] = wgetch(win);
return utf8_ord(buf) + KEY_MAX; return utf8_decode(buf) + KEY_MAX;
} }
void keys_wait_for_any_key(WINDOW *win) void keys_wait_for_any_key(WINDOW *win)

4
src/utf8.c
View File

@ -270,7 +270,7 @@ static const struct utf8_range utf8_widthtab[] = {
}; };
/* Decode a UTF-8 encoded character. Return the Unicode code point. */ /* Decode a UTF-8 encoded character. Return the Unicode code point. */
int utf8_ord(const char *s) int utf8_decode(const char *s)
{ {
if (UTF8_ISCONT(*s)) if (UTF8_ISCONT(*s))
return -1; return -1;
@ -298,7 +298,7 @@ int utf8_width(char *s)
if (UTF8_ISCONT(*s)) if (UTF8_ISCONT(*s))
return 0; return 0;
val = utf8_ord(s); val = utf8_decode(s);
low = 0; low = 0;
high = ARRAY_SIZE(utf8_widthtab); high = ARRAY_SIZE(utf8_widthtab);
do { do {