--- rxvt-unicode/src/perl/tabbed	2006/01/20 14:02:41	1.5
+++ rxvt-unicode/src/perl/tabbed	2006/01/20 15:40:39	1.7
@@ -3,24 +3,41 @@
 sub refresh {
    my ($self) = @_;
 
-   my $cmd = "\x1b[H\x1b[7m\x1b[K";
-   my $txt;
-   my @ofs = (0);
+   my $ncol = $self->ncol;
+
+   my $text = " " x $ncol;
+   my $rend = [(urxvt::DEFAULT_RSTYLE | urxvt::RS_RVid) x $ncol];
+
+   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} }) {
-      if ($tab == $self->{cur}) {
-         $txt = " [$tab->{name}] ";
-      } else {
-         $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
+         if $tab == $self->{cur};
 
-      $cmd .= $txt;
-      push @ofs, $ofs[-1] + length $txt;
+      push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
+
+      $ofs += $len + 1;
    }
 
    $self->{tabofs} = \@ofs;
 
-   $self->cmd_parse ($self->locale_encode ($cmd));
+   $self->ROW_t (0, $text, 0, 0, $ncol);
+   $self->ROW_r (0, $rend, 0, 0, $ncol);
+
+   $self->want_refresh;
 }
 
 sub new_tab {
@@ -67,27 +84,29 @@
       if ($atom == $wm_normal_hints) {
          my (@hints) = unpack "l!*", $items;
 
-         $hints[ 4] += $self->{tabheight};
-         $hints[16] += $self->{tabheight};
+         $hints[$_] += $self->{tabheight} for (4, 6, 16);
+
+         $items = pack "l!*", @hints;
       }
       $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
    }
+
+   $self->refresh;
 }
 
 sub make_current {
    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;
 
    ()
@@ -100,14 +119,11 @@
 sub on_button_release {
    my ($self, $event) = @_;
 
-   my $ofs = $self->{tabofs};
-
    if ($event->{row} == 0) {
-      for my $i (0 .. @$ofs - 2) {
-         if ($event->{col} >= $ofs->[$i]
-             && $event->{col} < $ofs->[$i+1]) {
-            $self->make_current ($self->{tabs}[$i]);
-         }
+      for my $button (@{ $self->{tabofs} }) {
+         $button->[2]->($self, $event)
+            if $event->{col} >= $button->[0]
+               && $event->{col} < $button->[1];
       }
    }
 
@@ -142,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;
 
    ()
@@ -171,7 +184,7 @@
 
    push @{ $self->{tabs} }, $tab;
 
-   $tab->{name} ||= scalar @{ $self->{tabs} };
+#   $tab->{name} ||= scalar @{ $self->{tabs} };
    $self->make_current ($tab);
 
    ()
@@ -186,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