--- rxvt-unicode/src/perl/readline	2006/01/21 08:07:39	1.4
+++ rxvt-unicode/src/perl/readline	2006/02/12 05:31:53	1.8
@@ -1,10 +1,38 @@
 #! perl
 
+use POSIX ();
+
+my $termios = new POSIX::Termios;
+
+sub on_init {
+   my ($self) = @_;
+
+   $self->{enabled} = 1;
+
+   push @{ $self->{term}{option_popup_hook} }, sub {
+      ("readline" => $self->{enabled}, sub { $self->{enabled} = shift })
+   };
+
+   ()
+}
+
 sub on_button_press {
    my ($self, $event) = @_;
 
-   return
-      if $self->current_screen || $self->hidden_cursor;
+   $self->current_screen || $self->hidden_cursor || !$self->{enabled}
+      and return;
+
+   my $mask = $self->ModLevel3Mask | $self->ModMetaMask
+            | urxvt::ShiftMask | urxvt::ControlMask;
+   
+   ($event->{state} & $mask) == urxvt::ShiftMask
+      or return;
+
+   $termios->getattr ($self->pty_fd)
+      or return;
+
+   $termios->getlflag & &POSIX::ICANON
+      and return;
 
    my ($row, $col) = $self->screen_cur;
    my $line = $self->line ($row);
@@ -23,7 +51,7 @@
       }
 
       my $skipped = substr $line->t, $cur, $ofs - $cur;
-      $skipped =~ s/$urxvt::NOCHAR//g;
+      $skipped =~ s/\x{ffff}//g;
 
       $self->tt_write ($move x length $skipped);
    }