Merge pull request #141 from zhao-shihan/master

Add CMake options INDICATORS_INSTALL and INDICATORS_PACKAGE

CMakeLists.txt

@@ -1,18 +1,20 @@
 cmake_minimum_required(VERSION 3.8)
 
-if(DEFINED PROJECT_NAME)
-  set(INDICATORS_SUBPROJECT ON)
+if(NOT DEFINED PROJECT_NAME)
+  set(INDICATORS_IS_TOP_LEVEL ON)
+else()
+  set(INDICATORS_IS_TOP_LEVEL OFF)
 endif()
 
 if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")
-  project(indicators VERSION 2.2.0 LANGUAGES CXX
+  project(indicators VERSION 2.3.0 LANGUAGES CXX
     HOMEPAGE_URL "https://github.com/p-ranav/indicators"
     DESCRIPTION "Activity Indicators for Modern C++")
 elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "3.9")
-  project(indicators VERSION 2.2.0 LANGUAGES CXX
+  project(indicators VERSION 2.3.0 LANGUAGES CXX
     DESCRIPTION "Activity Indicators for Modern C++")
 else()
-  project(indicators VERSION 2.2.0 LANGUAGES CXX)
+  project(indicators VERSION 2.3.0 LANGUAGES CXX)
 endif()
 
 if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
@@ -20,6 +22,8 @@ if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
     conan_basic_setup()
 endif()
 
+option(INDICATORS_INSTALL "Include an install target" ${INDICATORS_IS_TOP_LEVEL})
+option(INDICATORS_PACKAGE "Include package targets" ${INDICATORS_IS_TOP_LEVEL})
 option(INDICATORS_BUILD_TESTS "Build indicators tests + enable CTest")
 option(INDICATORS_SAMPLES "Build indicators samples")
 option(INDICATORS_DEMO "Build indicators demo" OFF)
@@ -46,7 +50,7 @@ if(INDICATORS_SAMPLES)
   add_subdirectory(samples)
 endif()
 
-if(NOT INDICATORS_SUBPROJECT)
+if(INDICATORS_INSTALL)
   configure_package_config_file(indicatorsConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/indicatorsConfig.cmake
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/indicators)
@@ -71,7 +75,9 @@ if(NOT INDICATORS_SUBPROJECT)
           PATTERN "*.hpp")
   install(FILES LICENSE LICENSE.termcolor
           DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/licenses/indicators)
+endif()
 
+if(INDICATORS_PACKAGE)
   if(EXISTS "${PROJECT_SOURCE_DIR}/.gitignore")
     # Simple glob to regex conversion (.gitignore => CPACK_SOURCE_IGNORE_FILES)
     file(READ ".gitignore" DOT_GITIGNORE)

README.md

@@ -3,16 +3,13 @@
 </p>
 
 <p align="center">
-  <a href="https://travis-ci.com/p-ranav/indicators">
-    <img src="https://travis-ci.com/p-ranav/indicators.svg?branch=master" alt="ci status"/>
-  </a>
   <a href="https://www.codacy.com/manual/p-ranav/indicators?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=p-ranav/indicators&amp;utm_campaign=Badge_Grade">
     <img src="https://api.codacy.com/project/badge/Grade/93401e73f250407cb32445afec4e3e99" alt="codacy"/>
   </a>
   <a href="https://github.com/p-ranav/indicators/blob/master/LICENSE">
     <img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="license"/>
   </a>
-  <img src="https://img.shields.io/badge/version-2.2-blue.svg?cacheSeconds=2592000" alt="version"/>
+  <img src="https://img.shields.io/badge/version-2.3-blue.svg?cacheSeconds=2592000" alt="version"/>
 </p>
 
 
@@ -83,6 +80,7 @@ int main() {
     option::End{"]"},
     option::PostfixText{"Extracting Archive"},
     option::ForegroundColor{Color::green},
+    option::ShowPercentage{true},
     option::FontStyles{std::vector<FontStyle>{FontStyle::bold}}
   };
   
@@ -130,8 +128,8 @@ int main() {
     option::End{" ]"},
     option::PostfixText{"Loading dependency 1/4"},
     option::ForegroundColor{Color::cyan},
-    option::FontStyles{std::vector<FontStyle>{FontStyle::bold}}
-  };
+    option::ShowPercentage{true},
+    option::FontStyles{std::vector<FontStyle>{FontStyle::bold}}  };
 
   // Update bar state
   bar.set_progress(10); // 10% done
@@ -193,6 +191,7 @@ int main() {
     option::End{"]"},
     option::PrefixText{"Training Gaze Network 👀"},
     option::ForegroundColor{Color::yellow},
+    option::ShowPercentage{true},
     option::ShowElapsedTime{true},
     option::ShowRemainingTime{true},
     option::FontStyles{std::vector<FontStyle>{FontStyle::bold}}
@@ -278,6 +277,7 @@ Are you in need of a smooth block progress bar using [unicode block elements](ht
 
 ```cpp
 #include <indicators/block_progress_bar.hpp>
+#include <indicators/cursor_control.hpp>
 #include <thread>
 #include <chrono>
 
@@ -293,6 +293,7 @@ int main() {
     option::Start{"["},
     option::End{"]"},
     option::ForegroundColor{Color::white}  ,
+    option::ShowPercentage{true},
     option::FontStyles{std::vector<FontStyle>{FontStyle::bold}}
   };
   
@@ -342,6 +343,7 @@ int main() {
     option::Remainder{" "},
     option::End{" ]"},
     option::ForegroundColor{Color::yellow},
+    option::ShowPercentage{true},
     option::ShowElapsedTime{true},
     option::ShowRemainingTime{true},
     option::PrefixText{"Progress Bar #1 "},
@@ -358,6 +360,7 @@ int main() {
     option::Remainder{" "},
     option::End{" ]"},
     option::ForegroundColor{Color::cyan},
+    option::ShowPercentage{true},
     option::ShowElapsedTime{true},
     option::ShowRemainingTime{true},
     option::PrefixText{"Progress Bar #2 "},
@@ -373,6 +376,7 @@ int main() {
     option::Remainder{" "},
     option::End{" ]"},
     option::ForegroundColor{Color::red},
+    option::ShowPercentage{true},
     option::ShowElapsedTime{true},
     option::ShowRemainingTime{true},
     option::PrefixText{"Progress Bar #3 "},
@@ -444,35 +448,59 @@ using namespace indicators;
 
 int main() {
 
-  ProgressBar bar1{option::BarWidth{50}, option::ForegroundColor{Color::red},
-                   option::ShowElapsedTime{true}, option::ShowRemainingTime{true},
-                   option::PrefixText{"5c90d4a2d1a8: Downloading "}};
+  auto bar1 = std::make_unique<ProgressBar>(option::BarWidth{50},
+                   option::ForegroundColor{Color::red},
+                   option::ShowElapsedTime{true},
+                   option::ShowRemainingTime{true},
+                   option::PrefixText{"5c90d4a2d1a8: Downloading "},
+                   indicators::option::FontStyles{
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar2{option::BarWidth{50}, option::ForegroundColor{Color::yellow},
-                   option::ShowElapsedTime{true}, option::ShowRemainingTime{true},
-                   option::PrefixText{"22337bfd13a9: Downloading "}};
+  auto bar2 = std::make_unique<ProgressBar>(option::BarWidth{50},
+                   option::ForegroundColor{Color::yellow},
+                   option::ShowElapsedTime{true},
+                   option::ShowRemainingTime{true},
+                   option::PrefixText{"22337bfd13a9: Downloading "},
+                   indicators::option::FontStyles{
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar3{option::BarWidth{50}, option::ForegroundColor{Color::green},
-                   option::ShowElapsedTime{true}, option::ShowRemainingTime{true},
-                   option::PrefixText{"10f26c680a34: Downloading "}};
+  auto bar3 = std::make_unique<ProgressBar>(option::BarWidth{50},
+                   option::ForegroundColor{Color::green},
+                   option::ShowElapsedTime{true},
+                   option::ShowRemainingTime{true},
+                   option::PrefixText{"10f26c680a34: Downloading "},
+                   indicators::option::FontStyles{
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar4{option::BarWidth{50}, option::ForegroundColor{Color::white},
-                   option::ShowElapsedTime{true}, option::ShowRemainingTime{true},
-                   option::PrefixText{"6364e0d7a283: Downloading "}};
+  auto bar4 = std::make_unique<ProgressBar>(option::BarWidth{50},
+                   option::ForegroundColor{Color::white},
+                   option::ShowElapsedTime{true},
+                   option::ShowRemainingTime{true},
+                   option::PrefixText{"6364e0d7a283: Downloading "},
+                   indicators::option::FontStyles{
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar5{option::BarWidth{50}, option::ForegroundColor{Color::blue},
-                   option::ShowElapsedTime{true}, option::ShowRemainingTime{true},
-                   option::PrefixText{"ff1356ba118b: Downloading "}};
+  auto bar5 = std::make_unique<ProgressBar>(option::BarWidth{50},
+                   option::ForegroundColor{Color::blue},
+                   option::ShowElapsedTime{true},
+                   option::ShowRemainingTime{true},
+                   option::PrefixText{"ff1356ba118b: Downloading "},
+                   indicators::option::FontStyles{
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar6{option::BarWidth{50}, option::ForegroundColor{Color::cyan},
-                   option::ShowElapsedTime{true}, option::ShowRemainingTime{true},
-                   option::PrefixText{"5a17453338b4: Downloading "}};
+  auto bar6 = std::make_unique<ProgressBar>(option::BarWidth{50},
+                   option::ForegroundColor{Color::cyan},
+                   option::ShowElapsedTime{true},
+                   option::ShowRemainingTime{true},
+                   option::PrefixText{"5a17453338b4: Downloading "},
+                   indicators::option::FontStyles{
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
   std::cout << termcolor::bold << termcolor::white << "Pulling image foo:bar/baz\n";
 
   // Construct with 3 progress bars. We'll add 3 more at a later point
   DynamicProgress<ProgressBar> bars(bar1, bar2, bar3);
-  
+
   // Do not hide bars when completed
   bars.set_option(option::HideBarWhenComplete{false});
 
@@ -520,7 +548,7 @@ int main() {
       if (bars[0].is_completed()) {
         bars[0].set_option(option::PrefixText{"5c90d4a2d1a8: Pull complete "});
         // bar1 is completed, adding bar6
-        auto i = bars.push_back(bar6);
+        auto i = bars.push_back(std::move(bar6));
         sixth_job = std::thread(job6, i);
         sixth_job.join();
         break;
@@ -535,7 +563,7 @@ int main() {
       if (bars[1].is_completed()) {
         bars[1].set_option(option::PrefixText{"22337bfd13a9: Pull complete "});
         // bar2 is completed, adding bar5
-        auto i = bars.push_back(bar5);
+        auto i = bars.push_back(std::move(bar5));
         fifth_job = std::thread(job5, i);
         fifth_job.join();
         break;
@@ -550,7 +578,7 @@ int main() {
       if (bars[2].is_completed()) {
         bars[2].set_option(option::PrefixText{"10f26c680a34: Pull complete "});
         // bar3 is completed, adding bar4
-        auto i = bars.push_back(bar4);
+        auto i = bars.push_back(std::move(bar4));
         fourth_job = std::thread(job4, i);
         fourth_job.join();
         break;
@@ -701,6 +729,7 @@ int main() {
   BlockProgressBar bar{
     option::BarWidth{80},
     option::ForegroundColor{Color::white},
+    option::ShowPercentage{true},
     option::FontStyles{
           std::vector<FontStyle>{FontStyle::bold}},
     option::MaxProgress{numbers.size()}

include/indicators/block_progress_bar.hpp

@@ -102,10 +102,10 @@ public:
     }
   }
 
-  void set_progress(float value) {
+  void set_progress(size_t value) {
     {
       std::lock_guard<std::mutex> lock{mutex_};
-      progress_ = value;
+      tick_ = value;
     }
     save_start_time();
     print_progress();
@@ -114,7 +114,7 @@ public:
   void tick() {
     {
       std::lock_guard<std::mutex> lock{mutex_};
-      progress_ += 1;
+      tick_++;
     }
     save_start_time();
     print_progress();
@@ -122,8 +122,7 @@ public:
 
   size_t current() {
     std::lock_guard<std::mutex> lock{mutex_};
-    return std::min(static_cast<size_t>(progress_),
-                    size_t(get_value<details::ProgressBarOption::max_progress>()));
+    return (std::min)(tick_, size_t(get_value<details::ProgressBarOption::max_progress>()));
   }
 
   bool is_completed() const { return get_value<details::ProgressBarOption::completed>(); }
@@ -147,6 +146,7 @@ private:
 
   Settings settings_;
   float progress_{0.0};
+  size_t tick_{0};
   std::chrono::time_point<std::chrono::high_resolution_clock> start_time_point_;
   std::mutex mutex_;
 
@@ -164,7 +164,7 @@ private:
     }
   }
 
-  std::pair<std::string, size_t> get_prefix_text() {
+  std::pair<std::string, int> get_prefix_text() {
     std::stringstream os;
     os << get_value<details::ProgressBarOption::prefix_text>();
     const auto result = os.str();
@@ -172,14 +172,15 @@ private:
     return {result, result_size};
   }
 
-  std::pair<std::string, size_t> get_postfix_text() {
+  std::pair<std::string, int> get_postfix_text() {
     std::stringstream os;
     const auto max_progress = get_value<details::ProgressBarOption::max_progress>();
+    progress_ = static_cast<float>(tick_)/max_progress;
     auto now = std::chrono::high_resolution_clock::now();
     auto elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(now - start_time_point_);
 
     if (get_value<details::ProgressBarOption::show_percentage>()) {
-      os << " " << std::min(static_cast<size_t>(progress_ / max_progress * 100.0), size_t(100))
+      os << " " << (std::min)(static_cast<size_t>(progress_ * 100.0), size_t(100))
          << "%";
     }
 
@@ -201,9 +202,8 @@ private:
 
       if (saved_start_time) {
         auto eta = std::chrono::nanoseconds(
-            progress_ > 0
-                ? static_cast<long long>(std::ceil(float(elapsed.count()) *
-                                                   max_progress / progress_))
+            tick_ > 0
+                ? static_cast<long long>(std::ceil(float(elapsed.count()) / progress_))
                 : 0);
         auto remaining = eta > elapsed ? (eta - elapsed) : (elapsed - eta);
         details::write_duration(os, remaining);
@@ -232,7 +232,7 @@ public:
 
     const auto max_progress = get_value<details::ProgressBarOption::max_progress>();
     if (multi_progress_mode_ && !from_multi_progress) {
-      if (progress_ > max_progress) {
+      if (tick_ > max_progress) {
         get_value<details::ProgressBarOption::completed>() = true;
       }
       return;
@@ -253,7 +253,7 @@ public:
 
     details::BlockProgressScaleWriter writer{os,
                                              get_value<details::ProgressBarOption::bar_width>()};
-    writer.write(progress_ / max_progress * 100);
+    writer.write(progress_ * 100);
 
     os << get_value<details::ProgressBarOption::end>();
 
@@ -269,14 +269,16 @@ public:
     const auto terminal_width = terminal_size().second;
     // prefix + bar_width + postfix should be <= terminal_width
     const int remaining = terminal_width - (prefix_length + start_length + bar_width + end_length + postfix_length);
-    if (remaining > 0) {
+    if (prefix_length == -1 || postfix_length == -1) {
+      os << "\r";
+    } else if (remaining > 0) {
       os << std::string(remaining, ' ') << "\r";
     } else if (remaining < 0) {
       // Do nothing. Maybe in the future truncate postfix with ...
     }
     os.flush();
 
-    if (progress_ > max_progress) {
+    if (tick_ > max_progress) {
       get_value<details::ProgressBarOption::completed>() = true;
     }
     if (get_value<details::ProgressBarOption::completed>() &&
@@ -287,4 +289,4 @@ public:
 
 } // namespace indicators
 
-#endif
+#endif

include/indicators/cursor_control.hpp

@@ -26,12 +26,39 @@ static inline void show_console_cursor(bool const show) {
   SetConsoleCursorInfo(out, &cursorInfo);
 }
 
+static inline void erase_line() {
+  auto hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
+  if (!hStdout)
+    return;
+
+  CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+  GetConsoleScreenBufferInfo(hStdout, &csbiInfo);
+
+  COORD cursor;
+
+  cursor.X = 0;
+  cursor.Y = csbiInfo.dwCursorPosition.Y;
+
+  DWORD count = 0;
+
+  FillConsoleOutputCharacterA(hStdout, ' ', csbiInfo.dwSize.X, cursor, &count);
+
+  FillConsoleOutputAttribute(hStdout, csbiInfo.wAttributes, csbiInfo.dwSize.X,
+                             cursor, &count);
+
+  SetConsoleCursorPosition(hStdout, cursor);
+}
+
 #else
 
 static inline void show_console_cursor(bool const show) {
   std::fputs(show ? "\033[?25h" : "\033[?25l", stdout);
 }
 
+static inline void erase_line() {
+  std::fputs("\r\033[K", stdout);
+}
+
 #endif
 
 } // namespace indicators

include/indicators/details/stream_helper.hpp

@@ -110,7 +110,7 @@ public:
   std::ostream &write(float progress) {
     std::string fill_text{"█"};
     std::vector<std::string> lead_characters{" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉"};
-    auto value = std::min(1.0f, std::max(0.0f, progress / 100.0f));
+    auto value = (std::min)(1.0f, (std::max)(0.0f, progress / 100.0f));
     auto whole_width = std::floor(value * bar_width);
     auto remainder_width = fmod((value * bar_width), 1.0f);
     auto part_width = std::floor(remainder_width * lead_characters.size());

include/indicators/display_width.hpp

@@ -3,10 +3,6 @@
 #define INDICATORS_DISPLAY_WIDTH
 
 #include <clocale>
-#if __has_include(<codecvt>)
-#include <codecvt>
-#define INDICATORS_HAVE_CODECVT 1
-#endif
 #include <cstdlib>
 #include <locale>
 #include <string>
@@ -14,7 +10,6 @@
 
 namespace unicode {
 
-#if INDICATORS_HAVE_CODECVT
 namespace details {
 
 /*
@@ -139,42 +134,54 @@ static inline int mk_wcwidth(wchar_t ucs) {
   /* sorted list of non-overlapping intervals of non-spacing characters */
   /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
   static const struct interval combining[] = {
-      {0x0300, 0x036F},   {0x0483, 0x0486},   {0x0488, 0x0489},   {0x0591, 0x05BD},
-      {0x05BF, 0x05BF},   {0x05C1, 0x05C2},   {0x05C4, 0x05C5},   {0x05C7, 0x05C7},
-      {0x0600, 0x0603},   {0x0610, 0x0615},   {0x064B, 0x065E},   {0x0670, 0x0670},
-      {0x06D6, 0x06E4},   {0x06E7, 0x06E8},   {0x06EA, 0x06ED},   {0x070F, 0x070F},
-      {0x0711, 0x0711},   {0x0730, 0x074A},   {0x07A6, 0x07B0},   {0x07EB, 0x07F3},
-      {0x0901, 0x0902},   {0x093C, 0x093C},   {0x0941, 0x0948},   {0x094D, 0x094D},
-      {0x0951, 0x0954},   {0x0962, 0x0963},   {0x0981, 0x0981},   {0x09BC, 0x09BC},
-      {0x09C1, 0x09C4},   {0x09CD, 0x09CD},   {0x09E2, 0x09E3},   {0x0A01, 0x0A02},
-      {0x0A3C, 0x0A3C},   {0x0A41, 0x0A42},   {0x0A47, 0x0A48},   {0x0A4B, 0x0A4D},
-      {0x0A70, 0x0A71},   {0x0A81, 0x0A82},   {0x0ABC, 0x0ABC},   {0x0AC1, 0x0AC5},
-      {0x0AC7, 0x0AC8},   {0x0ACD, 0x0ACD},   {0x0AE2, 0x0AE3},   {0x0B01, 0x0B01},
-      {0x0B3C, 0x0B3C},   {0x0B3F, 0x0B3F},   {0x0B41, 0x0B43},   {0x0B4D, 0x0B4D},
-      {0x0B56, 0x0B56},   {0x0B82, 0x0B82},   {0x0BC0, 0x0BC0},   {0x0BCD, 0x0BCD},
-      {0x0C3E, 0x0C40},   {0x0C46, 0x0C48},   {0x0C4A, 0x0C4D},   {0x0C55, 0x0C56},
-      {0x0CBC, 0x0CBC},   {0x0CBF, 0x0CBF},   {0x0CC6, 0x0CC6},   {0x0CCC, 0x0CCD},
-      {0x0CE2, 0x0CE3},   {0x0D41, 0x0D43},   {0x0D4D, 0x0D4D},   {0x0DCA, 0x0DCA},
-      {0x0DD2, 0x0DD4},   {0x0DD6, 0x0DD6},   {0x0E31, 0x0E31},   {0x0E34, 0x0E3A},
-      {0x0E47, 0x0E4E},   {0x0EB1, 0x0EB1},   {0x0EB4, 0x0EB9},   {0x0EBB, 0x0EBC},
-      {0x0EC8, 0x0ECD},   {0x0F18, 0x0F19},   {0x0F35, 0x0F35},   {0x0F37, 0x0F37},
-      {0x0F39, 0x0F39},   {0x0F71, 0x0F7E},   {0x0F80, 0x0F84},   {0x0F86, 0x0F87},
-      {0x0F90, 0x0F97},   {0x0F99, 0x0FBC},   {0x0FC6, 0x0FC6},   {0x102D, 0x1030},
-      {0x1032, 0x1032},   {0x1036, 0x1037},   {0x1039, 0x1039},   {0x1058, 0x1059},
-      {0x1160, 0x11FF},   {0x135F, 0x135F},   {0x1712, 0x1714},   {0x1732, 0x1734},
-      {0x1752, 0x1753},   {0x1772, 0x1773},   {0x17B4, 0x17B5},   {0x17B7, 0x17BD},
-      {0x17C6, 0x17C6},   {0x17C9, 0x17D3},   {0x17DD, 0x17DD},   {0x180B, 0x180D},
-      {0x18A9, 0x18A9},   {0x1920, 0x1922},   {0x1927, 0x1928},   {0x1932, 0x1932},
-      {0x1939, 0x193B},   {0x1A17, 0x1A18},   {0x1B00, 0x1B03},   {0x1B34, 0x1B34},
-      {0x1B36, 0x1B3A},   {0x1B3C, 0x1B3C},   {0x1B42, 0x1B42},   {0x1B6B, 0x1B73},
-      {0x1DC0, 0x1DCA},   {0x1DFE, 0x1DFF},   {0x200B, 0x200F},   {0x202A, 0x202E},
-      {0x2060, 0x2063},   {0x206A, 0x206F},   {0x20D0, 0x20EF},   {0x302A, 0x302F},
-      {0x3099, 0x309A},   {0xA806, 0xA806},   {0xA80B, 0xA80B},   {0xA825, 0xA826},
-      {0xFB1E, 0xFB1E},   {0xFE00, 0xFE0F},   {0xFE20, 0xFE23},   {0xFEFF, 0xFEFF},
-      {0xFFF9, 0xFFFB},   {0x10A01, 0x10A03}, {0x10A05, 0x10A06}, {0x10A0C, 0x10A0F},
-      {0x10A38, 0x10A3A}, {0x10A3F, 0x10A3F}, {0x1D167, 0x1D169}, {0x1D173, 0x1D182},
-      {0x1D185, 0x1D18B}, {0x1D1AA, 0x1D1AD}, {0x1D242, 0x1D244}, {0xE0001, 0xE0001},
-      {0xE0020, 0xE007F}, {0xE0100, 0xE01EF}};
+      {0x0300, 0x036F},   {0x0483, 0x0486},   {0x0488, 0x0489},
+      {0x0591, 0x05BD},   {0x05BF, 0x05BF},   {0x05C1, 0x05C2},
+      {0x05C4, 0x05C5},   {0x05C7, 0x05C7},   {0x0600, 0x0603},
+      {0x0610, 0x0615},   {0x064B, 0x065E},   {0x0670, 0x0670},
+      {0x06D6, 0x06E4},   {0x06E7, 0x06E8},   {0x06EA, 0x06ED},
+      {0x070F, 0x070F},   {0x0711, 0x0711},   {0x0730, 0x074A},
+      {0x07A6, 0x07B0},   {0x07EB, 0x07F3},   {0x0901, 0x0902},
+      {0x093C, 0x093C},   {0x0941, 0x0948},   {0x094D, 0x094D},
+      {0x0951, 0x0954},   {0x0962, 0x0963},   {0x0981, 0x0981},
+      {0x09BC, 0x09BC},   {0x09C1, 0x09C4},   {0x09CD, 0x09CD},
+      {0x09E2, 0x09E3},   {0x0A01, 0x0A02},   {0x0A3C, 0x0A3C},
+      {0x0A41, 0x0A42},   {0x0A47, 0x0A48},   {0x0A4B, 0x0A4D},
+      {0x0A70, 0x0A71},   {0x0A81, 0x0A82},   {0x0ABC, 0x0ABC},
+      {0x0AC1, 0x0AC5},   {0x0AC7, 0x0AC8},   {0x0ACD, 0x0ACD},
+      {0x0AE2, 0x0AE3},   {0x0B01, 0x0B01},   {0x0B3C, 0x0B3C},
+      {0x0B3F, 0x0B3F},   {0x0B41, 0x0B43},   {0x0B4D, 0x0B4D},
+      {0x0B56, 0x0B56},   {0x0B82, 0x0B82},   {0x0BC0, 0x0BC0},
+      {0x0BCD, 0x0BCD},   {0x0C3E, 0x0C40},   {0x0C46, 0x0C48},
+      {0x0C4A, 0x0C4D},   {0x0C55, 0x0C56},   {0x0CBC, 0x0CBC},
+      {0x0CBF, 0x0CBF},   {0x0CC6, 0x0CC6},   {0x0CCC, 0x0CCD},
+      {0x0CE2, 0x0CE3},   {0x0D41, 0x0D43},   {0x0D4D, 0x0D4D},
+      {0x0DCA, 0x0DCA},   {0x0DD2, 0x0DD4},   {0x0DD6, 0x0DD6},
+      {0x0E31, 0x0E31},   {0x0E34, 0x0E3A},   {0x0E47, 0x0E4E},
+      {0x0EB1, 0x0EB1},   {0x0EB4, 0x0EB9},   {0x0EBB, 0x0EBC},
+      {0x0EC8, 0x0ECD},   {0x0F18, 0x0F19},   {0x0F35, 0x0F35},
+      {0x0F37, 0x0F37},   {0x0F39, 0x0F39},   {0x0F71, 0x0F7E},
+      {0x0F80, 0x0F84},   {0x0F86, 0x0F87},   {0x0F90, 0x0F97},
+      {0x0F99, 0x0FBC},   {0x0FC6, 0x0FC6},   {0x102D, 0x1030},
+      {0x1032, 0x1032},   {0x1036, 0x1037},   {0x1039, 0x1039},
+      {0x1058, 0x1059},   {0x1160, 0x11FF},   {0x135F, 0x135F},
+      {0x1712, 0x1714},   {0x1732, 0x1734},   {0x1752, 0x1753},
+      {0x1772, 0x1773},   {0x17B4, 0x17B5},   {0x17B7, 0x17BD},
+      {0x17C6, 0x17C6},   {0x17C9, 0x17D3},   {0x17DD, 0x17DD},
+      {0x180B, 0x180D},   {0x18A9, 0x18A9},   {0x1920, 0x1922},
+      {0x1927, 0x1928},   {0x1932, 0x1932},   {0x1939, 0x193B},
+      {0x1A17, 0x1A18},   {0x1B00, 0x1B03},   {0x1B34, 0x1B34},
+      {0x1B36, 0x1B3A},   {0x1B3C, 0x1B3C},   {0x1B42, 0x1B42},
+      {0x1B6B, 0x1B73},   {0x1DC0, 0x1DCA},   {0x1DFE, 0x1DFF},
+      {0x200B, 0x200F},   {0x202A, 0x202E},   {0x2060, 0x2063},
+      {0x206A, 0x206F},   {0x20D0, 0x20EF},   {0x302A, 0x302F},
+      {0x3099, 0x309A},   {0xA806, 0xA806},   {0xA80B, 0xA80B},
+      {0xA825, 0xA826},   {0xFB1E, 0xFB1E},   {0xFE00, 0xFE0F},
+      {0xFE20, 0xFE23},   {0xFEFF, 0xFEFF},   {0xFFF9, 0xFFFB},
+      {0x10A01, 0x10A03}, {0x10A05, 0x10A06}, {0x10A0C, 0x10A0F},
+      {0x10A38, 0x10A3A}, {0x10A3F, 0x10A3F}, {0x1D167, 0x1D169},
+      {0x1D173, 0x1D182}, {0x1D185, 0x1D18B}, {0x1D1AA, 0x1D1AD},
+      {0x1D242, 0x1D244}, {0xE0001, 0xE0001}, {0xE0020, 0xE007F},
+      {0xE0100, 0xE01EF}};
 
   /* test for 8-bit control characters */
   if (ucs == 0)
@@ -188,17 +195,20 @@ static inline int mk_wcwidth(wchar_t ucs) {
 
   /* if we arrive here, ucs is not a combining or C0/C1 control character */
 
-  return 1 + (ucs >= 0x1100 &&
-              (ucs <= 0x115f || /* Hangul Jamo init. consonants */
-               ucs == 0x2329 || ucs == 0x232a ||
-               (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs != 0x303f) || /* CJK ... Yi */
-               (ucs >= 0xac00 && ucs <= 0xd7a3) ||                  /* Hangul Syllables */
-               (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-               (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
-               (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-               (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
-               (ucs >= 0xffe0 && ucs <= 0xffe6) || (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-               (ucs >= 0x30000 && ucs <= 0x3fffd)));
+  return 1 +
+         (ucs >= 0x1100 &&
+          (ucs <= 0x115f || /* Hangul Jamo init. consonants */
+           ucs == 0x2329 || ucs == 0x232a ||
+           (ucs >= 0x2e80 && ucs <= 0xa4cf && ucs != 0x303f) || /* CJK ... Yi */
+           (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+           (ucs >= 0xf900 &&
+            ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+           (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
+           (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+           (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
+           (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+           (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+           (ucs >= 0x30000 && ucs <= 0x3fffd)));
 }
 
 static inline int mk_wcswidth(const wchar_t *pwcs, size_t n) {
@@ -226,38 +236,58 @@ static inline int mk_wcwidth_cjk(wchar_t ucs) {
   /* sorted list of non-overlapping intervals of East Asian Ambiguous
    * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
   static const struct interval ambiguous[] = {
-      {0x00A1, 0x00A1},    {0x00A4, 0x00A4}, {0x00A7, 0x00A8}, {0x00AA, 0x00AA}, {0x00AE, 0x00AE},
-      {0x00B0, 0x00B4},    {0x00B6, 0x00BA}, {0x00BC, 0x00BF}, {0x00C6, 0x00C6}, {0x00D0, 0x00D0},
-      {0x00D7, 0x00D8},    {0x00DE, 0x00E1}, {0x00E6, 0x00E6}, {0x00E8, 0x00EA}, {0x00EC, 0x00ED},
-      {0x00F0, 0x00F0},    {0x00F2, 0x00F3}, {0x00F7, 0x00FA}, {0x00FC, 0x00FC}, {0x00FE, 0x00FE},
-      {0x0101, 0x0101},    {0x0111, 0x0111}, {0x0113, 0x0113}, {0x011B, 0x011B}, {0x0126, 0x0127},
-      {0x012B, 0x012B},    {0x0131, 0x0133}, {0x0138, 0x0138}, {0x013F, 0x0142}, {0x0144, 0x0144},
-      {0x0148, 0x014B},    {0x014D, 0x014D}, {0x0152, 0x0153}, {0x0166, 0x0167}, {0x016B, 0x016B},
-      {0x01CE, 0x01CE},    {0x01D0, 0x01D0}, {0x01D2, 0x01D2}, {0x01D4, 0x01D4}, {0x01D6, 0x01D6},
-      {0x01D8, 0x01D8},    {0x01DA, 0x01DA}, {0x01DC, 0x01DC}, {0x0251, 0x0251}, {0x0261, 0x0261},
-      {0x02C4, 0x02C4},    {0x02C7, 0x02C7}, {0x02C9, 0x02CB}, {0x02CD, 0x02CD}, {0x02D0, 0x02D0},
-      {0x02D8, 0x02DB},    {0x02DD, 0x02DD}, {0x02DF, 0x02DF}, {0x0391, 0x03A1}, {0x03A3, 0x03A9},
-      {0x03B1, 0x03C1},    {0x03C3, 0x03C9}, {0x0401, 0x0401}, {0x0410, 0x044F}, {0x0451, 0x0451},
-      {0x2010, 0x2010},    {0x2013, 0x2016}, {0x2018, 0x2019}, {0x201C, 0x201D}, {0x2020, 0x2022},
-      {0x2024, 0x2027},    {0x2030, 0x2030}, {0x2032, 0x2033}, {0x2035, 0x2035}, {0x203B, 0x203B},
-      {0x203E, 0x203E},    {0x2074, 0x2074}, {0x207F, 0x207F}, {0x2081, 0x2084}, {0x20AC, 0x20AC},
-      {0x2103, 0x2103},    {0x2105, 0x2105}, {0x2109, 0x2109}, {0x2113, 0x2113}, {0x2116, 0x2116},
-      {0x2121, 0x2122},    {0x2126, 0x2126}, {0x212B, 0x212B}, {0x2153, 0x2154}, {0x215B, 0x215E},
-      {0x2160, 0x216B},    {0x2170, 0x2179}, {0x2190, 0x2199}, {0x21B8, 0x21B9}, {0x21D2, 0x21D2},
-      {0x21D4, 0x21D4},    {0x21E7, 0x21E7}, {0x2200, 0x2200}, {0x2202, 0x2203}, {0x2207, 0x2208},
-      {0x220B, 0x220B},    {0x220F, 0x220F}, {0x2211, 0x2211}, {0x2215, 0x2215}, {0x221A, 0x221A},
-      {0x221D, 0x2220},    {0x2223, 0x2223}, {0x2225, 0x2225}, {0x2227, 0x222C}, {0x222E, 0x222E},
-      {0x2234, 0x2237},    {0x223C, 0x223D}, {0x2248, 0x2248}, {0x224C, 0x224C}, {0x2252, 0x2252},
-      {0x2260, 0x2261},    {0x2264, 0x2267}, {0x226A, 0x226B}, {0x226E, 0x226F}, {0x2282, 0x2283},
-      {0x2286, 0x2287},    {0x2295, 0x2295}, {0x2299, 0x2299}, {0x22A5, 0x22A5}, {0x22BF, 0x22BF},
-      {0x2312, 0x2312},    {0x2460, 0x24E9}, {0x24EB, 0x254B}, {0x2550, 0x2573}, {0x2580, 0x258F},
-      {0x2592, 0x2595},    {0x25A0, 0x25A1}, {0x25A3, 0x25A9}, {0x25B2, 0x25B3}, {0x25B6, 0x25B7},
-      {0x25BC, 0x25BD},    {0x25C0, 0x25C1}, {0x25C6, 0x25C8}, {0x25CB, 0x25CB}, {0x25CE, 0x25D1},
-      {0x25E2, 0x25E5},    {0x25EF, 0x25EF}, {0x2605, 0x2606}, {0x2609, 0x2609}, {0x260E, 0x260F},
-      {0x2614, 0x2615},    {0x261C, 0x261C}, {0x261E, 0x261E}, {0x2640, 0x2640}, {0x2642, 0x2642},
-      {0x2660, 0x2661},    {0x2663, 0x2665}, {0x2667, 0x266A}, {0x266C, 0x266D}, {0x266F, 0x266F},
-      {0x273D, 0x273D},    {0x2776, 0x277F}, {0xE000, 0xF8FF}, {0xFFFD, 0xFFFD}, {0xF0000, 0xFFFFD},
-      {0x100000, 0x10FFFD}};
+      {0x00A1, 0x00A1}, {0x00A4, 0x00A4},   {0x00A7, 0x00A8},
+      {0x00AA, 0x00AA}, {0x00AE, 0x00AE},   {0x00B0, 0x00B4},
+      {0x00B6, 0x00BA}, {0x00BC, 0x00BF},   {0x00C6, 0x00C6},
+      {0x00D0, 0x00D0}, {0x00D7, 0x00D8},   {0x00DE, 0x00E1},
+      {0x00E6, 0x00E6}, {0x00E8, 0x00EA},   {0x00EC, 0x00ED},
+      {0x00F0, 0x00F0}, {0x00F2, 0x00F3},   {0x00F7, 0x00FA},
+      {0x00FC, 0x00FC}, {0x00FE, 0x00FE},   {0x0101, 0x0101},
+      {0x0111, 0x0111}, {0x0113, 0x0113},   {0x011B, 0x011B},
+      {0x0126, 0x0127}, {0x012B, 0x012B},   {0x0131, 0x0133},
+      {0x0138, 0x0138}, {0x013F, 0x0142},   {0x0144, 0x0144},
+      {0x0148, 0x014B}, {0x014D, 0x014D},   {0x0152, 0x0153},
+      {0x0166, 0x0167}, {0x016B, 0x016B},   {0x01CE, 0x01CE},
+      {0x01D0, 0x01D0}, {0x01D2, 0x01D2},   {0x01D4, 0x01D4},
+      {0x01D6, 0x01D6}, {0x01D8, 0x01D8},   {0x01DA, 0x01DA},
+      {0x01DC, 0x01DC}, {0x0251, 0x0251},   {0x0261, 0x0261},
+      {0x02C4, 0x02C4}, {0x02C7, 0x02C7},   {0x02C9, 0x02CB},
+      {0x02CD, 0x02CD}, {0x02D0, 0x02D0},   {0x02D8, 0x02DB},
+      {0x02DD, 0x02DD}, {0x02DF, 0x02DF},   {0x0391, 0x03A1},
+      {0x03A3, 0x03A9}, {0x03B1, 0x03C1},   {0x03C3, 0x03C9},
+      {0x0401, 0x0401}, {0x0410, 0x044F},   {0x0451, 0x0451},
+      {0x2010, 0x2010}, {0x2013, 0x2016},   {0x2018, 0x2019},
+      {0x201C, 0x201D}, {0x2020, 0x2022},   {0x2024, 0x2027},
+      {0x2030, 0x2030}, {0x2032, 0x2033},   {0x2035, 0x2035},
+      {0x203B, 0x203B}, {0x203E, 0x203E},   {0x2074, 0x2074},
+      {0x207F, 0x207F}, {0x2081, 0x2084},   {0x20AC, 0x20AC},
+      {0x2103, 0x2103}, {0x2105, 0x2105},   {0x2109, 0x2109},
+      {0x2113, 0x2113}, {0x2116, 0x2116},   {0x2121, 0x2122},
+      {0x2126, 0x2126}, {0x212B, 0x212B},   {0x2153, 0x2154},
+      {0x215B, 0x215E}, {0x2160, 0x216B},   {0x2170, 0x2179},
+      {0x2190, 0x2199}, {0x21B8, 0x21B9},   {0x21D2, 0x21D2},
+      {0x21D4, 0x21D4}, {0x21E7, 0x21E7},   {0x2200, 0x2200},
+      {0x2202, 0x2203}, {0x2207, 0x2208},   {0x220B, 0x220B},
+      {0x220F, 0x220F}, {0x2211, 0x2211},   {0x2215, 0x2215},
+      {0x221A, 0x221A}, {0x221D, 0x2220},   {0x2223, 0x2223},
+      {0x2225, 0x2225}, {0x2227, 0x222C},   {0x222E, 0x222E},
+      {0x2234, 0x2237}, {0x223C, 0x223D},   {0x2248, 0x2248},
+      {0x224C, 0x224C}, {0x2252, 0x2252},   {0x2260, 0x2261},
+      {0x2264, 0x2267}, {0x226A, 0x226B},   {0x226E, 0x226F},
+      {0x2282, 0x2283}, {0x2286, 0x2287},   {0x2295, 0x2295},
+      {0x2299, 0x2299}, {0x22A5, 0x22A5},   {0x22BF, 0x22BF},
+      {0x2312, 0x2312}, {0x2460, 0x24E9},   {0x24EB, 0x254B},
+      {0x2550, 0x2573}, {0x2580, 0x258F},   {0x2592, 0x2595},
+      {0x25A0, 0x25A1}, {0x25A3, 0x25A9},   {0x25B2, 0x25B3},
+      {0x25B6, 0x25B7}, {0x25BC, 0x25BD},   {0x25C0, 0x25C1},
+      {0x25C6, 0x25C8}, {0x25CB, 0x25CB},   {0x25CE, 0x25D1},
+      {0x25E2, 0x25E5}, {0x25EF, 0x25EF},   {0x2605, 0x2606},
+      {0x2609, 0x2609}, {0x260E, 0x260F},   {0x2614, 0x2615},
+      {0x261C, 0x261C}, {0x261E, 0x261E},   {0x2640, 0x2640},
+      {0x2642, 0x2642}, {0x2660, 0x2661},   {0x2663, 0x2665},
+      {0x2667, 0x266A}, {0x266C, 0x266D},   {0x266F, 0x266F},
+      {0x273D, 0x273D}, {0x2776, 0x277F},   {0xE000, 0xF8FF},
+      {0xFFFD, 0xFFFD}, {0xF0000, 0xFFFFD}, {0x100000, 0x10FFFD}};
 
   /* binary search in table of non-spacing characters */
   if (bisearch(ucs, ambiguous, sizeof(ambiguous) / sizeof(struct interval) - 1))
@@ -279,16 +309,39 @@ static inline int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) {
 }
 
 // convert UTF-8 string to wstring
-static inline std::wstring utf8_decode(const std::string &str) {
-  std::wstring_convert<std::codecvt_utf8<wchar_t>> myconv;
-  return myconv.from_bytes(str);
+#ifdef _MSC_VER
+static inline std::wstring utf8_decode(const std::string& s) {
+    auto r = setlocale(LC_ALL, NULL);
+    std::string curLocale;
+    if (r)
+      curLocale = r;
+    const char* _Source = s.c_str();
+    size_t _Dsize = std::strlen(_Source) + 1;
+    wchar_t* _Dest = new wchar_t[_Dsize];
+    size_t _Osize;
+    mbstowcs_s(&_Osize, _Dest, _Dsize, _Source, _Dsize);
+    std::wstring result = _Dest;
+    delete[] _Dest;
+    setlocale(LC_ALL, curLocale.c_str());
+    return result;
 }
-
-// convert wstring to UTF-8 string
-static inline std::string utf8_encode(const std::wstring &str) {
-  std::wstring_convert<std::codecvt_utf8<wchar_t>> myconv;
-  return myconv.to_bytes(str);
+#else 
+static inline std::wstring utf8_decode(const std::string& s) {
+    auto r = setlocale(LC_ALL, NULL);
+    std::string curLocale;
+    if (r)
+      curLocale = r;
+    const char* _Source = s.c_str();
+    size_t _Dsize = mbstowcs(NULL, _Source, 0) + 1;
+    wchar_t* _Dest = new wchar_t[_Dsize];
+    wmemset(_Dest, 0, _Dsize);
+    mbstowcs(_Dest, _Source, _Dsize);
+    std::wstring result = _Dest;
+    delete[] _Dest;
+    setlocale(LC_ALL, curLocale.c_str());
+    return result;
 }
+#endif
 
 } // namespace details
 
@@ -301,18 +354,6 @@ static inline int display_width(const std::wstring &input) {
   return details::mk_wcswidth(input.c_str(), input.size());
 }
 
-#else
-
-static inline int display_width(const std::string &input) {
-  return input.length();
-}
-
-static inline int display_width(const std::wstring &input) {
-  return input.length();
-}
-
-#endif
-
 } // namespace unicode
 
 #endif

include/indicators/dynamic_progress.hpp

@@ -6,8 +6,11 @@
 #include <functional>
 #include <indicators/color.hpp>
 #include <indicators/setting.hpp>
+#include <indicators/cursor_control.hpp>
+#include <indicators/cursor_movement.hpp>
 #include <indicators/details/stream_helper.hpp>
 #include <iostream>
+#include <memory>
 #include <mutex>
 #include <vector>
 
@@ -17,10 +20,10 @@ template <typename Indicator> class DynamicProgress {
   using Settings = std::tuple<option::HideBarWhenComplete>;
 
 public:
-  template <typename... Indicators> explicit DynamicProgress(Indicators &... bars) {
-    bars_ = {bars...};
+  template <typename... Indicators> explicit DynamicProgress(Indicators &&... bars) {
+    (bars_.emplace_back(std::move(bars)), ...);
     for (auto &bar : bars_) {
-      bar.get().multi_progress_mode_ = true;
+      bar->multi_progress_mode_ = true;
       ++total_count_;
       ++incomplete_count_;
     }
@@ -29,13 +32,13 @@ public:
   Indicator &operator[](size_t index) {
     print_progress();
     std::lock_guard<std::mutex> lock{mutex_};
-    return bars_[index].get();
+    return *bars_[index];
   }
 
-  size_t push_back(Indicator &bar) {
+  size_t push_back(std::unique_ptr<Indicator> bar) {
     std::lock_guard<std::mutex> lock{mutex_};
-    bar.multi_progress_mode_ = true;
-    bars_.push_back(bar);
+    bar->multi_progress_mode_ = true;
+    bars_.push_back(std::move(bar));
     return bars_.size() - 1;
   }
 
@@ -61,7 +64,7 @@ private:
   Settings settings_;
   std::atomic<bool> started_{false};
   std::mutex mutex_;
-  std::vector<std::reference_wrapper<Indicator>> bars_;
+  std::vector<std::unique_ptr<Indicator>> bars_;
   std::atomic<size_t> total_count_{0};
   std::atomic<size_t> incomplete_count_{0};
 
@@ -83,13 +86,16 @@ public:
     if (hide_bar_when_complete) {
       // Hide completed bars
       if (started_) {
-        for (size_t i = 0; i < incomplete_count_; ++i)
-          std::cout << "\033[A\r\033[K" << std::flush;
+        for (size_t i = 0; i < incomplete_count_; ++i) {
+          move_up(1);
+          erase_line();
+          std::cout << std::flush;
+        }
       }
       incomplete_count_ = 0;
       for (auto &bar : bars_) {
-        if (!bar.get().is_completed()) {
-          bar.get().print_progress(true);
+        if (!bar->is_completed()) {
+          bar->print_progress(true);
           std::cout << "\n";
           ++incomplete_count_;
         }
@@ -98,12 +104,10 @@ public:
         started_ = true;
     } else {
       // Don't hide any bars
-      if (started_) {
-        for (size_t i = 0; i < total_count_; ++i)
-          std::cout << "\x1b[A";
-      }
+      if (started_)
+        move_up(static_cast<int>(total_count_));
       for (auto &bar : bars_) {
-        bar.get().print_progress(true);
+        bar->print_progress(true);
         std::cout << "\n";
       }
       if (!started_)
@@ -116,4 +120,4 @@ public:
 
 } // namespace indicators
 
-#endif
+#endif

include/indicators/indeterminate_progress_bar.hpp

@@ -160,7 +160,7 @@ private:
   template <typename Indicator> friend class DynamicProgress;
   std::atomic<bool> multi_progress_mode_{false};
 
-  std::pair<std::string, size_t> get_prefix_text() {
+  std::pair<std::string, int> get_prefix_text() {
     std::stringstream os;
     os << get_value<details::ProgressBarOption::prefix_text>();
     const auto result = os.str();
@@ -168,7 +168,7 @@ private:
     return {result, result_size};
   }
 
-  std::pair<std::string, size_t> get_postfix_text() {
+  std::pair<std::string, int> get_postfix_text() {
     std::stringstream os;
     os << " " << get_value<details::ProgressBarOption::postfix_text>();
 
@@ -219,7 +219,9 @@ public:
     const auto terminal_width = terminal_size().second;
     // prefix + bar_width + postfix should be <= terminal_width
     const int remaining = terminal_width - (prefix_length + start_length + bar_width + end_length + postfix_length);
-    if (remaining > 0) {
+    if (prefix_length == -1 || postfix_length == -1) {
+      os << "\r";
+    } else if (remaining > 0) {
       os << std::string(remaining, ' ') << "\r";
     } else if (remaining < 0) {
       // Do nothing. Maybe in the future truncate postfix with ...

include/indicators/progress_bar.hpp

@@ -166,7 +166,7 @@ public:
 
   size_t current() {
     std::lock_guard<std::mutex> lock{mutex_};
-    return std::min(
+    return (std::min)(
         progress_,
         size_t(get_value<details::ProgressBarOption::max_progress>()));
   }
@@ -216,7 +216,7 @@ private:
     }
   }
 
-  std::pair<std::string, size_t> get_prefix_text() {
+  std::pair<std::string, int> get_prefix_text() {
     std::stringstream os;
     os << get_value<details::ProgressBarOption::prefix_text>();
     const auto result = os.str();
@@ -224,14 +224,14 @@ private:
     return {result, result_size};
   }
 
-  std::pair<std::string, size_t> get_postfix_text() {
+  std::pair<std::string, int> get_postfix_text() {
     std::stringstream os;
     const auto max_progress =
         get_value<details::ProgressBarOption::max_progress>();
 
     if (get_value<details::ProgressBarOption::show_percentage>()) {
       os << " "
-         << std::min(static_cast<size_t>(static_cast<float>(progress_) /
+         << (std::min)(static_cast<size_t>(static_cast<float>(progress_) /
                                          max_progress * 100),
                      size_t(100))
          << "%";
@@ -338,7 +338,9 @@ public:
     const auto terminal_width = terminal_size().second;
     // prefix + bar_width + postfix should be <= terminal_width
     const int remaining = terminal_width - (prefix_length + start_length + bar_width + end_length + postfix_length);
-    if (remaining > 0) {
+    if (prefix_length == -1 || postfix_length == -1) {
+      os << "\r";
+    } else if (remaining > 0) {
       os << std::string(remaining, ' ') << "\r";
     } else if (remaining < 0) {
       // Do nothing. Maybe in the future truncate postfix with ...

include/indicators/progress_spinner.hpp

@@ -123,7 +123,7 @@ public:
 
   size_t current() {
     std::lock_guard<std::mutex> lock{mutex_};
-    return std::min(progress_, size_t(get_value<details::ProgressBarOption::max_progress>()));
+    return (std::min)(progress_, size_t(get_value<details::ProgressBarOption::max_progress>()));
   }
 
   bool is_completed() const { return get_value<details::ProgressBarOption::completed>(); }

include/indicators/termcolor.hpp

@@ -14,6 +14,7 @@
 
 #include <iostream>
 #include <cstdio>
+#include <cstdint>
 
 // Detect target's platform and set some macros in order to wrap platform
 // specific code this library depends on.

samples/block_progress_bar.cpp

@@ -14,10 +14,10 @@ int main() {
           std::vector<indicators::FontStyle>{indicators::FontStyle::bold}}};
 
   // Update bar state
-  auto progress = 0.0f;
+  size_t progress = 0;
   while (true) {
     bar.set_progress(progress);
-    progress += 0.25f;
+    progress++;
     if (bar.is_completed())
       break;
     std::this_thread::sleep_for(std::chrono::milliseconds(50));

samples/dynamic_progress.cpp

@@ -4,57 +4,60 @@ using namespace indicators;
 
 int main() {
 
-  ProgressBar bar1{option::BarWidth{50},
+  auto bar1 = std::make_unique<ProgressBar>(option::BarWidth{50},
                    option::ForegroundColor{Color::red},
                    option::ShowElapsedTime{true},
                    option::ShowRemainingTime{true},
                    option::PrefixText{"5c90d4a2d1a8: Downloading "},
                    indicators::option::FontStyles{
-                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}}};
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar2{option::BarWidth{50},
+  auto bar2 = std::make_unique<ProgressBar>(option::BarWidth{50},
                    option::ForegroundColor{Color::yellow},
                    option::ShowElapsedTime{true},
                    option::ShowRemainingTime{true},
                    option::PrefixText{"22337bfd13a9: Downloading "},
                    indicators::option::FontStyles{
-                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}}};
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar3{option::BarWidth{50},
+  auto bar3 = std::make_unique<ProgressBar>(option::BarWidth{50},
                    option::ForegroundColor{Color::green},
                    option::ShowElapsedTime{true},
                    option::ShowRemainingTime{true},
                    option::PrefixText{"10f26c680a34: Downloading "},
                    indicators::option::FontStyles{
-                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}}};
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar4{option::BarWidth{50},
+  auto bar4 = std::make_unique<ProgressBar>(option::BarWidth{50},
                    option::ForegroundColor{Color::white},
                    option::ShowElapsedTime{true},
                    option::ShowRemainingTime{true},
                    option::PrefixText{"6364e0d7a283: Downloading "},
                    indicators::option::FontStyles{
-                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}}};
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar5{option::BarWidth{50},
+  auto bar5 = std::make_unique<ProgressBar>(option::BarWidth{50},
                    option::ForegroundColor{Color::blue},
                    option::ShowElapsedTime{true},
                    option::ShowRemainingTime{true},
                    option::PrefixText{"ff1356ba118b: Downloading "},
                    indicators::option::FontStyles{
-                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}}};
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
-  ProgressBar bar6{option::BarWidth{50},
+  auto bar6 = std::make_unique<ProgressBar>(option::BarWidth{50},
                    option::ForegroundColor{Color::cyan},
                    option::ShowElapsedTime{true},
                    option::ShowRemainingTime{true},
                    option::PrefixText{"5a17453338b4: Downloading "},
                    indicators::option::FontStyles{
-                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}}};
+                       std::vector<indicators::FontStyle>{indicators::FontStyle::bold}});
 
   std::cout << termcolor::bold << termcolor::white << "Pulling image foo:bar/baz\n";
 
+  // Construct with 3 progress bars. We'll add 3 more at a later point
   DynamicProgress<ProgressBar> bars(bar1, bar2, bar3);
+
+  // Do not hide bars when completed
   bars.set_option(option::HideBarWhenComplete{false});
 
   std::thread fourth_job, fifth_job, sixth_job;
@@ -101,7 +104,7 @@ int main() {
       if (bars[0].is_completed()) {
         bars[0].set_option(option::PrefixText{"5c90d4a2d1a8: Pull complete "});
         // bar1 is completed, adding bar6
-        auto i = bars.push_back(bar6);
+        auto i = bars.push_back(std::move(bar6));
         sixth_job = std::thread(job6, i);
         sixth_job.join();
         break;
@@ -116,7 +119,7 @@ int main() {
       if (bars[1].is_completed()) {
         bars[1].set_option(option::PrefixText{"22337bfd13a9: Pull complete "});
         // bar2 is completed, adding bar5
-        auto i = bars.push_back(bar5);
+        auto i = bars.push_back(std::move(bar5));
         fifth_job = std::thread(job5, i);
         fifth_job.join();
         break;
@@ -131,7 +134,7 @@ int main() {
       if (bars[2].is_completed()) {
         bars[2].set_option(option::PrefixText{"10f26c680a34: Pull complete "});
         // bar3 is completed, adding bar4
-        auto i = bars.push_back(bar4);
+        auto i = bars.push_back(std::move(bar4));
         fourth_job = std::thread(job4, i);
         fourth_job.join();
         break;