mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct the width calculations.

Browse Source
This commit is contained in:
Andrew Wood
2024-12-13 20:54:11 +00:00
parent cb71277df4
commit 7a0ee9c7fa
1 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pv/format/progressbar.c
+27 -28
View File
@@ -127,19 +127,13 @@ static size_t pv_formatter_progress_knownsize(pvformatter_args_t args, char *buf
bar_area_width = args->segment->width - after_bar_width;
}
/*
* Make sure there is enough room in the buffer, even if all of the
* bar characters are very wide.
*/
if (4 * bar_area_width > buffer_size - 16)
bar_area_width = (buffer_size - 16) / 4;
filled_bar_width = (size_t) ((bar_area_width * bar_percentage) / 100);
/* Leave room for the tip of the bar. */
if (has_tip && filled_bar_width > 0)
filled_bar_width--;
filled_bar_width -= style->tip.width;
debug("width=%d bar_area_width=%d filled_bar_width=%d", args->segment->width, bar_area_width, filled_bar_width);
debug("width=%d bar_area_width=%d filled_bar_width=%d after_bar_width=%d", args->segment->width, bar_area_width,
filled_bar_width, after_bar_width);
buffer_offset = 0;
@@ -149,16 +143,18 @@ static size_t pv_formatter_progress_knownsize(pvformatter_args_t args, char *buf
}
/* The bar portion. */
for (pad_count = 0; pad_count < filled_bar_width && buffer_offset < buffer_size - 4; pad_count++) {
if (pad_count < bar_area_width) {
append_to_buffer(style->filler[full_cell_index]);
}
pad_count = 0;
while (pad_count < filled_bar_width && pad_count < bar_area_width) {
append_to_buffer(style->filler[full_cell_index]);
pad_count += style->filler[full_cell_index].width;
if (0 == style->filler[full_cell_index].width)
pad_count++;
}
/* The tip of the bar, if not at 100%. */
if (has_tip && pad_count < bar_area_width) {
append_to_buffer(style->tip);
pad_count++;
pad_count += style->tip.width;
}
/* A partial cell, if there are intermediates and we're not at 100%. */
@@ -172,12 +168,17 @@ static size_t pv_formatter_progress_knownsize(pvformatter_args_t args, char *buf
cell_index = full_cell_index;
append_to_buffer(style->filler[cell_index]);
pad_count++;
pad_count += style->filler[cell_index].width;
if (0 == style->filler[cell_index].width)
pad_count++;
}
/* The spaces after the bar. */
for (; pad_count < bar_area_width; pad_count++) {
while (pad_count < bar_area_width) {
append_to_buffer(style->filler[0]);
pad_count += style->filler[0].width;
if (0 == style->filler[0].width)
pad_count++;
}
if (bar_sides) {
@@ -233,13 +234,6 @@ static size_t pv_formatter_progress_unknownsize(pvformatter_args_t args, char *b
bar_area_width = args->segment->width - style->indicator.width;
}
/*
* Make sure there is enough room in the buffer, even if all of the
* bar characters are very wide.
*/
if (4 * bar_area_width > buffer_size - 16)
bar_area_width = (buffer_size - 16) / 4;
/*
* Note that pv_calculate_transfer_rate() sets the percentage when
* the size is unknown to a value that goes 0 - 200 and resets, so
@@ -260,10 +254,12 @@ static size_t pv_formatter_progress_unknownsize(pvformatter_args_t args, char *b
}
/* The spaces before the indicator. */
for (pad_count = 0; pad_count < (bar_area_width * indicator_position) / 100; pad_count++) {
if (pad_count < bar_area_width) {
append_to_buffer(style->filler[0]);
}
pad_count = 0;
while (pad_count < bar_area_width && pad_count < ((bar_area_width * indicator_position) / 100)) {
append_to_buffer(style->filler[0]);
pad_count += style->filler[0].width;
if (0 == style->filler[0].width)
pad_count++;
}
/* The indicator. */
@@ -272,8 +268,11 @@ static size_t pv_formatter_progress_unknownsize(pvformatter_args_t args, char *b
}
/* The spaces after the indicator. */
for (; pad_count < bar_area_width; pad_count++) {
while (pad_count < bar_area_width) {
append_to_buffer(style->filler[0]);
pad_count += style->filler[0].width;
if (0 == style->filler[0].width)
pad_count++;
}
if (bar_sides) {