diff --git a/src/include/pv-internal.h b/src/include/pv-internal.h index 087b810..0d635a9 100644 --- a/src/include/pv-internal.h +++ b/src/include/pv-internal.h @@ -295,7 +295,7 @@ struct pvstate_s { bool colour_permitted; /* whether colour is permitted for this display */ bool sgr_code_active; /* set while SGR code is active in a display line */ bool final_update; /* set internally on the final update */ - bool display_visible; /* set once anything written to terminal */ + bool output_produced; /* set once anything written to terminal */ } display; diff --git a/src/pv/display.c b/src/pv/display.c index 52c0e26..9264164 100644 --- a/src/pv/display.c +++ b/src/pv/display.c @@ -57,7 +57,7 @@ void pv_error(pvstate_t state, char *format, ...) { va_list ap; - if (state->display.display_visible) + if (state->display.output_produced) fprintf(stderr, "\n"); fprintf(stderr, "%s: ", state->status.program_name); va_start(ap, format); @@ -1229,13 +1229,13 @@ void pv_display(pvstate_t state, bool final) } else if (state->control.cursor) { if (state->control.force || pv_in_foreground()) { pv_crs_update(state, state->display.display_buffer); - state->display.display_visible = true; + state->display.output_produced = true; } } else { if (state->control.force || pv_in_foreground()) { pv_tty_write(&(state->flags), state->display.display_buffer, state->display.display_string_bytes); pv_tty_write(&(state->flags), "\r", 1); - state->display.display_visible = true; + state->display.output_produced = true; } } @@ -1248,7 +1248,7 @@ void pv_display(pvstate_t state, bool final) pv_tty_write(&(state->flags), "\033]2;", 4); pv_tty_write(&(state->flags), state->extra_display.display_buffer, state->extra_display.display_string_bytes); pv_tty_write(&(state->flags), "\033\\", 2); - state->extra_display.display_visible = true; + state->extra_display.output_produced = true; debug("%s: [%s]", "windowtitle display", state->extra_display.display_buffer); } @@ -1256,7 +1256,7 @@ void pv_display(pvstate_t state, bool final) && (NULL != state->extra_display.display_buffer) ) { setproctitle("%s", state->extra_display.display_buffer); - state->extra_display.display_visible = true; + state->extra_display.output_produced = true; debug("%s: [%s]", "processtitle display", state->extra_display.display_buffer); } } diff --git a/src/pv/loop.c b/src/pv/loop.c index 1524d58..675eeca 100644 --- a/src/pv/loop.c +++ b/src/pv/loop.c @@ -394,7 +394,7 @@ int pv_main_loop(pvstate_t state) */ if (eof_in && eof_out && 0 == state->transfer.written_but_not_consumed) { final_update = true; - if ((state->display.display_visible) + if ((state->display.output_produced) || (state->control.delay_start < 0.001)) { pv_elapsedtime_copy(&next_update, &cur_time); } @@ -521,7 +521,7 @@ int pv_main_loop(pvstate_t state) pv_crs_fini(state); } else { if ((!state->control.numeric) && (!state->control.no_display) - && (state->display.display_visible)) + && (state->display.output_produced)) pv_tty_write(&(state->flags), "\n", 1); } diff --git a/src/pv/state.c b/src/pv/state.c index e5b454a..e84995e 100644 --- a/src/pv/state.c +++ b/src/pv/state.c @@ -59,10 +59,10 @@ void pv_state_reset(pvstate_t state) state->status.current_input_file = -1; state->display.initial_offset = 0; - state->display.display_visible = false; + state->display.output_produced = false; state->extra_display.initial_offset = 0; - state->extra_display.display_visible = false; + state->extra_display.output_produced = false; /* * Explicitly set important floating point values to 0, as memset()