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.1 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.10 by root, Tue Jan 10 04:26:54 2006 UTC

… …
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] || "M-s";
9 9
10 $self->parse_keysym ($hotkey, "perl:searchable-scrollback:enter") 10 $self->parse_keysym ($hotkey, "perl:searchable-scrollback:start")
11 or warn "unable to register '$hotkey' as scrollback search enter hotkey\n"; 11 or warn "unable to register '$hotkey' as scrollback search start hotkey\n";
12 12
13 () 13 ()
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:enter") { 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,
43 tt_write => \&tt_write,
42 refresh_begin => sub { 44 refresh_begin => \&refresh,
43 warn "beg(@_)\n"; 45 refresh_end => \&refresh,
44 },
45 refresh_end => sub {
46 warn "end(@_)\n";
47 },
48 ); 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 man ${urxvt::RXVTNAME}perl for details");
49 50
50 $self->idle; 51 $self->idle;
51} 52}
52 53
53sub leave { 54sub leave {
54 my ($self) = @_; 55 my ($self) = @_;
55 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};
56 delete $self->{overlay}; 61 delete $self->{overlay};
57 62 delete $self->{history};
58 $self->disable ("refresh_begin", "refresh_end");
59
60 $self->pty_ev_events ($self->{pty_ev_events});
61 $self->want_refresh;
62} 63}
63 64
64sub idle { 65sub idle {
65 my ($self) = @_; 66 my ($self) = @_;
66 67
67 $self->msg ("scrollback search, escape=exit, enter=accept, /=start search, n=next, p=previous"); 68 $self->msg ("escape=exit, enter=accept, /=start search, n=next, p=previous, G=bottom");
68 69
69 delete $self->{in_search}; 70 delete $self->{in_search};
70} 71}
71 72
72sub search { 73sub search {
73 my ($self) = @_; 74 my ($self, $offset) = @_;
74 75
75 my $row = -$self->view_start; 76 my $row = -$self->view_start + ($self->nrow >> 1) + $offset;
76 77
77 delete $self->{found}; 78 delete $self->{found};
78 79
80 my $search = $self->special_encode ($self->{search});
81
79 no re 'eval'; # just to be sure 82 no re 'eval'; # just to be sure
80 my $re = qr/$self->{search}/; 83 my $re = qr/$search/;
81 84
82 while ($row > -$self->nsaved) { 85 while ($row > -$self->nsaved) {
83 my $line = $self->line ($row) 86 my $line = $self->line ($row)
84 or last; 87 or last;
85 88
86 my $text = $line->t; 89 my $text = $line->t;
87 if ($text =~ /$re/g) { 90 if ($text =~ /$re/g) {
88 do { 91 do {
89 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[1])]; 92 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
90 } while $text =~ /$re/g; 93 } while $text =~ /$re/g;
91 94
92 $self->view_start (-$row + ($self->nrow >> 1)); 95 $self->view_start (-$row + ($self->nrow >> 1));
93 last; 96 last;
94 } 97 }
95 98
96 $row = $line->beg - 1; 99 $row = $line->beg - 1;
97 } 100 }
98 101
99 $self->msg ("enter/type/backspace: /$self->{search}_" 102 $self->msg ("enter/type/backspace: /$self->{search}_"
100 . ($self->{found} ? " (not found)" : "")); 103 . ($self->{found} ? "" : " (not found)"));
101 $self->scr_bell unless $self->{found}; 104 $self->scr_bell unless $self->{found};
102} 105}
103 106
107sub refresh {
108 my ($self) = @_;
109
110 return unless $self->{found};
111
112 $self->scr_xor_span (@$_, urxvt::SET_FGCOLOR (urxvt::RS_RVid, 15))
113 for @{ $self->{found} };
114
115 ()
116}
117
104sub on_key_press { 118sub key_press {
105 my ($self, $event, $keysym, $string) = @_; 119 my ($self, $event, $keysym, $string) = @_;
106
107 $self->{overlay}
108 or return;
109 120
110 if (exists $self->{in_search}) { 121 if (exists $self->{in_search}) {
111 if ($keysym == 0xff0d || $keysym == 0xff8d) { 122 if ($keysym == 0xff0d || $keysym == 0xff8d) {
112 delete $self->{in_search}; 123 $self->idle;
113 } elsif ($keysym == 0xff1b) { 124 } elsif ($keysym == 0xff1b) {
114 $self->view_start (delete $self->{in_search}); 125 $self->view_start ($self->{in_search});
126 $self->idle;
115 } elsif ($keysym == 0xff08) { 127 } elsif ($keysym == 0xff08) {
116 substr $self->{search}, -1, 1, ""; 128 substr $self->{search}, -1, 1, "";
129 $self->search;
117 } elsif ($string ne "") { 130 } elsif ($string ne "") {
118 $self->{search} .= $string; 131 return;
119 } 132 }
120 133
121 $self->search;
122 } else { 134 } else {
123 if ($keysym == 0xff0d || $keysym == 0xff8d) { 135 if ($keysym == 0xff0d || $keysym == 0xff8d) {
124 # OK 136 # TODO: set selection
125 $self->leave; 137 $self->leave;
126 } elsif ($keysym == 0xff1b) { 138 } elsif ($keysym == 0xff1b) {
127 $self->view_start ($self->{view_start}); 139 $self->view_start ($self->{view_start});
128 $self->leave; 140 $self->leave;
129 } elsif ($keysym == 0xff52) { 141 } elsif ($keysym == 0xff52) {
130 $self->view_start ($self->view_start + 1); 142 $self->view_start ($self->view_start + 1);
131 } elsif ($keysym == 0xff54) { 143 } elsif ($keysym == 0xff54) {
132 $self->view_start ($self->view_start - 1); 144 $self->view_start ($self->view_start - 1);
133 } elsif ($string eq "/") { 145 } elsif ($string eq "/") {
146 delete $self->{manpage_overlay};
134 $self->{in_search} = $self->view_start; 147 $self->{in_search} = $self->view_start;
135 $self->search; 148 $self->search;
149 } elsif ($string eq "G") {
150 $self->{history} = [];
151 $self->view_start (0);
136 } elsif ($string eq "n") { 152 } elsif ($string eq "n") {
153 if ($self->{found} && @{ $self->{found} }) {
154 push @{ $self->{history} }, [$self->view_start, $self->{found}];
155 $self->search (-1);
156 $self->idle;
157 }
137 } elsif ($string eq "p") { 158 } elsif ($string eq "p" or $string eq "N") {
159 if (my $prev = pop @{ $self->{history} }) {
160 $self->view_start ($prev->[0]);
161 $self->{found} = $prev->[1];
162 $self->want_refresh;
163 }
138 } elsif ($string ne "") { 164 } elsif ($string ne "") {
139 $self->scr_bell; 165 $self->scr_bell;
140 } 166 }
141 } 167 }
142 168
143 1 169 1
144} 170}
145 171
172sub tt_write {
173 my ($self, $data) = @_;
146 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