diff --git a/CHANGELOG.md b/CHANGELOG.md index 00273c153..eda2d37a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -158,7 +158,7 @@ * Fixed: Wrong memory unit when shorten and size is less than 10, by @mohi001 -* Fixed: Use cpu cores avarage temp if missing cpu package temp for FreeBSD +* Fixed: Use cpu cores average temp if missing cpu package temp for FreeBSD * Changed: Enter symbol to a more common variant @@ -454,7 +454,7 @@ * Fixed: Sizing constraints bug on start and boxes can be toggled from size error screen -* Fixed: UTF-8 check crashing if LANG was set to non existant locale +* Fixed: UTF-8 check crashing if LANG was set to non existent locale ## v1.0.4 diff --git a/CMakeLists.txt b/CMakeLists.txt index cd399462f..4216e1682 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ if(LINUX AND BTOP_GPU) if(BTOP_RSMI_STATIC) # ROCm doesn't properly add it's folders to the module path if `CMAKE_MODULE_PATH` is already # set - # We could also manully append ROCm's path here + # We could also manually append ROCm's path here set(_CMAKE_MODULE_PATH CMAKE_MODULE_PATH) unset(CMAKE_MODULE_PATH) diff --git a/README.md b/README.md index 13e57aed6..b9b808911 100644 --- a/README.md +++ b/README.md @@ -425,7 +425,7 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa | `GPU_SUPPORT=` | Enable/disable GPU support (Enabled by default on X86_64 Linux) | | `RSMI_STATIC=true` | To statically link the ROCm SMI library used for querying AMDGPU | | `ADDFLAGS=` | For appending flags to both compiler and linker | - | `CXX=` | Manualy set which compiler to use | + | `CXX=` | Manually set which compiler to use | Example: `make ADDFLAGS=-march=native` might give a performance boost if compiling only for your own system. @@ -596,7 +596,7 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa | `ARCH=` | To manually set the target architecture | | `FORTIFY_SOURCE=false` | Disable fortification with `_FORTIFY_SOURCE=3` | | `ADDFLAGS=` | For appending flags to both compiler and linker | - | `CXX=` | Manualy set which compiler to use | + | `CXX=` | Manually set which compiler to use | Example: `gmake ADDFLAGS=-march=native` might give a performance boost if compiling only for your own system. @@ -764,7 +764,7 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa | `ARCH=` | To manually set the target architecture | | `FORTIFY_SOURCE=false` | Disable fortification with `_FORTIFY_SOURCE=3` | | `ADDFLAGS=` | For appending flags to both compiler and linker | - | `CXX=` | Manualy set which compiler to use | + | `CXX=` | Manually set which compiler to use | Example: `gmake ADDFLAGS=-march=native` might give a performance boost if compiling only for your own system. @@ -945,7 +945,7 @@ If you have an AMD GPU `rocm_smi_lib` is required, which may or may not be packa | `ARCH=` | To manually set the target architecture | | `FORTIFY_SOURCE=false` | Disable fortification with `_FORTIFY_SOURCE=3` | | `ADDFLAGS=` | For appending flags to both compiler and linker | - | `CXX=` | Manualy set which compiler to use | + | `CXX=` | Manually set which compiler to use | Example: `gmake ADDFLAGS=-march=native` might give a performance boost if compiling only for your own system. diff --git a/src/btop.cpp b/src/btop.cpp index 736854fc9..2d2e69ba5 100644 --- a/src/btop.cpp +++ b/src/btop.cpp @@ -403,7 +403,7 @@ namespace Runner { } }; - //* Wrapper for raising priviliges when using SUID bit + //* Wrapper for raising privileges when using SUID bit class gain_priv { int status = -1; public: @@ -836,7 +836,7 @@ int main(int argc, char **argv) { Global::start_time = time_s(); - //? Save real and effective userid's and drop priviliges until needed if running with SUID bit set + //? Save real and effective userid's and drop privileges until needed if running with SUID bit set Global::real_uid = getuid(); Global::set_uid = geteuid(); if (Global::real_uid != Global::set_uid) { diff --git a/src/btop_input.hpp b/src/btop_input.hpp index 13f14fe65..91b9dc946 100644 --- a/src/btop_input.hpp +++ b/src/btop_input.hpp @@ -56,7 +56,7 @@ namespace Input { //* Last entered key extern deque history; - //* Poll keyboard & mouse input for ms and return input availabilty as a bool + //* Poll keyboard & mouse input for ms and return input availability as a bool bool poll(const uint64_t timeout=0); //* Get a key or mouse action from input diff --git a/src/btop_menu.cpp b/src/btop_menu.cpp index fb119aadf..91239f12c 100644 --- a/src/btop_menu.cpp +++ b/src/btop_menu.cpp @@ -484,7 +484,7 @@ namespace Menu { "Kelvin, 0 = absolute zero, 1 degree change", "equals 1 degree change in Celsius.", "", - "Rankine, 0 = abosulte zero, 1 degree change", + "Rankine, 0 = absolute zero, 1 degree change", "equals 1 degree change in Fahrenheit."}, {"show_cpu_freq", "Show CPU frequency.", @@ -645,7 +645,7 @@ namespace Menu { "", "Begin line with \"exclude=\" to change to", "exclude filter.", - "Oterwise defaults to \"most include\" filter.", + "Otherwise defaults to \"most include\" filter.", "", "Example:", "\"exclude=/boot /home/user\""}, diff --git a/src/btop_theme.hpp b/src/btop_theme.hpp index cc3fbdfff..dcc00e44e 100644 --- a/src/btop_theme.hpp +++ b/src/btop_theme.hpp @@ -32,7 +32,7 @@ namespace Theme { extern std::filesystem::path theme_dir; extern std::filesystem::path user_theme_dir; - //* Contains "Default" and "TTY" at indeces 0 and 1, otherwise full paths to theme files + //* Contains "Default" and "TTY" at indices 0 and 1, otherwise full paths to theme files extern vector themes; //* Generate escape sequence for 24-bit or 256 color and return as a string diff --git a/src/btop_tools.cpp b/src/btop_tools.cpp index 8a85ed41d..d1351e401 100644 --- a/src/btop_tools.cpp +++ b/src/btop_tools.cpp @@ -89,7 +89,7 @@ namespace Term { } bool refresh(bool only_check) { - // Query dimensions of '/dev/tty' of the 'STDOUT_FILENO' isn't avaiable. + // Query dimensions of '/dev/tty' of the 'STDOUT_FILENO' isn't available. // This variable is set in those cases to avoid calls to ioctl constinit static bool uses_dev_tty = false; struct winsize wsize {}; @@ -644,7 +644,7 @@ namespace Logger { size_t loglevel; fs::path logfile; - //* Wrapper for lowering priviliges if using SUID bit and currently isn't using real userid + //* Wrapper for lowering privileges if using SUID bit and currently isn't using real userid class lose_priv { int status = -1; public: diff --git a/src/btop_tools.hpp b/src/btop_tools.hpp index 705a5eb83..013302853 100644 --- a/src/btop_tools.hpp +++ b/src/btop_tools.hpp @@ -112,7 +112,7 @@ namespace Mv { //* Save cursor position const string save = Fx::e + "s"; - //* Restore saved cursor postion + //* Restore saved cursor position const string restore = Fx::e + "u"; } @@ -284,7 +284,7 @@ namespace Tools { return is_in(str, "true", "True"); } - //* Check if a string is a valid integer value (only postive) + //* Check if a string is a valid integer value (only positive) inline bool isint(const string& str) { return all_of(str.begin(), str.end(), ::isdigit); } diff --git a/src/freebsd/btop_collect.cpp b/src/freebsd/btop_collect.cpp index 2db49a2fa..400ba7a77 100644 --- a/src/freebsd/btop_collect.cpp +++ b/src/freebsd/btop_collect.cpp @@ -277,7 +277,7 @@ namespace Cpu { got_sensors = true; int temp; size_t size = sizeof(temp); - sysctlbyname("dev.cpu.0.coretemp.tjmax", &temp, &size, nullptr, 0); //asuming the max temp is same for all cores + sysctlbyname("dev.cpu.0.coretemp.tjmax", &temp, &size, nullptr, 0); //assuming the max temp is same for all cores temp = (temp - 2732) / 10; // since it's an int, it's multiplied by 10, and offset to absolute zero... current_cpu.temp_max = temp; } @@ -925,7 +925,7 @@ namespace Net { } } - //? Get total recieved and transmitted bytes + device address if no ip was found + //? Get total received and transmitted bytes + device address if no ip was found for (const auto &iface : interfaces) { for (const string dir : {"download", "upload"}) { auto &saved_stat = net.at(iface).stat.at(dir); diff --git a/src/linux/btop_collect.cpp b/src/linux/btop_collect.cpp index eb8c2b735..c120d689f 100644 --- a/src/linux/btop_collect.cpp +++ b/src/linux/btop_collect.cpp @@ -2013,7 +2013,7 @@ namespace Mem { if (access(zfs_pool_stat_path.c_str(), R_OK) == 0) { return zfs_pool_stat_path; } else { - Logger::debug("Cant access folder: " + zfs_pool_stat_path.string()); + Logger::debug("Can't access folder: " + zfs_pool_stat_path.string()); return ""; } } @@ -2228,7 +2228,7 @@ namespace Net { } //else, ignoring family==AF_PACKET (see man 3 getifaddrs) which is the first one in the `for` loop. } - //? Get total recieved and transmitted bytes + device address if no ip was found + //? Get total received and transmitted bytes + device address if no ip was found for (const auto& iface : interfaces) { if (net.at(iface).ipv4.empty() and net.at(iface).ipv6.empty()) net.at(iface).ipv4 = readfile("/sys/class/net/" + iface + "/address"); diff --git a/src/openbsd/btop_collect.cpp b/src/openbsd/btop_collect.cpp index df3566290..241938fb3 100644 --- a/src/openbsd/btop_collect.cpp +++ b/src/openbsd/btop_collect.cpp @@ -882,7 +882,7 @@ namespace Net { } } - //? Get total recieved and transmitted bytes + device address if no ip was found + //? Get total received and transmitted bytes + device address if no ip was found for (const auto &iface : interfaces) { for (const string dir : {"download", "upload"}) { auto &saved_stat = net.at(iface).stat.at(dir); diff --git a/src/osx/btop_collect.cpp b/src/osx/btop_collect.cpp index 860e457e2..1a9b25d58 100644 --- a/src/osx/btop_collect.cpp +++ b/src/osx/btop_collect.cpp @@ -940,7 +940,7 @@ namespace Net { } } - //? Get total recieved and transmitted bytes + device address if no ip was found + //? Get total received and transmitted bytes + device address if no ip was found for (const auto &iface : interfaces) { for (const string dir : {"download", "upload"}) { auto &saved_stat = net.at(iface).stat.at(dir); diff --git a/themes/adapta.theme b/themes/adapta.theme index e3e2128cd..4448228a7 100644 --- a/themes/adapta.theme +++ b/themes/adapta.theme @@ -18,7 +18,7 @@ theme[main_fg]="#cfd8dc" # Title color for boxes theme[title]="#ff" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#90" # Background color of selected item in processes box diff --git a/themes/adwaita.theme b/themes/adwaita.theme index 25e6bbfd3..97a52bc9f 100644 --- a/themes/adwaita.theme +++ b/themes/adwaita.theme @@ -18,7 +18,7 @@ theme[main_fg]="#2e3436" # Title color for boxes theme[title]="#2e3436" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#1a5fb4" # Background color of selected item in processes box diff --git a/themes/dusklight.theme b/themes/dusklight.theme index be60f1afd..01e5ae672 100644 --- a/themes/dusklight.theme +++ b/themes/dusklight.theme @@ -18,7 +18,7 @@ theme[main_fg]="#99DFFF" # Title color for boxes theme[title]="#99FFFF" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#FF7F00" # Background color of selected item in processes box diff --git a/themes/elementarish.theme b/themes/elementarish.theme index 0fe539826..436b6f862 100644 --- a/themes/elementarish.theme +++ b/themes/elementarish.theme @@ -11,7 +11,7 @@ theme[main_fg]="#eee8d5" # Title color for boxes theme[title]="#eee8d5" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#d1302c" # Background color of selected item in processes box diff --git a/themes/flat-remix-light.theme b/themes/flat-remix-light.theme index db1afe41a..8344a9698 100644 --- a/themes/flat-remix-light.theme +++ b/themes/flat-remix-light.theme @@ -18,7 +18,7 @@ theme[main_fg]="#737680" # Title color for boxes theme[title]="#272a34" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#90" # Background color of selected item in processes box diff --git a/themes/flat-remix.theme b/themes/flat-remix.theme index 54585e7b3..0a53a95b4 100644 --- a/themes/flat-remix.theme +++ b/themes/flat-remix.theme @@ -18,7 +18,7 @@ theme[main_fg]="#E6E6E6" # Title color for boxes theme[title]="#ff" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#90" # Background color of selected item in processes box diff --git a/themes/greyscale.theme b/themes/greyscale.theme index 442a82f9d..aee12afff 100644 --- a/themes/greyscale.theme +++ b/themes/greyscale.theme @@ -18,7 +18,7 @@ theme[main_fg]="#bb" # Title color for boxes theme[title]="#cc" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#90" # Background color of selected item in processes box diff --git a/themes/gruvbox_dark.theme b/themes/gruvbox_dark.theme index feed89361..8cd9d37ac 100644 --- a/themes/gruvbox_dark.theme +++ b/themes/gruvbox_dark.theme @@ -18,7 +18,7 @@ theme[main_fg]="#a89984" # Title color for boxes theme[title]="#ebdbb2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#d79921" # Background color of selected items diff --git a/themes/gruvbox_material_dark.theme b/themes/gruvbox_material_dark.theme index 749c7a719..5dc58229f 100644 --- a/themes/gruvbox_material_dark.theme +++ b/themes/gruvbox_material_dark.theme @@ -18,7 +18,7 @@ theme[main_fg]="#d4be98" # Title color for boxes theme[title]="#d4be98" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#ea6962" # Background color of selected items diff --git a/themes/matcha-dark-sea.theme b/themes/matcha-dark-sea.theme index 34889fffb..07a0b3842 100644 --- a/themes/matcha-dark-sea.theme +++ b/themes/matcha-dark-sea.theme @@ -18,7 +18,7 @@ theme[main_fg]="#F8F8F2" # Title color for boxes theme[title]="#F8F8F2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#2eb398" # Background color of selected item in processes box diff --git a/themes/monokai.theme b/themes/monokai.theme index f379dc908..29299f5c5 100644 --- a/themes/monokai.theme +++ b/themes/monokai.theme @@ -18,7 +18,7 @@ theme[main_fg]="#F8F8F2" # Title color for boxes theme[title]="#F8F8F2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#F92672" # Background color of selected item in processes box diff --git a/themes/night-owl.theme b/themes/night-owl.theme index 7537feac7..0de70aeeb 100644 --- a/themes/night-owl.theme +++ b/themes/night-owl.theme @@ -18,7 +18,7 @@ theme[main_fg]="#d6deeb" # Title color for boxes theme[title]="#ffffff" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#addb67" # Background color of selected items diff --git a/themes/nord.theme b/themes/nord.theme index 07c43c278..fbd0af143 100644 --- a/themes/nord.theme +++ b/themes/nord.theme @@ -18,7 +18,7 @@ theme[main_fg]="#D8DEE9" # Title color for boxes theme[title]="#8FBCBB" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#5E81AC" # Background color of selected item in processes box diff --git a/themes/onedark.theme b/themes/onedark.theme index f4441deb8..5a5ad01ab 100644 --- a/themes/onedark.theme +++ b/themes/onedark.theme @@ -10,7 +10,7 @@ theme[main_fg]="#abb2bf" # Title color for boxes theme[title]="#abb2bf" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#61afef" # Background color of selected item in processes box diff --git a/themes/paper.theme b/themes/paper.theme index 111289dca..00f96a2e8 100644 --- a/themes/paper.theme +++ b/themes/paper.theme @@ -12,7 +12,7 @@ theme[main_fg]="#00" # Title color for boxes theme[title]="#00" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#CC3E28" # Background color of selected item in processes box diff --git a/themes/solarized_dark.theme b/themes/solarized_dark.theme index 606982329..2b3c62b4f 100644 --- a/themes/solarized_dark.theme +++ b/themes/solarized_dark.theme @@ -18,7 +18,7 @@ theme[main_fg]="#eee8d5" # Title color for boxes theme[title]="#fdf6e3" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#b58900" # Background color of selected items diff --git a/themes/solarized_light.theme b/themes/solarized_light.theme index 947841044..c786ce230 100644 --- a/themes/solarized_light.theme +++ b/themes/solarized_light.theme @@ -18,7 +18,7 @@ theme[main_fg]="#586e75" # Title color for boxes theme[title]="#002b36" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#b58900" # Background color of selected items diff --git a/themes/tokyo-night.theme b/themes/tokyo-night.theme index aae6a3b11..b8200ec6e 100644 --- a/themes/tokyo-night.theme +++ b/themes/tokyo-night.theme @@ -10,7 +10,7 @@ theme[main_fg]="#cfc9c2" # Title color for boxes theme[title]="#cfc9c2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#7dcfff" # Background color of selected item in processes box diff --git a/themes/tokyo-storm.theme b/themes/tokyo-storm.theme index a4edfcf2f..e987f1c5b 100644 --- a/themes/tokyo-storm.theme +++ b/themes/tokyo-storm.theme @@ -10,7 +10,7 @@ theme[main_fg]="#cfc9c2" # Title color for boxes theme[title]="#cfc9c2" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#7dcfff" # Background color of selected item in processes box diff --git a/themes/tomorrow-night.theme b/themes/tomorrow-night.theme index a745005ea..590004451 100644 --- a/themes/tomorrow-night.theme +++ b/themes/tomorrow-night.theme @@ -18,7 +18,7 @@ theme[main_fg]="#c5c8c6" # Title color for boxes theme[title]="#c5c8c6" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#81beb7" # Background color of selected item in processes box diff --git a/themes/whiteout.theme b/themes/whiteout.theme index 23c8ebea7..891bb7d6c 100644 --- a/themes/whiteout.theme +++ b/themes/whiteout.theme @@ -18,7 +18,7 @@ theme[main_fg]="#30" # Title color for boxes theme[title]="#10" -# Higlight color for keyboard shortcuts +# Highlight color for keyboard shortcuts theme[hi_fg]="#284d75" # Background color of selected item in processes box