diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_refresh.c | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 44 |
3 files changed, 48 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index e9f3e0149..8bde1f2e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-01 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 21971: Src/Zle/zle_refresh.c, Src/Zle/zle_tricky.c: rewrite + pfxlen() for multibyte characters. + 2005-11-01 Peter Stephenson <pws@csr.com> * users/9604: Functions/Misc/run-help: enhanced to strip quotes diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c index 1342c2d64..fbf241919 100644 --- a/Src/Zle/zle_refresh.c +++ b/Src/Zle/zle_refresh.c @@ -934,7 +934,6 @@ singlelineout: #define tc_upcurs(X) (void) tcmultout(TCUP, TCMULTUP, (X)) #define tc_leftcurs(X) (void) tcmultout(TCLEFT, TCMULTLEFT, (X)) -/* TODO remove it when pfxlen is fixed */ static int wpfxlen(REFRESH_STRING s, REFRESH_STRING t) { @@ -1143,7 +1142,6 @@ refreshline(int ln) makes it cheaper to delete intermediate characters eg. oldline: hifoobar \ hopefully cheaper here to delete two newline: foobar / characters, then we have six matches */ - /* TODO replace wpfxlen back with pfxlen when the latter is fixed */ if (tccan(TCDEL)) { for (i = 1; *(ol + i); i++) if (tcdelcost(i) < wpfxlen(ol + i, nl)) { diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 57a465082..9985dd901 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1899,7 +1899,12 @@ docompletion(char *s, int lst, int incmd) return runhookdef(COMPLETEHOOK, (void *) &dat); } -/* Return the length of the common prefix of s and t. */ +/* + * Return the length of the common prefix of s and t. + * s and t are both metafied; the length returned is a raw byte count + * into both strings, excluding any common bytes that form less than + * a complete wide character. + */ /**/ mod_export int @@ -1907,9 +1912,46 @@ pfxlen(char *s, char *t) { int i = 0; +#ifdef MULTIBYTE_SUPPORT + wchar_t wc; + mbstate_t ps; + int ret, lasti = 0; + char inc; + + memset(&ps, 0, sizeof(mbstate_t)); + while (*s) { + if (*s == Meta) { + if (*t != Meta || t[1] != s[1]) + break; + inc = s[1] ^ 32; + i += 2; + s += 2; + t += 2; + } else { + if (*s != *t) + break; + inc = *s; + i++; + s++; + t++; + } + + ret = mbrtowc(&wc, &inc, 1, &ps); + if (ret == -1) { + /* error */ + break; + } else if (ret >= 0) { + /* successfully found complete character, record position */ + lasti = i; + } + /* Otherwise, not found a complete character: keep trying. */ + } + return lasti; +#else while (*s && *s == *t) s++, t++, i++; return i; +#endif } /* Return the length of the common suffix of s and t. */ |