tseeker-pub/gprompt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the use of sgr0 optional

Browse source 
* Don't use the results of `tput sgr0` as the reset character by
    default.
  * Instead use \33[0m unless instructed otherwise.
This commit is contained in:
Emmanuel BENOîT 2022-10-19 19:19:39 +02:00
parent 09a20826f9
commit 522b19992a
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gprompt.pl
View file

@ -28,6 +28,8 @@ our %CONFIG = (
cfg_sys_themes => [ '/usr/share/gprompt/themes' ] , cfg_sys_themes => [ '/usr/share/gprompt/themes' ] ,
# - User theme dirs # - User theme dirs
cfg_user_themes => [ '.local/share/gprompt/themes' , '.gprompt-themes' ] , cfg_user_themes => [ '.local/share/gprompt/themes' , '.gprompt-themes' ] ,
# - Use tput sgr0 for resets
cfg_sgr0_reset => 0 ,
# LAYOUT # LAYOUT
# - Theme and local overrides # - Theme and local overrides
@ -237,6 +239,7 @@ sub default_theme
our $HASCWD; our $HASCWD;
our $COLUMNS; our $COLUMNS;
our $RESET;
our %TCCACHE = (); our %TCCACHE = ();
our %TLEN = (); our %TLEN = ();
our %SCACHE = (); our %SCACHE = ();
@ -481,7 +484,7 @@ sub add_transitions
sub apply_style sub apply_style
{ {
my ( $bg , $fg , $style ) = @_; my ( $bg , $fg , $style ) = @_;
my $out = tput_sequence( 'sgr0' ); my $out = $RESET;
$out .= set_color( 'b' , $bg ) unless $bg == -2; $out .= set_color( 'b' , $bg ) unless $bg == -2;
$out .= set_color( 'f' , $fg ) unless $fg == -2; $out .= set_color( 'f' , $fg ) unless $fg == -2;
if ( $style ne 'none' ) { if ( $style ne 'none' ) {
@ -598,7 +601,7 @@ sub gen_top_line
my $txt = render( 'left' , add_transitions( 'left' , 0 , $mc , @left ) ); my $txt = render( 'left' , add_transitions( 'left' , 0 , $mc , @left ) );
$txt .= render( 'middle' , @middle , @mpad ); $txt .= render( 'middle' , @middle , @mpad );
$txt .= render( 'right' , add_transitions( 'right' , $mc , 0 , @right ) ); $txt .= render( 'right' , add_transitions( 'right' , $mc , 0 , @right ) );
return $txt . tput_sequence( 'sgr0' ) . "\\n"; return $txt . $RESET . "\\n";
} }
sub gen_input_line sub gen_input_line
@ -610,8 +613,7 @@ sub gen_input_line
gen_prompt_sections( 0 , @input ) ); gen_prompt_sections( 0 , @input ) );
push @input , {content=>['']} unless @input; push @input , {content=>['']} unless @input;
return ( $len , return ( $len ,
render( 'input' , add_transitions( 'input' , 0 , 0 , @input ) ) render( 'input' , add_transitions( 'input' , 0 , 0 , @input ) ) . $RESET
. tput_sequence( 'sgr0' )
); );
} }
@ -626,7 +628,7 @@ sub gen_ps2
content => [ ' ' x ( $ill - $len ) ] content => [ ' ' x ( $ill - $len ) ]
}; };
} }
return render( 'ps2' , @line ) . tput_sequence( 'sgr0' ); return render( 'ps2' , @line ) . $RESET;
} }
sub gen_term_title sub gen_term_title
@ -712,6 +714,7 @@ sub main
load_config; load_config;
chop( $COLUMNS = `tput cols` ); chop( $COLUMNS = `tput cols` );
$RESET = $CONFIG{cfg_sgr0_reset} ? tput_sequence( 'sgr0' ) : "\033[0m";
%TLEN = compute_trans_lengths; %TLEN = compute_trans_lengths;
my $pg = gen_term_title; my $pg = gen_term_title;
my $ps1 = $pg . gen_top_line; my $ps1 = $pg . gen_top_line;