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.5 by root, Mon Jan 9 23:18:49 2006 UTC vs.
Revision 1.11 by root, Tue Jan 10 04:30:03 2006 UTC

14} 14}
15 15
16sub on_keyboard_command { 16sub on_keyboard_command {
17 my ($self, $cmd) = @_; 17 my ($self, $cmd) = @_;
18 18
19 if ($cmd eq "searchable-scrollback:start") { 19 $cmd eq "searchable-scrollback:start"
20 $self->enter; 20 and $self->enter;
21 }
22 21
23 () 22 ()
24} 23}
25 24
26sub msg { 25sub msg {
33sub enter { 32sub enter {
34 my ($self) = @_; 33 my ($self) = @_;
35 34
36 return if $self->{overlay}; 35 return if $self->{overlay};
37 36
37 $self->{history} = [];
38 $self->{view_start} = $self->view_start;
38 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE); 39 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE);
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 );
47
48 $self->{manpage_overlay} = $self->overlay (0, -2, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0);
49 $self->{manpage_overlay}->set (0, 0, "scrollback search, see the ${urxvt::RXVTNAME}perl manpage for details");
46 50
47 $self->idle; 51 $self->idle;
48} 52}
49 53
50sub leave { 54sub leave {
51 my ($self) = @_; 55 my ($self) = @_;
52 56
57 $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end");
58 $self->pty_ev_events ($self->{pty_ev_events});
59
60 delete $self->{manpage_overlay};
53 delete $self->{overlay}; 61 delete $self->{overlay};
54 62 delete $self->{history};
55 $self->disable ("key_press", "refresh_begin", "refresh_end");
56
57 $self->pty_ev_events ($self->{pty_ev_events});
58 $self->want_refresh;
59} 63}
60 64
61sub idle { 65sub idle {
62 my ($self) = @_; 66 my ($self) = @_;
63 67
64 $self->msg ("scrollback search, escape=exit, enter=accept, /=start search, n=next, p=previous, G=bottom"); 68 $self->msg ("escape=exit, enter=accept, /=start search, n=next, p=previous, G=bottom");
65 69
66 delete $self->{in_search}; 70 delete $self->{in_search};
67} 71}
68 72
69sub search { 73sub search {
71 75
72 my $row = -$self->view_start + ($self->nrow >> 1) + $offset; 76 my $row = -$self->view_start + ($self->nrow >> 1) + $offset;
73 77
74 delete $self->{found}; 78 delete $self->{found};
75 79
80 my $search = $self->special_encode ($self->{search});
81
76 no re 'eval'; # just to be sure 82 no re 'eval'; # just to be sure
77 my $re = qr/$self->{search}/; 83 my $re = qr/$search/;
78 84
79 while ($row > -$self->nsaved) { 85 while ($row > -$self->nsaved) {
80 my $line = $self->line ($row) 86 my $line = $self->line ($row)
81 or last; 87 or last;
82 88
120 $self->idle; 126 $self->idle;
121 } elsif ($keysym == 0xff08) { 127 } elsif ($keysym == 0xff08) {
122 substr $self->{search}, -1, 1, ""; 128 substr $self->{search}, -1, 1, "";
123 $self->search; 129 $self->search;
124 } elsif ($string ne "") { 130 } elsif ($string ne "") {
125 $self->{search} .= $string; 131 return;
126 $self->search;
127 } 132 }
133
128 } else { 134 } else {
129 if ($keysym == 0xff0d || $keysym == 0xff8d) { 135 if ($keysym == 0xff0d || $keysym == 0xff8d) {
130 # OK 136 # TODO: set selection
131 $self->leave; 137 $self->leave;
132 } elsif ($keysym == 0xff1b) { 138 } elsif ($keysym == 0xff1b) {
133 $self->view_start ($self->{view_start}); 139 $self->view_start ($self->{view_start});
134 $self->leave; 140 $self->leave;
135 } elsif ($keysym == 0xff52) { 141 } elsif ($keysym == 0xff52) {
136 $self->view_start ($self->view_start + 1); 142 $self->view_start ($self->view_start + 1);
137 } elsif ($keysym == 0xff54) { 143 } elsif ($keysym == 0xff54) {
138 $self->view_start ($self->view_start - 1); 144 $self->view_start ($self->view_start - 1);
139 } elsif ($string eq "/") { 145 } elsif ($string eq "/") {
146 delete $self->{manpage_overlay};
140 $self->{in_search} = $self->view_start; 147 $self->{in_search} = $self->view_start;
141 $self->search; 148 $self->search;
142 } elsif ($string eq "G") { 149 } elsif ($string eq "G") {
150 $self->{history} = [];
143 $self->view_start (0); 151 $self->view_start (0);
144 } elsif ($string eq "n") { 152 } elsif ($string eq "n") {
153 if ($self->{found} && @{ $self->{found} }) {
154 push @{ $self->{history} }, [$self->view_start, $self->{found}];
145 $self->search (-1); 155 $self->search (-1);
146 $self->idle; 156 $self->idle;
157 }
147 } elsif ($string eq "p") { 158 } elsif ($string eq "p" or $string eq "N") {
148 # TODO 159 if (my $prev = pop @{ $self->{history} }) {
160 $self->view_start ($prev->[0]);
161 $self->{found} = $prev->[1];
162 $self->want_refresh;
163 }
149 } elsif ($string ne "") { 164 } elsif ($string ne "") {
150 $self->scr_bell; 165 $self->scr_bell;
151 } 166 }
152 } 167 }
153 168
154 1 169 1
155} 170}
156 171
172sub tt_write {
173 my ($self, $data) = @_;
157 174
175 $self->{search} .= $self->locale_decode ($data);
176 $self->search;
177
178 1
179}
180
181

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines