From b08f47383247a80ee4d7bf6dd9ff4e46c6ae0a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9C=D0=B0?= =?UTF-8?q?=D1=80=D0=BA=D0=BE=D0=B2?= <13werwolf13@mail.ru> Date: Wed, 29 Sep 2021 09:50:16 +0500 Subject: [PATCH 1/4] add opensuse repo --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 6278b0a..7f5922f 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,22 @@ Also needs a UTF8 locale and a font that covers: make help ``` +**Binary release (from native os repo)** + +* **openSUSE** + * **Add repo** + ```bash + sudo zypper ar --refresh obs://home:Werwolf2517 home:Werwolf2517 + ``` + * **Refresh metadata** + ```bash + sudo zypper ref + ``` + * **Install package** + ```bash + sudo zypper in btop + ``` + ## Compilation Needs GCC 10 or higher, (GCC 11 or above strongly recommended for better CPU efficiency in the compiled binary). From 3a4a9d09b59cee6ee1d60669a1bc885d7c8a40fa Mon Sep 17 00:00:00 2001 From: aristocratos Date: Fri, 1 Oct 2021 20:46:05 +0200 Subject: [PATCH 2/4] v1.0.12 Bug fixes --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ec21b0..6e98539 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v1.0.12 + +* Fixed: Exception handling for faulty net download/upload speed + +* Fixed: Cpu percent formatting if over 10'000 + ## v1.0.11 * Changed: atomic_wait to use while loop instead of wait() because of rare stall when a signal handler is triggered while waiting From 585bb7bb1e31e7193b8d749ac9b999a1c9870f52 Mon Sep 17 00:00:00 2001 From: aristocratos Date: Sat, 2 Oct 2021 22:39:45 +0200 Subject: [PATCH 3/4] Changed: Graph empty symbol is now regular whitespace --- src/btop_draw.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/btop_draw.cpp b/src/btop_draw.cpp index 7406d15..6a8cf68 100644 --- a/src/btop_draw.cpp +++ b/src/btop_draw.cpp @@ -43,42 +43,42 @@ namespace Symbols { const unordered_flat_map> graph_symbols = { { "braille_up", { - " ", "⢀", "⢠", "⢰", "⢸", + " ", "⢀", "⢠", "⢰", "⢸", "⡀", "⣀", "⣠", "⣰", "⣸", "⡄", "⣄", "⣤", "⣴", "⣼", "⡆", "⣆", "⣦", "⣶", "⣾", "⡇", "⣇", "⣧", "⣷", "⣿" }}, {"braille_down", { - " ", "⠈", "⠘", "⠸", "⢸", + " ", "⠈", "⠘", "⠸", "⢸", "⠁", "⠉", "⠙", "⠹", "⢹", "⠃", "⠋", "⠛", "⠻", "⢻", "⠇", "⠏", "⠟", "⠿", "⢿", "⡇", "⡏", "⡟", "⡿", "⣿" }}, {"block_up", { - " ", "▗", "▗", "▐", "▐", + " ", "▗", "▗", "▐", "▐", "▖", "▄", "▄", "▟", "▟", "▖", "▄", "▄", "▟", "▟", "▌", "▙", "▙", "█", "█", "▌", "▙", "▙", "█", "█" }}, {"block_down", { - " ", "▝", "▝", "▐", "▐", + " ", "▝", "▝", "▐", "▐", "▘", "▀", "▀", "▜", "▜", "▘", "▀", "▀", "▜", "▜", "▌", "▛", "▛", "█", "█", "▌", "▛", "▛", "█", "█" }}, {"tty_up", { - " ", "░", "░", "▒", "▒", + " ", "░", "░", "▒", "▒", "░", "░", "▒", "▒", "█", "░", "▒", "▒", "▒", "█", "▒", "▒", "▒", "█", "█", "▒", "█", "█", "█", "█" }}, {"tty_down", { - " ", "░", "░", "▒", "▒", + " ", "░", "░", "▒", "▒", "░", "░", "▒", "▒", "█", "░", "▒", "▒", "▒", "█", "▒", "▒", "▒", "█", "█", @@ -431,7 +431,7 @@ namespace Draw { //? Populate the two switching graph vectors and fill empty space if data size < width for (const int& i : iota(0, height * 2)) { if (tty_mode and i % 2 != current) continue; - graphs[(i % 2 != 0)].push_back((value_width < width) ? ((height == 1) ? Mv::r(1) : " "s) * (width - value_width) : ""); + graphs[(i % 2 != 0)].push_back((value_width < width) ? ((height == 1) ? Mv::r(1) : " "s) * (width - value_width) : ""); } if (data.size() == 0) return; this->_create(data, data_offset); @@ -444,6 +444,7 @@ namespace Draw { if (not tty_mode) current = not current; for (const int& i : iota(0, height)) { if (graphs.at(current).at(i).at(1) == '[') graphs.at(current).at(i).erase(0, 4); + else if (graphs.at(current).at(i).at(0) == ' ') graphs.at(current).at(i).erase(0, 1); else graphs.at(current).at(i).erase(0, 3); } this->_create(data, (int)data.size() - 1); From f9505a425d3d4eac5bb11009eb8ab8c841066ba5 Mon Sep 17 00:00:00 2001 From: aristocratos Date: Sat, 2 Oct 2021 22:43:49 +0200 Subject: [PATCH 4/4] v1.0.13 Better symbol compatibility --- CHANGELOG.md | 4 ++++ README.md | 3 +-- src/btop.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e98539..b4fec24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v1.0.13 + +* Changed: Graph empty symbol is now regular whitespace + ## v1.0.12 * Fixed: Exception handling for faulty net download/upload speed diff --git a/README.md b/README.md index db5f46e..3d4e2f6 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,6 @@ Also needs a UTF8 locale and a font that covers: * Unicode Block “Braille Patterns” U+2800 - U+28FF (Not needed in TTY mode or with graphs set to type: block or tty.) * Unicode Block “Geometric Shapes” U+25A0 - U+25FF * Unicode Block "Box Drawing" and "Block Elements" U+2500 - U+259F -* Unicode Block "General punctuation" U+2005 ### **Notice (Text rendering issues)** @@ -213,7 +212,7 @@ Also needs a UTF8 locale and a font that covers: * **openSUSE** * **Add repo** ```bash - sudo zypper ar --refresh obs://home:Werwolf2517 home:Werwolf2517 + sudo zypper ar --refresh obs://home:Werwolf2517 home:Werwolf2517 ``` * **Refresh metadata** ```bash diff --git a/src/btop.cpp b/src/btop.cpp index bef5a16..64b925d 100644 --- a/src/btop.cpp +++ b/src/btop.cpp @@ -55,7 +55,7 @@ namespace Global { {"#801414", "██████╔╝ ██║ ╚██████╔╝██║ ╚═╝ ╚═╝"}, {"#000000", "╚═════╝ ╚═╝ ╚═════╝ ╚═╝"}, }; - const string Version = "1.0.12"; + const string Version = "1.0.13"; int coreCount; string overlay;