Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 40 additions & 13 deletions tabbedex
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ sub refresh {
my ($self) = @_;

# autohide makes it zero
return unless $self->{tabheight};
return unless $self->{tabheight} || !$self->{tab_as_line};

my $ncol = $self->ncol;

Expand All @@ -146,25 +146,35 @@ sub refresh {
push @ofs, [0, 6, -1 ];
$ofs = 7;
}

my $color_tab = 2; # avoid white and black (1,2)
my $indice_color = 0;
for my $tab (@{ $self->{tabs} }) {
my $name = $tab->{name} ? $tab->{name} : $idx;
my $name = $self->{tab_as_line} ? " " : ($tab->{name} ? $tab->{name} : $idx);
my $act = $self->tab_activity_mark($tab);
my $txt = sprintf "%s%s%s", $act, $name, $act;
my $len = length $txt;

substr $text, $ofs, $len + 1, "$txt|";
@$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
if $tab == $self->{cur};

push @ofs, [ $ofs, $ofs + $len, $idx ];
if (!$self->{tab_as_line}) {
substr $text, $ofs, $len + 1, "$txt|";
}
if(!$self->{multicolor}){
@$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
if $tab == $self->{cur};
push @ofs, [ $ofs, $ofs + $len, $idx ];
} else {
#@$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
$color_tab = (($color_tab+1)%9==0) ? 3 : $color_tab+1; # avoid whites and blacks
$indice_color += (($indice_color+1*$color_tab)%9==0) ? 3 : +1;
@$rend[$ofs .. $ofs + $len -1] = ($tab != $self->{cur} ? $color_tab*$indice_color : 256) x $len; # ($idx+1) #avoid black and *5+1 avoid whites
push @ofs, [ $ofs, $ofs + $len, $idx ];
$ofs -=1;
}
++$idx;
$ofs += $len + 1;
}

substr $text, --$ofs, 1, ' '; # remove last '|'

if ($self->{tab_title} && $ofs + 3 < $ncol) {
if ($self->{tab_title} && !$self->{tab_as_line} &&$ofs + 3 < $ncol) {
my $term = $self->{term};
my @str = $term->XGetWindowProperty($term->parent, $self->{tab_title});
if (@str && $str[2]) {
Expand Down Expand Up @@ -407,8 +417,12 @@ sub on_init {
($self->my_resource ('autohide') or 'false') !~ /^(?:false|0|no)/i;
$self->{no_default_keys} =
($self->my_resource ('no-tabbedex-keys') or 'false') !~ /^(?:false|0|no)/i;
$self->{reopen_on_close} =
$self->{reopen_on_close} =
($self->my_resource ('reopen-on-close') or 'false') !~ /^(?:false|0|no)/i;
$self->{tab_as_line} =
($self->my_resource ('tab-as-line') or 'false') !~ /^(?:false|0|no)/i;
$self->{multicolor} =
($self->my_resource ('multicolor') or 'false') !~ /^(?:false|0|no)/i;

();
}
Expand All @@ -417,7 +431,7 @@ sub on_init {
sub on_start {
my ($self) = @_;

$self->{maxtabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
$self->{maxtabheight} = $self->{tab_as_line} ? 6 : ($self->int_bwidth + $self->fheight + $self->lineSpace);
$self->{tabheight} = $self->{autohide} ? 0 : $self->{maxtabheight};

$self->{running_user_command} = 0;
Expand Down Expand Up @@ -551,14 +565,17 @@ sub tab_key_press {
$self->new_tab;
return 1;

} elsif ($keysym == 0xff52) {
} elsif (!$self->{tab_as_line} && $keysym == 0xff52) {
$self->rename_tab($tab);
return 1;
}
} elsif ($event->{state} & urxvt::ControlMask) {
if ($keysym == 0xff51 || $keysym == 0xff53) {
$self->move_tab($tab, $keysym - 0xff52);
return 1;
} elsif ($keysym >= 0x0031 && $keysym <= 0x0039){
$self->change_to_tab($tab, $keysym - 0x0031);
return 1;
}
}

Expand Down Expand Up @@ -630,6 +647,15 @@ sub change_tab {
();
}

sub change_to_tab {
my ($self, $tab, $idx) = @_;
if($idx < @{$self->{tabs}}){
$self->make_current ($self->{tabs}[$idx]);
}

();
}

sub move_tab {
my ($self, $tab, $direction) = @_;

Expand Down Expand Up @@ -676,3 +702,4 @@ package urxvt::ext::tabbedex::tab;
die if $@;
}
}