diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2006-07-10 17:12:42 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2006-07-10 17:12:42 +0000 |
| commit | 9deb25528007f7ee6cba514f7666971ee1036865 (patch) | |
| tree | 0ba16b1a8fd2b38353388bff51a19fae93837b51 /bin/ksh | |
| parent | 8778ad3b0015df6a1388a98de3796032d45eaa49 (diff) | |
fix ksh prompt wrapping, from Marcus Glocker <marcus@nazgul.ch>.
tested by me and naddy, and others...
ok naddy@ and me.
Diffstat (limited to 'bin/ksh')
| -rw-r--r-- | bin/ksh/emacs.c | 25 | ||||
| -rw-r--r-- | bin/ksh/lex.c | 4 |
2 files changed, 24 insertions, 5 deletions
diff --git a/bin/ksh/emacs.c b/bin/ksh/emacs.c index d6c01cc0277..6d75da59621 100644 --- a/bin/ksh/emacs.c +++ b/bin/ksh/emacs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emacs.c,v 1.39 2005/09/26 19:25:22 otto Exp $ */ +/* $OpenBSD: emacs.c,v 1.40 2006/07/10 17:12:41 beck Exp $ */ /* * Emacs-like command line editing and history @@ -106,6 +106,7 @@ static int killsp, killtp; static int x_curprefix; static char *macroptr; static int prompt_skip; +static int prompt_redraw; static int x_ins(char *); static void x_delete(int, int); @@ -326,10 +327,19 @@ x_emacs(char *buf, size_t len) x_col = promptlen(prompt, &p); prompt_skip = p - prompt; x_adj_ok = 1; + prompt_redraw = 1; + if (x_col > xx_cols) + x_col = x_col - (x_col / xx_cols) * xx_cols; x_displen = xx_cols - 2 - x_col; x_adj_done = 0; pprompt(prompt, 0); + if (x_displen < 1) { + x_col = 0; + x_displen = xx_cols - 2; + x_e_putc('\n'); + prompt_redraw = 0; + } if (x_nextcmd >= 0) { int off = source->line - x_nextcmd; @@ -985,7 +995,7 @@ x_draw_line(int c) static void x_redraw(int limit) { - int i, j; + int i, j, truncate = 0; char *cp; x_adj_ok = 0; @@ -995,10 +1005,19 @@ x_redraw(int limit) x_e_putc('\r'); x_flush(); if (xbp == xbuf) { - pprompt(prompt + prompt_skip, 0); x_col = promptlen(prompt, (const char **) 0); + if (x_col > xx_cols) + truncate = (x_col / xx_cols) * xx_cols; + if (prompt_redraw) + pprompt(prompt + prompt_skip, truncate); } + if (x_col > xx_cols) + x_col = x_col - (x_col / xx_cols) * xx_cols; x_displen = xx_cols - 2 - x_col; + if (x_displen < 1) { + x_col = 0; + x_displen = xx_cols - 2; + } xlp_valid = false; cp = x_lastcp(); x_zots(xbp); diff --git a/bin/ksh/lex.c b/bin/ksh/lex.c index 75b44539f66..4340f79f828 100644 --- a/bin/ksh/lex.c +++ b/bin/ksh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.41 2006/06/16 20:34:22 drahn Exp $ */ +/* $OpenBSD: lex.c,v 1.42 2006/07/10 17:12:41 beck Exp $ */ /* * lexical analysis and source input @@ -1414,7 +1414,7 @@ dopprompt(const char *sp, int ntruncate, const char **spp, int doprint) totlen += len; continue; } - if (ntruncate) + if (counting && ntruncate) --ntruncate; else if (doprint) { shf_putc(c, shl_out); |