Re: command line not refresh properly with wide chars when cursor would have been inside one

[Mikael Magnusson <mikachu@gmail.com>]

On 16 October 2010 14:36, Mikael Magnusson <mikachu@gmail.com> wrote:
> On 16 October 2010 13:21, Mikael Magnusson <mikachu@gmail.com> wrote:
>> zsh -f
>> % echo ののの
>> % uuuuuu<up>
>> % echo の    [cursor here]
>>
>> if you type one more (or less, or three or five more) letters, the
>> line refreshes properly, but when it would have ended up in the middle
>> of a wide char, the line gets cut off. This has bothered me for quite
>> some time but I've never been able to figure out the exact
>> circumstances before. Verified in latest cvs and 4.3.6 with -f.
>
> Actually the problem is when the previous line ends in a wide char in
> the new line, doesn't matter where the cursor is.
>
> Hmm, it seems the problem is somewhere in refreshline (surprise,
> right?). First all the characters of "echo の" are printed one by one,
> but then ol is advanced past the end of the old string "uuuuuu" and
> somehow after that are ののの which causes
>
> /* skip past all matching characters */
> for (; nl->chr && ZR_equal(*ol, *nl); nl++, ol++, ccs++)
>    ;
>
> to trigger, which is why the rest of the string isn't output. Why this
> happens is a bit of a mystery to me still.

This seems to fix the problem of skipping past the end of ol, but I'm
not sure if this is the exact spot that has a bug. I can't reproduce
my problem with this patch.

diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index d36febb..e3307ef 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -2107,7 +2107,9 @@ refreshline(int ln)
 	     * We check for WEOF inside.
 	     */
 	    zputc(nl);
-	    nl++, ol++;
+	    nl++;
+	    if (ol->chr)
+	      ol++;
 	    ccs++, vcs++;
 #ifdef MULTIBYTE_SUPPORT
 	    /*

-- 
Mikael Magnusson