From f9663c8f2fb955e0475d2896576a4f5901be160c Mon Sep 17 00:00:00 2001 From: "henry.potgieter" Date: Mon, 27 Mar 2023 11:11:55 -0400 Subject: [PATCH 1/7] Add options to allow embedding tmux-mem-cpu-load segments within/beside other segments --- common/load.cc | 16 +++++++++++++--- common/load.h | 3 ++- common/main.cc | 34 ++++++++++++++++++++++++++++++--- common/memory.cc | 16 ++++++++++++++-- common/memory.h | 4 +++- common/powerline.cc | 46 +++++++++++++++++++++++++++++++++++++++++++++ common/powerline.h | 2 ++ 7 files changed, 111 insertions(+), 10 deletions(-) diff --git a/common/load.cc b/common/load.cc index 092ba8f..3d3d92c 100644 --- a/common/load.cc +++ b/common/load.cc @@ -26,6 +26,7 @@ #include // getloadavg() #include // floorf() #include +#include #include "cpu.h" #include "load.h" @@ -35,8 +36,8 @@ // Load Averages std::string load_string( bool use_colors, - bool use_powerline_left, bool use_powerline_right, - short num_averages ) + bool use_powerline_left, bool use_powerline_right, short num_averages, + bool segments_to_right, short right_color ) { std::ostringstream ss; ss.setf( std::ios::fixed, std::ios::floatfield ); @@ -97,7 +98,12 @@ std::string load_string( bool use_colors, if( use_colors ) { - if( use_powerline_left ) + if( use_powerline_left && segments_to_right ) + { + powerline( ss, load_lut[load_percent], POWERLINE_LEFT, true ); + powerline_char( ss, load_lut[load_percent], right_color, POWERLINE_LEFT, true ); + } + else if( use_powerline_left && !segments_to_right ) { powerline( ss, load_lut[load_percent], POWERLINE_LEFT, true ); powerline( ss, "#[fg=default,bg=default]", POWERLINE_LEFT ); @@ -106,6 +112,10 @@ std::string load_string( bool use_colors, { ss << "#[fg=default,bg=default]"; } + else if ( segments_to_right && use_powerline_right ) + { + powerline_char( ss, load_lut[load_percent], right_color, POWERLINE_RIGHT, true ); + } } } diff --git a/common/load.h b/common/load.h index 4b57015..5f1f98b 100644 --- a/common/load.h +++ b/common/load.h @@ -24,6 +24,7 @@ std::string load_string( bool use_colors = false, bool use_powerline_left = false, bool use_powerline_right = false, - short num_averages = 3 ); + short num_averages = 3, bool segments_to_right = false, + short right_color = 0 ); #endif diff --git a/common/main.cc b/common/main.cc index 37dfc6f..90fe1bf 100644 --- a/common/main.cc +++ b/common/main.cc @@ -131,6 +131,10 @@ void print_help() << "\tUse powerline right symbols throughout the output, enables --colors\n" << "-n, --nerd-graph\n" << "\tUse NerdFont symbols to render CPU graph as vertical bar chart\n" + << "-l , --segments-left \n" + << "\tEnable blending bg/fg color (depending on -p or -q use) with segment to left\n" + << "-r , --segments-right \n" + << "\tEnable blending bg/fg color (depending on -p or -q use) with segment to left\n" << "-i , --interval \n" << "\tSet tmux status refresh interval in seconds. Default: 1 second\n" << "-g , --graph-lines \n" @@ -149,10 +153,14 @@ int main( int argc, char** argv ) unsigned cpu_usage_delay = 990000; short averages_count = 3; short graph_lines = 10; // max 32767 should be enough + short left_color = 0; + short right_color = 0; bool use_colors = false; bool use_powerline_left = false; bool use_powerline_right = false; bool use_nerd_graph = false; + bool segments_to_left = false; + bool segments_to_right= false; MEMORY_MODE mem_mode = MEMORY_MODE_DEFAULT; CPU_MODE cpu_mode = CPU_MODE_DEFAULT; @@ -172,12 +180,14 @@ int main( int argc, char** argv ) { "mem-mode", required_argument, NULL, 'm' }, { "cpu-mode", required_argument, NULL, 't' }, { "averages-count", required_argument, NULL, 'a' }, + { "segments-left", required_argument, NULL, 'l' }, + { "segments-right", required_argument, NULL, 'r' }, { 0, 0, 0, 0 } // used to handle unknown long options }; int c; // while c != -1 - while( (c = getopt_long( argc, argv, "hi:cpqng:m:a:t:", long_options, NULL) ) != -1 ) + while( (c = getopt_long( argc, argv, "hi:cpqnl:r:g:m:a:t:", long_options, NULL) ) != -1 ) { switch( c ) { @@ -199,6 +209,24 @@ int main( int argc, char** argv ) case 'n': // --nerd-graph use_nerd_graph = true; break; + case 'l': // --segments-left + segments_to_left = true; + if( atoi( optarg ) < 0 || atoi( optarg ) > 255 ) + { + std::cerr << "Valid color vaues are from 0 to 255.\n"; + return EXIT_FAILURE; + } + left_color = atoi( optarg ) ; + break; + case 'r': // --segments-right + segments_to_right= true; + if( atoi( optarg ) < 0 || atoi( optarg ) > 255 ) + { + std::cerr << "Valid color vaues are from 0 to 255.\n"; + return EXIT_FAILURE; + } + right_color = atoi( optarg ) ; + break; case 'i': // --interval, -i if( atoi( optarg ) < 1 ) { @@ -259,9 +287,9 @@ int main( int argc, char** argv ) MemoryStatus memory_status; mem_status( memory_status ); - std::cout << mem_string( memory_status, mem_mode, use_colors, use_powerline_left, use_powerline_right ) + 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 ) - << load_string( use_colors, use_powerline_left, use_powerline_right, averages_count ); + << load_string( use_colors, use_powerline_left, use_powerline_right, averages_count, segments_to_right, right_color ); std::cout << std::endl; diff --git a/common/memory.cc b/common/memory.cc index ed84ba7..1af23e4 100644 --- a/common/memory.cc +++ b/common/memory.cc @@ -28,7 +28,9 @@ std::string mem_string( const MemoryStatus & mem_status, MEMORY_MODE mode, bool use_colors, bool use_powerline_left, - bool use_powerline_right ) + bool use_powerline_right, + bool segments_to_left, + short left_color ) { std::ostringstream oss; // Change the percision for floats, for a pretty output @@ -38,12 +40,22 @@ std::string mem_string( const MemoryStatus & mem_status, unsigned int color = static_cast< unsigned int >((100 * mem_status.used_mem) / mem_status.total_mem); if( use_colors ) { - if( use_powerline_right ) + if( use_powerline_right && segments_to_left ) + { + powerline_char( oss, mem_lut[color], left_color, POWERLINE_RIGHT, false); + oss << ' '; + } + else if( use_powerline_right && !segments_to_left ) { oss << "#[bg=default]"; powerline( oss, mem_lut[color], POWERLINE_RIGHT ); oss << ' '; } + else if( use_powerline_left && segments_to_left ) + { + powerline_char( oss, mem_lut[color], left_color, POWERLINE_LEFT, false); + oss << ' '; + } else if( use_powerline_left ) { //powerline( oss, mem_lut[color], POWERLINE_LEFT ); diff --git a/common/memory.h b/common/memory.h index 5e11025..e702784 100644 --- a/common/memory.h +++ b/common/memory.h @@ -51,6 +51,8 @@ std::string mem_string( const MemoryStatus & mem_status, MEMORY_MODE mode = MEMORY_MODE_DEFAULT, bool use_colors = false, bool use_powerline_left = false, - bool use_powerline_right = false ); + bool use_powerline_right = false, + bool segments_to_left = false, + short left_color = 0 ); #endif diff --git a/common/powerline.cc b/common/powerline.cc index d4e5cf8..537b634 100644 --- a/common/powerline.cc +++ b/common/powerline.cc @@ -66,3 +66,49 @@ void powerline( std::ostringstream & oss, const char color[], break; }; } + +void powerline_char( std::ostringstream & oss, const char dynamic_color[], + short static_color, POWERLINE_DIRECTION direction, bool eol ) +{ + char write_color[7]; + sprintf(write_color, "%d", static_color); + switch( direction ) + { + case POWERLINE_LEFT: + if ( eol ) + { + oss << bg2fg( dynamic_color ) + << "#[bg=colour" + << write_color + << "]"; + } + else + { + oss << dynamic_color + << "#[fg=colour" + << write_color + << "]"; + } + oss << PWL_LEFT_FILLED + << dynamic_color; + break; + case POWERLINE_RIGHT: + if ( eol ) + { + oss << dynamic_color + << "#[fg=colour" + << write_color + << "] "; + } + else + { + oss << bg2fg(dynamic_color) + << " #[bg=colour" + << write_color + << "]"; + } + oss << PWL_RIGHT_FILLED + << dynamic_color; + break; + } +} diff --git a/common/powerline.h b/common/powerline.h index 367d86d..e6ad299 100644 --- a/common/powerline.h +++ b/common/powerline.h @@ -34,5 +34,7 @@ enum POWERLINE_DIRECTION * in the next entr. */ void powerline( std::ostringstream & oss, const char color[], POWERLINE_DIRECTION direction, bool background_only = false ); +void powerline_char( std::ostringstream & oss, const char dynamic_color[], + short static_color, POWERLINE_DIRECTION direction, bool eol = false ); #endif // POWERLINE_H From 6eec6350be796c6bb42e545b5aa86e75d9694992 Mon Sep 17 00:00:00 2001 From: "henry.potgieter" Date: Thu, 30 Mar 2023 23:24:11 -0400 Subject: [PATCH 2/7] Condense lines --- common/powerline.cc | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/common/powerline.cc b/common/powerline.cc index 537b634..b88afe2 100644 --- a/common/powerline.cc +++ b/common/powerline.cc @@ -77,38 +77,24 @@ void powerline_char( std::ostringstream & oss, const char dynamic_color[], case POWERLINE_LEFT: if ( eol ) { - oss << bg2fg( dynamic_color ) - << "#[bg=colour" - << write_color - << "]"; + oss << bg2fg( dynamic_color ) << "#[bg=colour" << write_color << "]"; } else { - oss << dynamic_color - << "#[fg=colour" - << write_color - << "]"; + oss << dynamic_color << "#[fg=colour" << write_color << "]"; } - oss << PWL_LEFT_FILLED - << dynamic_color; + oss << PWL_LEFT_FILLED << dynamic_color; break; case POWERLINE_RIGHT: if ( eol ) { - oss << dynamic_color - << "#[fg=colour" - << write_color - << "] "; + oss << dynamic_color << "#[fg=colour" << write_color << "] "; } else { - oss << bg2fg(dynamic_color) - << " #[bg=colour" - << write_color - << "]"; + oss << bg2fg(dynamic_color) << " #[bg=colour" << write_color << "]"; } - oss << PWL_RIGHT_FILLED - << dynamic_color; + oss << PWL_RIGHT_FILLED << dynamic_color; break; } } From c058ed6f21047c881735b352bb0a8ca2b2193ce9 Mon Sep 17 00:00:00 2001 From: "henry.potgieter" Date: Thu, 30 Mar 2023 23:30:45 -0400 Subject: [PATCH 3/7] Update README.rst --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index b4370d1..b4692cf 100644 --- a/README.rst +++ b/README.rst @@ -146,6 +146,10 @@ The full usage:: Use powerline left symbols throughout the output, enables --colors -v, --vertical-graph Use vertical bar chart for CPU graph + -l , --segments-left + Enable blending bg/fg color (depending on -p or -q use) with segment to left + -r , --segments-right + Enable blending bg/fg color (depending on -p or -q use) with segment to right -q, --powerline-right Use powerline right symbols throughout the output, enables --colors -i , --interval From 0c9a8d46121902baafbd3bcb1f4bc0228acd0238 Mon Sep 17 00:00:00 2001 From: "henry.potgieter" Date: Thu, 30 Mar 2023 23:31:09 -0400 Subject: [PATCH 4/7] Correct usage output for -r option --- common/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/main.cc b/common/main.cc index 1a3b103..2489095 100644 --- a/common/main.cc +++ b/common/main.cc @@ -134,7 +134,7 @@ void print_help() << "-l , --segments-left \n" << "\tEnable blending bg/fg color (depending on -p or -q use) with segment to left\n" << "-r , --segments-right \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 right\n" << "-i , --interval \n" << "\tSet tmux status refresh interval in seconds. Default: 1 second\n" << "-g , --graph-lines \n" From 35f9618d1f2f877109361f57596967496f291529 Mon Sep 17 00:00:00 2001 From: "henry.potgieter" Date: Thu, 30 Mar 2023 23:44:55 -0400 Subject: [PATCH 5/7] Add additional usage instructions --- README.rst | 2 ++ common/main.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.rst b/README.rst index b4692cf..e606754 100644 --- a/README.rst +++ b/README.rst @@ -148,8 +148,10 @@ The full usage:: Use vertical bar chart for CPU graph -l , --segments-left Enable blending bg/fg color (depending on -p or -q use) with segment to left + Provide color to be used depending on -p or -q option for seamless segment blending -r , --segments-right Enable blending bg/fg color (depending on -p or -q use) with segment to right + Provide color to be used depending on -p or -q option for seamless segment blending -q, --powerline-right Use powerline right symbols throughout the output, enables --colors -i , --interval diff --git a/common/main.cc b/common/main.cc index 2489095..3d7976d 100644 --- a/common/main.cc +++ b/common/main.cc @@ -133,8 +133,10 @@ void print_help() << "\tUse vertical bar chart for CPU graph\n" << "-l , --segments-left \n" << "\tEnable blending bg/fg color (depending on -p or -q use) with segment to left\n" + << "\tProvide color to be used depending on -p or -q option for seamless segment blending\n" << "-r , --segments-right \n" << "\tEnable blending bg/fg color (depending on -p or -q use) with segment to right\n" + << "\tProvide color to be used depending on -p or -q option for seamless segment blending\n" << "-i , --interval \n" << "\tSet tmux status refresh interval in seconds. Default: 1 second\n" << "-g , --graph-lines \n" From ba8489917d929a3c2a0aa06988f867e4492cac31 Mon Sep 17 00:00:00 2001 From: "henry.potgieter" Date: Wed, 3 May 2023 23:48:20 -0400 Subject: [PATCH 6/7] Updated usage output from main executable and one other minor change to README.rst --- README.rst | 36 ++++++++++++++++++++++++++++++++++-- common/main.cc | 2 ++ seg-adj1.png | Bin 0 -> 4965 bytes seg-adj2.png | Bin 0 -> 4525 bytes 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 seg-adj1.png create mode 100644 seg-adj2.png diff --git a/README.rst b/README.rst index e606754..6cc5814 100644 --- a/README.rst +++ b/README.rst @@ -144,16 +144,18 @@ The full usage:: Use tmux colors in output -p, --powerline-left Use powerline left symbols throughout the output, enables --colors + -q, --powerline-right + Use powerline right symbols throughout the output, enables --colors -v, --vertical-graph Use vertical bar chart for CPU graph -l , --segments-left Enable blending bg/fg color (depending on -p or -q use) with segment to left Provide color to be used depending on -p or -q option for seamless segment blending + Color is an integer value which uses the standard tmux color palette values -r , --segments-right Enable blending bg/fg color (depending on -p or -q use) with segment to right Provide color to be used depending on -p or -q option for seamless segment blending - -q, --powerline-right - Use powerline right symbols throughout the output, enables --colors + Color is an integer value which uses the standard tmux color palette values -i , --interval Set tmux status refresh interval in seconds. Default: 1 second -g , --graph-lines @@ -165,7 +167,37 @@ The full usage:: -a , --averages-count Set how many load-averages should be drawn. Default: 3 +Blending Dynamic Colors Tmux Powerline Segments +=============================================== +The -l and -r options when used in conjunction with a recent version of Tmux Powerline +that has the ability to selectively disable spacing and separators between segments allow +for seamless blending of tmux-mem-cpu-load output with other adjacent segments. The end +result is dynamic changing of appropriate foreground and background colors as the start +and end of the tmux-mem-cpu-load output string that is aggregated with other Tmux +Powerline output to produce a more polished status line in Tmux. + +Segment Adjaceny before this feature: + +.. image:: seg-adj1.png + +Segment Adjaceny after this feature: + +.. image:: seg-adj2.png + +Note that the values for the -l and -r options will be the standard Tmux integer color +values. They set the appropriate background and foreground colors used for the separator +character when used with the poweline-left or powerline-right options so it is easy to +match coloring to adjacent segments. An example from the segment script that calls +tmux-mem-cpu-load is as follows:: + + tmux-mem-cpu-load -q -v -l 52 -r 33 + +This combines with theme options available to tmux-powerline, such as the following:: + + "disk_usage_cust 52 123 ${TMUX_POWERLINE_SEPARATOR_LEFT_BOLD} 52 123 right_disable" \ + "tmux_mem_cpu_load_cust 52 234 ${TMUX_POWERLINE_SEPARATOR_LEFT_BOLD} 52 234 both_disable separator_disable" \ + "batt_cust 33 154 ${TMUX_POWERLINE_SEPARATOR_LEFT_BOLD} 16 33 N separator_disable" \ Authors ======= diff --git a/common/main.cc b/common/main.cc index 3d7976d..ea27a71 100644 --- a/common/main.cc +++ b/common/main.cc @@ -134,9 +134,11 @@ void print_help() << "-l , --segments-left \n" << "\tEnable blending bg/fg color (depending on -p or -q use) with segment to left\n" << "\tProvide color to be used depending on -p or -q option for seamless segment blending\n" + << "\tColor is an integer value which uses the standard tmux color palette values\n" << "-r , --segments-right \n" << "\tEnable blending bg/fg color (depending on -p or -q use) with segment to right\n" << "\tProvide color to be used depending on -p or -q option for seamless segment blending\n" + << "\tColor is an integer value which uses the standard tmux color palette values\n" << "-i , --interval \n" << "\tSet tmux status refresh interval in seconds. Default: 1 second\n" << "-g , --graph-lines \n" diff --git a/seg-adj1.png b/seg-adj1.png new file mode 100644 index 0000000000000000000000000000000000000000..c8d57f9a4a20d9f9c79c9ee7b0830ff410e4dcd6 GIT binary patch literal 4965 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 literal 0 HcmV?d00001 diff --git a/seg-adj2.png b/seg-adj2.png new file mode 100644 index 0000000000000000000000000000000000000000..20f85383ff203dc90a84bfcb448811897f82112e GIT binary patch literal 4525 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 LNkvXXu0mjfGijh4 literal 0 HcmV?d00001 From aa8fe65529d8921bb46f7115f9ef4d97beb9c1f6 Mon Sep 17 00:00:00 2001 From: "henry.potgieter" Date: Wed, 3 May 2023 23:50:11 -0400 Subject: [PATCH 7/7] Fixed spacing/tabing indent --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 6cc5814..83517dc 100644 --- a/README.rst +++ b/README.rst @@ -151,11 +151,11 @@ The full usage:: -l , --segments-left Enable blending bg/fg color (depending on -p or -q use) with segment to left Provide color to be used depending on -p or -q option for seamless segment blending - Color is an integer value which uses the standard tmux color palette values + Color is an integer value which uses the standard tmux color palette values -r , --segments-right Enable blending bg/fg color (depending on -p or -q use) with segment to right Provide color to be used depending on -p or -q option for seamless segment blending - Color is an integer value which uses the standard tmux color palette values + Color is an integer value which uses the standard tmux color palette values -i , --interval Set tmux status refresh interval in seconds. Default: 1 second -g , --graph-lines