--- rxvt-unicode/src/perl/readline	2006/01/22 20:39:47	1.6
+++ rxvt-unicode/src/perl/readline	2006/02/20 20:46:54	1.9
@@ -4,17 +4,35 @@
 
 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;
 
-   return
-      if $termios->getlflag & &POSIX::ICANON;
+   $termios->getlflag & &POSIX::ICANON
+      and return;
 
    my ($row, $col) = $self->screen_cur;
    my $line = $self->line ($row);
@@ -36,6 +54,8 @@
       $skipped =~ s/\x{ffff}//g;
 
       $self->tt_write ($move x length $skipped);
+
+      return 1;
    }
 
    ()