--- rxvt-unicode/src/perl/tabbed	2006/01/20 12:16:28	1.1
+++ rxvt-unicode/src/perl/tabbed	2006/02/06 05:40:16	1.15
@@ -3,24 +3,44 @@
 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 = [($self->{rs_tabbar}) x $ncol];
+
+   my @ofs;
+
+   substr $text, 0, 7, "[NEW] |";
+   @$rend[0 .. 5] = ($self->{rs_tab}) 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++;
 
-      $cmd .= $txt;
-      push @ofs, $ofs[-1] + length $txt;
+      my $act = $tab->{activity} && $tab != $self->{cur}
+                ? "*" : " ";
+
+      my $txt = "$act$idx$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, 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 {
@@ -51,34 +71,100 @@
 sub configure {
    my ($self) = @_;
 
-   my $tabheight = $self->int_bwidth + $self->fheight + $self->lineSpace;
+   my $tab = $self->{cur};
 
-   $self->{cur}->XMoveResizeWindow (
-      $self->{cur}->parent,
-      0, $tabheight,
-      $self->width, $self->height - $tabheight
+   # this is an extremely dirty way to force a configurenotify, but who cares
+   $tab->XMoveResizeWindow (
+      $tab->parent,
+      0, $self->{tabheight} + 1,
+      $self->width, $self->height - $self->{tabheight}
+   );
+   $tab->XMoveResizeWindow (
+      $tab->parent,
+      0, $self->{tabheight},
+      $self->width, $self->height - $self->{tabheight}
    );
 }
 
+sub copy_properties {
+   my ($self) = @_;
+   my $tab = $self->{cur};
+
+   my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
+
+   my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
+
+   for my $atom ($tab->XListProperties ($tab->parent)) {
+      my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
+      
+      delete $our_props{$atom};
+
+      if ($atom == $wm_normal_hints) {
+         my (@hints) = unpack "l!*", $items;
+
+         $hints[$_] += $self->{tabheight} for (4, 6, 16);
+
+         $items = pack "l!*", @hints;
+      }
+      $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
+   }
+
+   $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
+}
+
 sub make_current {
    my ($self, $tab) = @_;
 
    if (my $cur = $self->{cur}) {
-      $cur->XUnmapWindow ($cur->parent)
-         if $cur->mapped;
+      delete $cur->{activity};
+      $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
+      $cur->focus_out;
    }
    
    $self->{cur} = $tab;
 
    $self->configure;
-
+   $self->copy_properties;
+   $tab->focus_in;
    $tab->XMapWindow ($tab->parent);
-
+   delete $tab->{activity};
    $self->refresh;
 
    ()
 }
 
+sub on_focus_in {
+   my ($self, $event) = @_;
+
+   $self->{cur}->focus_in;
+
+   ()
+}
+
+sub on_focus_out {
+   my ($self, $event) = @_;
+
+   $self->{cur}->focus_out;
+
+   ()
+}
+
+sub on_key_press {
+   my ($self, $event) = @_;
+
+   $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
+
+   1
+}
+
+sub on_key_release {
+   my ($self, $event) = @_;
+
+   $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
+
+   1
+}
+
 sub on_button_press {
    1
 }
@@ -86,14 +172,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];
       }
    }
 
@@ -115,20 +198,34 @@
    }
 
    $self->resource (int_bwidth => 0);
-   $self->resource (name => "URxvt.tab");
+   $self->resource (name => "URxvt.tabbed");
    $self->resource (pty_fd => -1);
 
    $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");
+
+   defined $fg    or $fg    = 3;
+   defined $bg    or $bg    = 0;
+   defined $tabfg or $tabfg = 0;
+   defined $tabbg or $tabbg = 1;
+
+   $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);
+
    ()
 }
 
 sub on_start {
    my ($self) = @_;
 
-   $self->cmd_parse ("\x1b[?25l\x1b[?7l");
-   $self->new_tab;
-   $self->new_tab;
+   $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
+
+   $self->cmd_parse ("\033[?25l");
+
    $self->new_tab;
 
    ()
@@ -138,6 +235,7 @@
    my ($self, $event) = @_;
 
    $self->configure;
+   $self->refresh;
 
    ()
 }
@@ -153,9 +251,11 @@
 sub tab_start {
    my ($self, $tab) = @_;
 
+   $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
+
    push @{ $self->{tabs} }, $tab;
 
-   $tab->{name} ||= scalar @{ $self->{tabs} };
+#   $tab->{name} ||= scalar @{ $self->{tabs} };
    $self->make_current ($tab);
 
    ()
@@ -170,6 +270,8 @@
       if ($self->{cur} == $tab) {
          delete $self->{cur};
          $self->make_current ($self->{tabs}[-1]);
+      } else {
+         $self->refresh;
       }
    } else {
       # delay destruction a tiny bit
@@ -179,13 +281,51 @@
    ()
 }
 
+sub tab_key_press {
+   my ($self, $tab, $event, $keysym, $str) = @_;
+
+   if ($event->{state} & urxvt::ShiftMask) {
+      if ($keysym == 0xff51 || $keysym == 0xff53) {
+         my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
+
+         --$idx if $keysym == 0xff51;
+         ++$idx if $keysym == 0xff53;
+
+         $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
+         
+         return 1;
+      } elsif ($keysym == 0xff54) {
+         $self->new_tab;
+
+         return 1;
+      }
+   }
+
+   ()
+}
+
+sub tab_property_notify {
+   my ($self, $tab, $event) = @_;
+
+   $self->copy_properties
+      if $event->{window} == $tab->parent;
+
+   ()
+}
+
+sub tab_activity {
+   my ($self, $tab) = @_;
+
+   $self->refresh;
+}
+
 package urxvt::ext::tabbed::tab;
 
 # helper extension implementing the subwindows of a tabbed terminal.
 # simply proxies all interesting calls back to the tabbed class.
 
 {
-   for my $hook qw(start destroy) {
+   for my $hook qw(start destroy key_press property_notify) {
       eval qq{
          sub on_$hook {
             my \$parent = \$_[0]{term}{parent}
@@ -197,5 +337,10 @@
    }
 }
 
+sub on_add_lines {
+  $_[0]->{activity}++
+     or $_[0]{term}{parent}->tab_activity ($_[0]);
+  ()
+}