ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/perl/searchable-scrollback
(Generate patch)

Comparing rxvt-unicode/src/perl/searchable-scrollback (file contents):
Revision 1.6 by root, Mon Jan 9 23:19:34 2006 UTC vs.
Revision 1.7 by root, Mon Jan 9 23:30:01 2006 UTC

38 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE); 38 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE);
39 $self->{view_start} = $self->view_start; 39 $self->{view_start} = $self->view_start;
40 40
41 $self->enable ( 41 $self->enable (
42 key_press => \&key_press, 42 key_press => \&key_press,
43 tt_write => \&tt_write,
43 refresh_begin => \&refresh, 44 refresh_begin => \&refresh,
44 refresh_end => \&refresh, 45 refresh_end => \&refresh,
45 ); 46 );
46 47
47 $self->idle; 48 $self->idle;
50sub leave { 51sub leave {
51 my ($self) = @_; 52 my ($self) = @_;
52 53
53 delete $self->{overlay}; 54 delete $self->{overlay};
54 55
55 $self->disable ("key_press", "refresh_begin", "refresh_end"); 56 $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end");
56 57
57 $self->pty_ev_events ($self->{pty_ev_events}); 58 $self->pty_ev_events ($self->{pty_ev_events});
58 $self->want_refresh; 59 $self->want_refresh;
59} 60}
60 61
71 72
72 my $row = -$self->view_start + ($self->nrow >> 1) + $offset; 73 my $row = -$self->view_start + ($self->nrow >> 1) + $offset;
73 74
74 delete $self->{found}; 75 delete $self->{found};
75 76
77 my $search = $self->special_encode ($self->{search});
78
76 no re 'eval'; # just to be sure 79 no re 'eval'; # just to be sure
77 my $re = qr/$self->{search}/; 80 my $re = qr/$search/;
78 81
79 while ($row > -$self->nsaved) { 82 while ($row > -$self->nsaved) {
80 my $line = $self->line ($row) 83 my $line = $self->line ($row)
81 or last; 84 or last;
82 85
120 $self->idle; 123 $self->idle;
121 } elsif ($keysym == 0xff08) { 124 } elsif ($keysym == 0xff08) {
122 substr $self->{search}, -1, 1, ""; 125 substr $self->{search}, -1, 1, "";
123 $self->search; 126 $self->search;
124 } elsif ($string ne "") { 127 } elsif ($string ne "") {
125 $self->{search} .= $string; 128 return;
126 $self->search;
127 } 129 }
128 } else { 130 } else {
129 if ($keysym == 0xff0d || $keysym == 0xff8d) { 131 if ($keysym == 0xff0d || $keysym == 0xff8d) {
130 # OK 132 # OK
131 $self->leave; 133 $self->leave;
152 } 154 }
153 155
154 1 156 1
155} 157}
156 158
159sub tt_write {
160 my ($self, $data) = @_;
157 161
162 $self->{search} .= $self->locale_decode ($data);
163 $self->search;
164
165 1
166}
167
168

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines