Skip to content

Commit cd1096b

Browse files
szedergitster
authored andcommitted
pager: add a helper function to clear the last line in the terminal
There are a couple of places where we want to clear the last line on the terminal, e.g. when a progress bar line is overwritten by a shorter line, then the end of that progress line would remain visible, unless we cover it up. In 'progress.c' we did this by always appending a fixed number of space characters to the next line (even if it was not shorter than the previous), but as it turned out that fixed number was not quite large enough, see the fix in 9f1fd84 (progress: clear previous progress update dynamically, 2019-04-12). From then on we've been keeping track of the length of the last displayed progress line and appending the appropriate number of space characters to the next line, if necessary, but, alas, this approach turned out to be error prone, see the fix in 1aed1a5 (progress: avoid empty line when breaking the progress line, 2019-05-19). The next patch in this series is about to fix a case where we don't clear the last line, and on occasion do end up with such garbage at the end of the line. It would be great if we could do that without the need to deal with that without meticulously computing the necessary number of space characters. So add a helper function to clear the last line on the terminal using an ANSI escape sequence, which has the advantage to clear the whole line no matter how wide it is, even after the terminal width changed. Such an escape sequence is not available on dumb terminals, though, so in that case fall back to simply print a whole terminal width (as reported by term_columns()) worth of space characters. In 'editor.c' launch_specified_editor() already used this ANSI escape sequence, so replace it with a call to this function. Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 077b979 commit cd1096b

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

cache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,6 +1759,7 @@ void setup_pager(void);
17591759
int pager_in_use(void);
17601760
extern int pager_use_color;
17611761
int term_columns(void);
1762+
void term_clear_line(void);
17621763
int decimal_width(uintmax_t);
17631764
int check_pager_config(const char *cmd);
17641765
void prepare_pager_args(struct child_process *, const char *pager);

editor.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ static int launch_specified_editor(const char *editor, const char *path,
9696

9797
if (print_waiting_for_editor && !is_terminal_dumb())
9898
/*
99-
* Go back to the beginning and erase the entire line to
100-
* avoid wasting the vertical space.
99+
* Erase the entire line to avoid wasting the
100+
* vertical space.
101101
*/
102-
fputs("\r\033[K", stderr);
102+
term_clear_line();
103103
}
104104

105105
if (!buffer)

pager.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,26 @@ int term_columns(void)
177177
return term_columns_at_startup;
178178
}
179179

180+
/*
181+
* Clear the entire line, leave cursor in first column.
182+
*/
183+
void term_clear_line(void)
184+
{
185+
if (is_terminal_dumb())
186+
/*
187+
* Fall back to print a terminal width worth of space
188+
* characters (hoping that the terminal is still as wide
189+
* as it was upon the first call to term_columns()).
190+
*/
191+
fprintf(stderr, "\r%*s\r", term_columns(), "");
192+
else
193+
/*
194+
* On non-dumb terminals use an escape sequence to clear
195+
* the whole line, no matter how wide the terminal.
196+
*/
197+
fputs("\r\033[K", stderr);
198+
}
199+
180200
/*
181201
* How many columns do we need to show this number in decimal?
182202
*/

0 commit comments

Comments
 (0)