From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
To: Bart Schaefer <schaefer@brasslantern.com>
Cc: "zsh-workers@zsh.org" <zsh-workers@zsh.org>
Subject: Re: Incorrect cursor position when ZLE_RPROMPT_INDENT=0 (with a fix)
Date: Sun, 19 May 2019 20:51:40 +0200 [thread overview]
Message-ID: <CAN=4vMqaGT+baaxJsGS1TC9Y9EER3_sRiQn-AM2LkQ=cVp=1Dw@mail.gmail.com> (raw)
In-Reply-To: <CAN=4vMpWA+2zeRjthq4aeXyb7AAc40BpfEz8O0Uaj23a1O_F6Q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]
I've tested my patch on two more terminals: Dumb Linux terminal
(TERM=linux) and Command Prompt with WSL. On both of them ZSH misbehaves
without my patch and works correctly with it.
Roman.
On Sun, May 19, 2019 at 8:09 PM Roman Perepelitsa <
roman.perepelitsa@gmail.com> wrote:
> On Sun, May 19, 2019 at 7:34 PM Roman Perepelitsa <
> roman.perepelitsa@gmail.com> wrote:
>
>>
>> Do I understand you correctly that prior to my patch ZSH
>> handled ZLE_RPROMPT_INDENT=0 correctly on terminals that do auto-wrap after
>> RPROMPT is written, but my patch broke them? If so, could point me to such
>> a terminal? It would be very helpful. I realize that you've had this
>> discussion a million times and I appreciate your patience.
>>
>
> Answered my own question. My patch adds an extra space on Mac Terminal.
> I've now changed it slightly so that it works correctly on GNOME Terminal
> and Mac Terminal. Here's the additional change I've made:
>
> diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
> index 1f293845f..85e55e0d4 100644
> --- a/Src/Zle/zle_refresh.c
> +++ b/Src/Zle/zle_refresh.c
> @@ -1678,7 +1678,12 @@ zrefresh(void)
>
> moveto(0, winw - rprompt_off - rpromptw);
> zputs(rpromptbuf, shout);
> - vcs = winw - rprompt_off;
> + if (rprompt_off) {
> + vcs = winw - rprompt_off;
> + } else {
> + zputc(&zr_cr);
> + vcs = 0;
> + }
> /* reset character attributes to that set by the main prompt */
> txtchange = pmpt_attr;
> /*
>
> You can see the whole diff here:
> https://github.com/zsh-users/zsh/compare/master...romkatv:rprompt-indent2.
>
> If anyone can point me to a terminal on which this doesn't work, I'll be
> happy to debug and educate myself.
>
> Roman.
>
>>
next prev parent reply other threads:[~2019-05-19 18:52 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-19 15:38 Roman Perepelitsa
2019-05-19 15:41 ` Roman Perepelitsa
2019-05-19 17:04 ` Bart Schaefer
2019-05-19 17:34 ` Roman Perepelitsa
2019-05-19 18:09 ` Roman Perepelitsa
2019-05-19 18:51 ` Roman Perepelitsa [this message]
2019-05-19 20:12 ` Bart Schaefer
2019-05-19 21:07 ` Roman Perepelitsa
2019-05-20 8:21 ` Yannic Schröder
2019-05-20 8:36 ` Roman Perepelitsa
2019-05-20 10:21 ` Charles Blake
2019-05-20 10:46 ` Roman Perepelitsa
2019-05-20 11:06 ` Daniel Shahaf
2019-05-20 11:07 ` Charles Blake
2019-05-20 11:11 ` Peter Stephenson
2019-05-20 11:32 ` Roman Perepelitsa
2019-05-20 12:41 ` Charles Blake
2019-05-20 13:16 ` Roman Perepelitsa
[not found] ` <CAKiz1a-nOkAe42JoxFRgMJ+LXZ3fgMxqgwNZOW+2Y45oqzu8hA@mail.gmail.com>
2019-05-20 13:55 ` Roman Perepelitsa
2019-05-23 5:48 ` Roman Perepelitsa
2019-05-23 21:36 ` Daniel Shahaf
2019-05-23 22:52 ` Roman Perepelitsa
2019-05-24 12:18 ` Daniel Shahaf
2019-05-27 15:36 ` Roman Perepelitsa
2019-05-27 21:51 ` Peter Stephenson
2019-05-28 8:44 ` Peter Stephenson
2019-05-28 8:46 ` Roman Perepelitsa
2019-05-28 14:26 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAN=4vMqaGT+baaxJsGS1TC9Y9EER3_sRiQn-AM2LkQ=cVp=1Dw@mail.gmail.com' \
--to=roman.perepelitsa@gmail.com \
--cc=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).