--- rxvt-unicode/src/perl/tabbed	2006/01/20 15:24:24	1.6
+++ rxvt-unicode/src/perl/tabbed	2006/01/20 15:40:39	1.7
@@ -8,33 +8,36 @@
    my $text = " " x $ncol;
    my $rend = [(urxvt::DEFAULT_RSTYLE | urxvt::RS_RVid) x $ncol];
 
-   my $txt;
-   my $ofs = 0;
    my @ofs;
 
+   substr $text, 0, 7, "[NEW] |";
+   @$rend[0 .. 5] = (urxvt::OVERLAY_RSTYLE) x 6;
+   push @ofs, [0, 6, sub { $_[0]->new_tab }];
+
+   my $ofs = 7;
+   my $idx = 0;
+
    for my $tab (@{ $self->{tabs} }) {
-      my $txt = " $tab->{name} ";
+      $idx++;
+
+      my $txt = " $idx ";
       my $len = length $txt;
 
       substr $text, $ofs, $len + 1, "$txt|";
-      @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len;
+      @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len
+         if $tab == $self->{cur};
 
-      push @ofs, [
-         $ofs,
-         $ofs + $len,
-         sub {
-            my ($self, $event) = @_;
-            $self->make_current ($tab);
-         },
-      ];
+      push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
 
       $ofs += $len + 1;
    }
 
    $self->{tabofs} = \@ofs;
 
-   $self->ROW_t (0, $text);
-   $self->ROW_r (0, $rend);
+   $self->ROW_t (0, $text, 0, 0, $ncol);
+   $self->ROW_r (0, $rend, 0, 0, $ncol);
+
+   $self->want_refresh;
 }
 
 sub new_tab {
@@ -95,16 +98,15 @@
    my ($self, $tab) = @_;
 
    if (my $cur = $self->{cur}) {
-      $cur->XUnmapWindow ($cur->parent)
-         if $cur->mapped;
+      $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
+      $cur->focus_out;
    }
    
    $self->{cur} = $tab;
 
    $self->configure;
-
+   $tab->focus_in;
    $tab->XMapWindow ($tab->parent);
-
    $self->refresh;
 
    ()
@@ -156,9 +158,6 @@
 
    $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
 
-   $self->cmd_parse ("\x1b[?25l\x1b[?7l");
-   $self->new_tab;
-   $self->new_tab;
    $self->new_tab;
 
    ()
@@ -185,7 +184,7 @@
 
    push @{ $self->{tabs} }, $tab;
 
-   $tab->{name} ||= scalar @{ $self->{tabs} };
+#   $tab->{name} ||= scalar @{ $self->{tabs} };
    $self->make_current ($tab);
 
    ()
@@ -200,6 +199,8 @@
       if ($self->{cur} == $tab) {
          delete $self->{cur};
          $self->make_current ($self->{tabs}[-1]);
+      } else {
+         $self->refresh;
       }
    } else {
       # delay destruction a tiny bit