--- rxvt-unicode/src/perl/tabbed	2008/06/15 14:07:58	1.24
+++ rxvt-unicode/src/perl/tabbed	2012/06/06 15:09:49	1.32
@@ -1,5 +1,10 @@
 #! perl
 
+#:META:X_RESOURCE:tabbar-fg:colour:tab bar foreground colour
+#:META:X_RESOURCE:tabbar-bg:colour:tab bar background colour
+#:META:X_RESOURCE:tab-fg:colour:tab foreground colour
+#:META:X_RESOURCE:tab-bg:colour:tab background colour
+
 sub refresh {
    my ($self) = @_;
 
@@ -46,15 +51,17 @@
 sub new_tab {
    my ($self, @argv) = @_;
 
-   my $offset = $self->fheight;
-
    # save a backlink to us, make sure tabbed is inactive
    push @urxvt::TERM_INIT, sub {
       my ($term) = @_;
       $term->{parent} = $self;
 
-      $term->resource ($_->[0] => $_->[1])
-         for @{ $self->{resource} || [] };
+      for (0 .. urxvt::NUM_RESOURCES - 1) {
+         my $value = $self->{resource}[$_];
+
+         $term->resource ("+$_" => $value)
+            if defined $value;
+      }
 
       $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
    };
@@ -103,13 +110,13 @@
    # pass 1: copy over properties different or nonexisting
    for my $atom ($tab->XListProperties ($tab->parent)) {
       my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
-      
+
       # fix up size hints
       if ($atom == $wm_normal_hints) {
          my (@hints) = unpack "l!*", $items;
-      
+
          $hints[$_] += $self->{tabheight} for (4, 6, 16);
-      
+
          $items = pack "l!*", @hints;
       }
 
@@ -134,15 +141,15 @@
       $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
       $cur->focus_out;
    }
-   
+
    $self->{cur} = $tab;
 
    $self->configure;
    $self->copy_properties;
-   
+
    $tab->focus_out; # just in case, should be a nop
    $tab->focus_in if $self->focus;
-   
+
    $tab->XMapWindow ($tab->parent);
    delete $tab->{activity};
    $self->refresh;
@@ -166,6 +173,14 @@
    ()
 }
 
+sub on_tt_write {
+    my ($self, $octets) = @_;
+
+    $self->{cur}->tt_write ($octets);
+
+    1
+}
+
 sub on_key_press {
    my ($self, $event) = @_;
 
@@ -207,12 +222,7 @@
 sub on_init {
    my ($self) = @_;
 
-   for (qw(name chdir perl_ext_1 perl_ext_2)) {
-      my $val = $self->resource ($_);
-
-      push @{ $self->{resource} }, [$_ => $val]
-        if defined $val;
-   }
+   $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
 
    $self->resource (int_bwidth => 0);
    $self->resource (name => "URxvt.tabbed");
@@ -315,7 +325,7 @@
          ++$idx if $keysym == 0xff53;
 
          $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
-         
+
          return 1;
       } elsif ($keysym == 0xff54) {
          $self->new_tab;