From d801d2be0f793787c60b98224eb1dc255c961916 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 26 Dec 2020 22:11:56 +0100 Subject: [PATCH] lf/hf tune - color vs emoji... --- client/src/ui.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/client/src/ui.c b/client/src/ui.c index 885910919..391279e52 100644 --- a/client/src/ui.c +++ b/client/src/ui.c @@ -657,7 +657,7 @@ void print_progress(size_t count, uint64_t max, barMode_t style) { "\xe2\x96\x88", }; - uint8_t mode = session.supports_colors; + uint8_t mode = (session.emoji_mode == EMOJI); const char *block[] = {"#", "\xe2\x96\x88"}; // use a 3-byte space in emoji mode to ease computations @@ -689,11 +689,15 @@ void print_progress(size_t count, uint64_t max, barMode_t style) { char *cbar = calloc(collen, sizeof(uint8_t)); // Add colors - int p60 = unit * (width * 60 / 100); - int p20 = unit * (width * 20 / 100); - snprintf(cbar, collen, _GREEN_("%.*s"), p60, bar); - snprintf(cbar + strlen(cbar), collen - strlen(cbar), _CYAN_("%.*s"), p20, bar + p60); - snprintf(cbar + strlen(cbar), collen - strlen(cbar), _YELLOW_("%.*s"), unit * width - p60 - p20, bar + p60 + p20); + if ( session.supports_colors ) { + int p60 = unit * (width * 60 / 100); + int p20 = unit * (width * 20 / 100); + snprintf(cbar, collen, _GREEN_("%.*s"), p60, bar); + snprintf(cbar + strlen(cbar), collen - strlen(cbar), _CYAN_("%.*s"), p20, bar + p60); + snprintf(cbar + strlen(cbar), collen - strlen(cbar), _YELLOW_("%.*s"), unit * width - p60 - p20, bar + p60 + p20); + } else { + snprintf(cbar, collen, "%s", bar); + } size_t len = strlen(cbar) + 32; char *buffer = calloc(len, sizeof(uint8_t));