1
0
mirror of https://github.com/gryf/tabbedalt.git synced 2025-12-17 11:30:31 +01:00

Fix renaming tabs with accented letters

Also remove some redundant code for setting defaults for resources.
This commit is contained in:
2022-01-18 20:56:26 +01:00
parent c6bda05ee6
commit 53f3b89e7c

View File

@@ -382,21 +382,13 @@ sub on_init {
$self->option ($urxvt::OPTION{scrollBar}, 0);
my $fg = $self->x_resource ("tabbar-fg");
my $bg = $self->x_resource ("tabbar-bg");
my $tabfg = $self->x_resource ("tab-fg");
my $tabbg = $self->x_resource ("tab-bg");
my $active = $self->x_resource ("active-fg");
my $actives = $self->x_resource ("actives-fg");
my $actived = $self->x_resource ("actived-fg");
defined $fg or $fg = 8;
defined $bg or $bg = 0;
defined $tabfg or $tabfg = 15;
defined $tabbg or $tabbg = 8;
defined $active or $active = 1;
defined $actives or $actives = 5;
defined $actived or $actived = 4;
my $fg = ($self->x_resource ("tabbar-fg") or 8);
my $bg = ($self->x_resource ("tabbar-bg") or 0);
my $tabfg = ($self->x_resource ("tab-fg") or 15);
my $tabbg = ($self->x_resource ("tab-bg") or 8);
my $active = ($self->x_resource ("active-fg") or 1);
my $actives = ($self->x_resource ("actives-fg") or 5);
my $actived = ($self->x_resource ("actived-fg") or 4);
$self->{rs_tabbar} = urxvt::SET_COLOR(urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
$self->{rs_tab} = urxvt::SET_COLOR(urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
@@ -561,8 +553,9 @@ sub tab_key_press {
} elsif ($keysym == 0xff08) { # backspace
substr $tab->{new_name}, -1, 1, "";
$tab->{name} = "$tab->{new_name}█";
} elsif ($str !~ /[\x00-\x1f\x80-\xaf]/) {
$tab->{new_name} .= $str;
} elsif ($str !~ /[\x00-\x1f]/) {
my $text = $tab->locale_decode($str);
$tab->{new_name} .= $text;
$tab->{name} = "$tab->{new_name}█";
}
$self->refresh;