--- rxvt-unicode/src/perl/tabbed	2006/01/20 16:13:33	1.9
+++ rxvt-unicode/src/perl/tabbed	2006/01/22 12:21:27	1.12
@@ -78,11 +78,20 @@
       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;
@@ -94,7 +103,7 @@
       $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
    }
 
-   $self->refresh;
+   $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
 }
 
 sub make_current {
@@ -109,10 +118,11 @@
    $self->{cur} = $tab;
 
    $self->configure;
+   $self->copy_properties;
    $tab->focus_in;
    $tab->XMapWindow ($tab->parent);
-   $self->refresh;
    delete $tab->{activity};
+   $self->refresh;
 
    ()
 }
@@ -172,6 +182,7 @@
    my ($self, $event) = @_;
 
    $self->configure;
+   $self->refresh;
 
    ()
 }
@@ -187,6 +198,8 @@
 sub tab_start {
    my ($self, $tab) = @_;
 
+   $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
+
    push @{ $self->{tabs} }, $tab;
 
 #   $tab->{name} ||= scalar @{ $self->{tabs} };
@@ -218,22 +231,35 @@
 sub tab_key_press {
    my ($self, $tab, $event, $keysym, $str) = @_;
 
-   if ($event->{state} & urxvt::ShiftMask
-       && ($keysym == 0xff51 || $keysym == 0xff53)) {
-      my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
-
-      --$idx if $keysym == 0xff51;
-      ++$idx if $keysym == 0xff53;
+   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;
 
-      $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
-      $self->refresh;
-      
-      return 1;
+         return 1;
+      }
    }
 
    ()
 }
 
+sub tab_property_notify {
+   my ($self, $tab, $event) = @_;
+
+   $self->copy_properties
+      if $event->{window} == $tab->parent;
+
+   ()
+}
+
 sub tab_activity {
    my ($self, $tab) = @_;
 
@@ -246,7 +272,7 @@
 # simply proxies all interesting calls back to the tabbed class.
 
 {
-   for my $hook qw(start destroy key_press) {
+   for my $hook qw(start destroy key_press property_notify) {
       eval qq{
          sub on_$hook {
             my \$parent = \$_[0]{term}{parent}