Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH v3] prompt: support generic non-visible regions



readline uses \001 (start of header) and \002 (start of text) as markers
to delimit a non-visible character zone, which are necessary to
calculate the width of a prompt.

In zsh we do this with %{ and %}, but we could support
\001 and \002 as well, so that a function which generates output for
the prompt can use colors in a way that works for both bash and zsh.

This additionally has the benefit of allowing prompts without
PROMPT_PERCENT to use colors correctly.

Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---

Since v2 I added checks to allow nesting of these non-visible regions as
Bart Schaefer suggested.

Interdiff against v2:
  diff --git a/Src/prompt.c b/Src/prompt.c
  index 803937029..ec74cc835 100644
  --- a/Src/prompt.c
  +++ b/Src/prompt.c
  @@ -887,11 +887,15 @@ putpromptchar(int doprint, int endchar, zattr *txtchangep)
   		}
   	    }
   	} else if(*bv->fm == 0x01) { // start non-visible characters
  -	    addbufspc(1);
  -	    *bv->bp++ = Inpar;
  +	    if (!bv->dontcount++) {
  +		addbufspc(1);
  +		*bv->bp++ = Inpar;
  +	    }
   	} else if(*bv->fm == 0x02) { // end non-visible characters
  -	    addbufspc(1);
  -	    *bv->bp++ = Outpar;
  +	    if (bv->dontcount && !--bv->dontcount) {
  +		addbufspc(1);
  +		*bv->bp++ = Outpar;
  +	    }
   	} else {
   	    char c = *bv->fm == Meta ? *++bv->fm ^ 32 : *bv->fm;
   

 Src/prompt.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Src/prompt.c b/Src/prompt.c
index 092de63a4..ec74cc835 100644
--- a/Src/prompt.c
+++ b/Src/prompt.c
@@ -886,6 +886,16 @@ putpromptchar(int doprint, int endchar, zattr *txtchangep)
 		    bv->bp += strlen(bv->bp);
 		}
 	    }
+	} else if(*bv->fm == 0x01) { // start non-visible characters
+	    if (!bv->dontcount++) {
+		addbufspc(1);
+		*bv->bp++ = Inpar;
+	    }
+	} else if(*bv->fm == 0x02) { // end non-visible characters
+	    if (bv->dontcount && !--bv->dontcount) {
+		addbufspc(1);
+		*bv->bp++ = Outpar;
+	    }
 	} else {
 	    char c = *bv->fm == Meta ? *++bv->fm ^ 32 : *bv->fm;
 
-- 
2.37.2.351.g9bf691b78c.dirty





Messages sorted by: Reverse Date, Date, Thread, Author