the-btfash-foundation/tmux-mem-cpu-load
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nerdfont_graph' into improved_segment_adjacency

Browse Source 
Merge vertical graph branch with improved_segment_adjacency branch
This commit is contained in:
henry.potgieter 2023-03-29 22:39:48 -04:00
commit d900b3a546
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@ -144,8 +144,8 @@ The full usage::
Use tmux colors in output Use tmux colors in output
-p, --powerline-left -p, --powerline-left
Use powerline left symbols throughout the output, enables --colors Use powerline left symbols throughout the output, enables --colors
-n, --nerd-graph -v, --vertical-graph
Use NerdFont characters to render CPU graph as vertical bar chart Use vertical bar chart for CPU graph
-q, --powerline-right -q, --powerline-right
Use powerline right symbols throughout the output, enables --colors Use powerline right symbols throughout the output, enables --colors
-i <value>, --interval <value> -i <value>, --interval <value>

2
common/graph.cc
View File

@ -61,7 +61,7 @@ std::string get_graph_by_value( unsigned value, unsigned max, unsigned len )
return bars; return bars;
} }
std::string get_graph_nerd( unsigned value ) std::string get_graph_vert( unsigned value )
{ {
static const std::map<unsigned, std::string> graph_chars = { static const std::map<unsigned, std::string> graph_chars = {
{ 0, " " }, { 10, "▁" }, { 20, "▂" }, { 30, "▃" }, { 40, "▄" }, { 0, " " }, { 10, "▁" }, { 20, "▂" }, { 30, "▃" }, { 40, "▄" },

2
common/graph.h
View File

@ -23,6 +23,6 @@
std::string get_graph_by_percentage( unsigned, unsigned len = 10 ); std::string get_graph_by_percentage( unsigned, unsigned len = 10 );
std::string get_graph_by_value( unsigned, unsigned, unsigned len = 10 ); std::string get_graph_by_value( unsigned, unsigned, unsigned len = 10 );
std::string get_graph_nerd( unsigned ); std::string get_graph_vert( unsigned );
#endif #endif

22
common/main.cc
View File

@ -37,7 +37,7 @@
std::string cpu_string( CPU_MODE cpu_mode, unsigned int cpu_usage_delay, unsigned int graph_lines, std::string cpu_string( CPU_MODE cpu_mode, unsigned int cpu_usage_delay, unsigned int graph_lines,
bool use_colors = false, bool use_colors = false,
bool use_powerline_left = false, bool use_powerline_right = false, bool use_nerd_graph = false) bool use_powerline_left = false, bool use_powerline_right = false, bool use_vert_graph = false)
{ {
float percentage; float percentage;
@ -80,10 +80,10 @@ std::string cpu_string( CPU_MODE cpu_mode, unsigned int cpu_usage_delay, unsigne
} }
} }
if( use_nerd_graph ) if( use_vert_graph )
{ {
oss << "▕"; oss << "▕";
oss << get_graph_nerd( unsigned( percentage ) ); oss << get_graph_vert( unsigned( percentage ) );
oss << "▏"; oss << "▏";
} }
else if( graph_lines > 0) else if( graph_lines > 0)
@ -129,8 +129,8 @@ void print_help()
<< "\tUse powerline left symbols throughout the output, enables --colors\n" << "\tUse powerline left symbols throughout the output, enables --colors\n"
<< "-q, --powerline-right\n" << "-q, --powerline-right\n"
<< "\tUse powerline right symbols throughout the output, enables --colors\n" << "\tUse powerline right symbols throughout the output, enables --colors\n"
<< "-n, --nerd-graph\n" << "-v, --vertical-graph\n"
<< "\tUse NerdFont symbols to render CPU graph as vertical bar chart\n" << "\tUse vertical bar chart for CPU graph\n"
<< "-l <value>, --segments-left <value>\n" << "-l <value>, --segments-left <value>\n"
<< "\tEnable blending bg/fg color (depending on -p or -q use) with segment to left\n" << "\tEnable blending bg/fg color (depending on -p or -q use) with segment to left\n"
<< "-r <value>, --segments-right <value>\n" << "-r <value>, --segments-right <value>\n"
@ -158,7 +158,7 @@ int main( int argc, char** argv )
bool use_colors = false; bool use_colors = false;
bool use_powerline_left = false; bool use_powerline_left = false;
bool use_powerline_right = false; bool use_powerline_right = false;
bool use_nerd_graph = false; bool use_vert_graph = false;
bool segments_to_left = false; bool segments_to_left = false;
bool segments_to_right= false; bool segments_to_right= false;
MEMORY_MODE mem_mode = MEMORY_MODE_DEFAULT; MEMORY_MODE mem_mode = MEMORY_MODE_DEFAULT;
@ -174,7 +174,7 @@ int main( int argc, char** argv )
{ "colors", no_argument, NULL, 'c' }, { "colors", no_argument, NULL, 'c' },
{ "powerline-left", no_argument, NULL, 'p' }, { "powerline-left", no_argument, NULL, 'p' },
{ "powerline-right", no_argument, NULL, 'q' }, { "powerline-right", no_argument, NULL, 'q' },
{ "nerd-graph", no_argument, NULL, 'n' }, { "vertical-graph", no_argument, NULL, 'v' },
{ "interval", required_argument, NULL, 'i' }, { "interval", required_argument, NULL, 'i' },
{ "graph-lines", required_argument, NULL, 'g' }, { "graph-lines", required_argument, NULL, 'g' },
{ "mem-mode", required_argument, NULL, 'm' }, { "mem-mode", required_argument, NULL, 'm' },
@ -187,7 +187,7 @@ int main( int argc, char** argv )
int c; int c;
// while c != -1 // while c != -1
while( (c = getopt_long( argc, argv, "hi:cpqnl:r:g:m:a:t:", long_options, NULL) ) != -1 ) while( (c = getopt_long( argc, argv, "hi:cpqvl:r:g:m:a:t:", long_options, NULL) ) != -1 )
{ {
switch( c ) switch( c )
{ {
@ -206,8 +206,8 @@ int main( int argc, char** argv )
use_colors = true; use_colors = true;
use_powerline_right = true; use_powerline_right = true;
break; break;
case 'n': // --nerd-graph case 'v': // --vertical-graph
use_nerd_graph = true; use_vert_graph = true;
break; break;
case 'l': // --segments-left case 'l': // --segments-left
segments_to_left = true; segments_to_left = true;
@ -288,7 +288,7 @@ int main( int argc, char** argv )
MemoryStatus memory_status; MemoryStatus memory_status;
mem_status( memory_status ); mem_status( memory_status );
std::cout << mem_string( memory_status, mem_mode, use_colors, use_powerline_left, use_powerline_right, segments_to_left, left_color ) std::cout << mem_string( memory_status, mem_mode, use_colors, use_powerline_left, use_powerline_right, segments_to_left, left_color )
<< cpu_string( cpu_mode, cpu_usage_delay, graph_lines, use_colors, use_powerline_left, use_powerline_right, use_nerd_graph ) << cpu_string( cpu_mode, cpu_usage_delay, graph_lines, use_colors, use_powerline_left, use_powerline_right, use_vert_graph )
<< load_string( use_colors, use_powerline_left, use_powerline_right, averages_count, segments_to_right, right_color ); << load_string( use_colors, use_powerline_left, use_powerline_right, averages_count, segments_to_right, right_color );
std::cout << std::endl; std::cout << std::endl;