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.9 by root, Tue Jan 10 04:24:52 2006 UTC vs.
Revision 1.21 by root, Wed Jan 25 15:33:43 2006 UTC

… …
3# this extension implements scrollback buffer search 3# this extension implements scrollback buffer search
4 4
5sub on_init { 5sub on_init {
6 my ($self) = @_; 6 my ($self) = @_;
7 7
8 my $hotkey = $self->{argv}[0] || "M-s"; 8 my $hotkey = $self->{argv}[0]
9 || $self->x_resource ("searchable-scrollback")
10 || "M-s";
9 11
10 $self->parse_keysym ($hotkey, "perl:searchable-scrollback:start") 12 $self->parse_keysym ($hotkey, "perl:searchable-scrollback:start")
11 or warn "unable to register '$hotkey' as scrollback search start hotkey\n"; 13 or warn "unable to register '$hotkey' as scrollback search start hotkey\n";
12 14
13 () 15 ()
14} 16}
15 17
16sub on_keyboard_command { 18sub on_user_command {
17 my ($self, $cmd) = @_; 19 my ($self, $cmd) = @_;
18 20
19 $cmd eq "searchable-scrollback:start" 21 $cmd eq "searchable-scrollback:start"
20 and $self->enter; 22 and $self->enter;
21 23
… …
32sub enter { 34sub enter {
33 my ($self) = @_; 35 my ($self) = @_;
34 36
35 return if $self->{overlay}; 37 return if $self->{overlay};
36 38
37 $self->{history} = [];
38 $self->{view_start} = $self->view_start; 39 $self->{view_start} = $self->view_start;
39 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE); 40 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE);
41 $self->{row} = $self->nrow - 1;
40 42
41 $self->enable ( 43 $self->enable (
42 key_press => \&key_press, 44 key_press => \&key_press,
43 tt_write => \&tt_write, 45 tt_write => \&tt_write,
44 refresh_begin => \&refresh, 46 refresh_begin => \&refresh,
45 refresh_end => \&refresh, 47 refresh_end => \&refresh,
46 ); 48 );
47 49
48 $self->{manpage_overlay} = $self->overlay (0, -2, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0); 50 $self->{manpage_overlay} = $self->overlay (0, -2, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0);
49 $self->{manpage_overlay}->set (0, 0, "scrollback search, see man ${urxvt::RXVTNAME}perl"); 51 $self->{manpage_overlay}->set (0, 0, "scrollback search, see the ${urxvt::RXVTNAME}perl manpage for details");
50 52
51 $self->idle; 53 $self->idle;
52} 54}
53 55
54sub leave { 56sub leave {
… …
58 $self->pty_ev_events ($self->{pty_ev_events}); 60 $self->pty_ev_events ($self->{pty_ev_events});
59 61
60 delete $self->{manpage_overlay}; 62 delete $self->{manpage_overlay};
61 delete $self->{overlay}; 63 delete $self->{overlay};
62 delete $self->{history}; 64 delete $self->{history};
65 delete $self->{search};
63} 66}
64 67
65sub idle { 68sub idle {
66 my ($self) = @_; 69 my ($self) = @_;
67 70
68 $self->msg ("escape=exit, enter=accept, /=start search, n=next, p=previous, G=bottom"); 71 $self->msg ("(escape cancels) /$self->{search}█");
69
70 delete $self->{in_search};
71} 72}
72 73
73sub search { 74sub search {
74 my ($self, $offset) = @_; 75 my ($self, $dir) = @_;
75
76 my $row = -$self->view_start + ($self->nrow >> 1) + $offset;
77 76
78 delete $self->{found}; 77 delete $self->{found};
78 my $row = $self->{row};
79 79
80 my $search = $self->special_encode ($self->{search}); 80 my $search = $self->special_encode ($self->{search});
81 81
82 no re 'eval'; # just to be sure 82 no re 'eval'; # just to be sure
83 my $re = qr/$search/; 83 if (my $re = eval { qr/$search/ }) {
84 while ($self->nrow > $row && $row > $self->top_row) {
85 my $line = $self->line ($row)
86 or last;
84 87
85 while ($row > -$self->nsaved) { 88 my $text = $line->t;
86 my $line = $self->line ($row) 89 if ($text =~ /$re/g) {
87 or last; 90 do {
91 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
92 } while $text =~ /$re/g;
88 93
89 my $text = $line->t; 94 $self->{row} = $row;
90 if ($text =~ /$re/g) { 95 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
96 $self->want_refresh;
97 last;
91 do { 98 }
92 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
93 } while $text =~ /$re/g;
94 99
95 $self->view_start (-$row + ($self->nrow >> 1)); 100 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
96 last;
97 } 101 }
98
99 $row = $line->beg - 1;
100 } 102 }
101 103
102 $self->msg ("enter/type/backspace: /$self->{search}_"
103 . ($self->{found} ? "" : " (not found)"));
104 $self->scr_bell unless $self->{found}; 104 $self->scr_bell unless $self->{found};
105} 105}
106 106
107sub refresh { 107sub refresh {
108 my ($self) = @_; 108 my ($self) = @_;
109 109
110 return unless $self->{found}; 110 return unless $self->{found};
111 111
112 $self->scr_xor_span (@$_, urxvt::SET_FGCOLOR (urxvt::RS_RVid, 15)) 112 my $xor = urxvt::RS_RVid | urxvt::RS_Blink;
113 for @{ $self->{found} }; 113 for (@{ $self->{found} }) {
114 $self->scr_xor_span (@$_, $xor);
115 $xor = urxvt::RS_RVid;
116 }
114 117
115 () 118 ()
116} 119}
117 120
118sub key_press { 121sub key_press {
119 my ($self, $event, $keysym, $string) = @_; 122 my ($self, $event, $keysym, $string) = @_;
120 123
121 if (exists $self->{in_search}) { 124 delete $self->{manpage_overlay};
125
122 if ($keysym == 0xff0d || $keysym == 0xff8d) { 126 if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
123 $self->idle; 127 if ($self->{found}) {
124 } elsif ($keysym == 0xff1b) { 128 my ($br, $bc, $er, $ec) = @{ $self->{found}[0] };
125 $self->view_start ($self->{in_search}); 129 $self->selection_beg ($br, $bc);
126 $self->idle; 130 $self->selection_end ($er, $ec);
127 } elsif ($keysym == 0xff08) { 131 $self->selection_make ($event->{time});
128 substr $self->{search}, -1, 1, "";
129 $self->search;
130 } elsif ($string ne "") {
131 return;
132 } 132 }
133
134 } else {
135 if ($keysym == 0xff0d || $keysym == 0xff8d) {
136 # TODO: set selection
137 $self->leave; 133 $self->leave;
138 } elsif ($keysym == 0xff1b) { 134 } elsif ($keysym == 0xff1b) { # escape
139 $self->view_start ($self->{view_start}); 135 $self->view_start ($self->{view_start});
140 $self->leave; 136 $self->leave;
141 } elsif ($keysym == 0xff52) { 137 } elsif ($keysym == 0xff57) { # end
142 $self->view_start ($self->view_start + 1); 138 $self->{row} = $self->nrow - 1;
143 } elsif ($keysym == 0xff54) {
144 $self->view_start ($self->view_start - 1);
145 } elsif ($string eq "/") {
146 delete $self->{manpage_overlay};
147 $self->{in_search} = $self->view_start;
148 $self->search;
149 } elsif ($string eq "G") {
150 $self->{history} = [];
151 $self->view_start (0); 139 $self->view_start (0);
152 } elsif ($string eq "n") { 140 } elsif ($keysym == 0xff52) { # up
153 if ($self->{found} && @{ $self->{found} }) { 141 $self->{row}-- if $self->{row} > $self->top_row;
154 push @{ $self->{history} }, [$self->view_start, $self->{found}];
155 $self->search (-1); 142 $self->search (-1);
143 } elsif ($keysym == 0xff54) { # down
144 $self->{row}++ if $self->{row} < $self->nrow;
145 $self->search (+1);
146 } elsif ($keysym == 0xff08) { # backspace
147 substr $self->{search}, -1, 1, "";
148 $self->search;
156 $self->idle; 149 $self->idle;
157 } 150 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
158 } elsif ($string eq "p" or $string eq "N") { 151 return; # pass to tt_write
159 if (my $prev = pop @{ $self->{history} }) {
160 $self->view_start ($prev->[0]);
161 $self->{found} = $prev->[1];
162 $self->want_refresh;
163 }
164 } elsif ($string ne "") {
165 $self->scr_bell;
166 }
167 } 152 }
168 153
169 1 154 1
170} 155}
171 156
172sub tt_write { 157sub tt_write {
173 my ($self, $data) = @_; 158 my ($self, $data) = @_;
174 159
175 $self->{search} .= $self->locale_decode ($data); 160 $self->{search} .= $self->locale_decode ($data);
176 $self->search; 161 $self->search (-1);
162 $self->idle;
177 163
178 1 164 1
179} 165}
180 166
181 167

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines