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