ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

store multibyte characters in dynamically allocated arrays of MB_CUR_MAX 

length, and add a few comment fixes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2174 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-12-07 21:23:39 +00:00
parent 91851f3e60
commit 43953bba6f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nano.c
View File

@ -3567,14 +3567,15 @@ void do_output(int *kbinput, size_t kbinput_len)
/* Do we have to call edit_refresh(), or can we get away with /* Do we have to call edit_refresh(), or can we get away with
* update_line()? */ * update_line()? */
char key[ char *key = charalloc(
#ifdef NANO_WIDE #ifdef NANO_WIDE
MB_LEN_MAX MB_CUR_MAX
#else #else
1 1
#endif #endif
]; /* The current character we have. */ ); /* The current multibyte character we have. */
int key_len; /* The length of the current character. */ int key_len; /* The length of the current multibyte
* character. */
assert(current != NULL && current->data != NULL); assert(current != NULL && current->data != NULL);
@ -3635,6 +3636,8 @@ void do_output(int *kbinput, size_t kbinput_len)
#endif #endif
{ {
/* FIXME: The movement functions should take multibyte
* characters into account. */
int j; int j;
for (j = 0; j < key_len; j++) for (j = 0; j < key_len; j++)
do_right(FALSE); do_right(FALSE);
@ -3662,6 +3665,8 @@ void do_output(int *kbinput, size_t kbinput_len)
#endif #endif
} }
free(key);
/* Turn constant cursor position display back on if it was on /* Turn constant cursor position display back on if it was on
* before. */ * before. */
if (old_constupdate) if (old_constupdate)

5
src/winio.c
View File

@ -263,17 +263,18 @@ void unget_input(buffer *input, size_t input_len)
#ifdef NANO_WIDE #ifdef NANO_WIDE
if (!ISSET(NO_UTF8)) { if (!ISSET(NO_UTF8)) {
size_t i; size_t i;
char *key = charalloc(MB_CUR_MAX);
/* Change all invalid wide character values to -1. */ /* Change all invalid wide character values to -1. */
for (i = 0; i < input_len; i++) { for (i = 0; i < input_len; i++) {
char key[MB_LEN_MAX];
if (!input[i].key_code) { if (!input[i].key_code) {
if (wctomb(key, input[i].key) == -1) if (wctomb(key, input[i].key) == -1)
input[i].key = -1; input[i].key = -1;
} }
} }
free(key);
/* Save all of the non-(-1) wide characters in another /* Save all of the non-(-1) wide characters in another
* buffer. */ * buffer. */
for (i = 0; i < input_len; i++) { for (i = 0; i < input_len; i++) {