aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Remove state passed to wide char len check

Browse Source
This commit is contained in:
James Booth 2015-02-03 21:04:51 +00:00
parent 1c157b04df
commit 836fdd2eb1
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ui/inputwin.c
View File

@ -334,26 +334,6 @@ inp_win_resize(void)
_inp_win_update_virtual(); _inp_win_update_virtual();
} }
static int
offset_to_col(char *str, int offset)
{
int i = 0;
int col = 0;
mbstate_t internal;
while (i != offset && str[i] != '\n') {
gunichar uni = g_utf8_get_char(&str[i]);
size_t ch_len = mbrlen(&str[i], 4, &internal);
i += ch_len;
col++;
if (g_unichar_iswide(uni)) {
col++;
}
}
return col;
}
void void
inp_nonblocking(gboolean reset) inp_nonblocking(gboolean reset)
{ {
@ -406,6 +386,25 @@ inp_win_handle_scroll(void)
} }
} }
int
offset_to_col(char *str, int offset)
{
int i = 0;
int col = 0;
while (i < offset && str[i] != '\0') {
gunichar uni = g_utf8_get_char(&str[i]);
size_t ch_len = mbrlen(&str[i], 4, NULL);
i += ch_len;
col++;
if (g_unichar_iswide(uni)) {
col++;
}
}
return col;
}
void void
inp_write(char *line, int offset) inp_write(char *line, int offset)
{ {
@ -437,7 +436,6 @@ inp_readline(void)
} }
ui_reset_idle_time(); ui_reset_idle_time();
cons_show("");
inp_write(rl_line_buffer, rl_point); inp_write(rl_line_buffer, rl_point);
inp_nonblocking(TRUE); inp_nonblocking(TRUE);
} else { } else {