… | |
… | |
12 | sub on_init { |
12 | sub on_init { |
13 | my ($self) = @_; |
13 | my ($self) = @_; |
14 | |
14 | |
15 | for (my $idx = 0; defined (my $res = $self->x_resource ("selection.pattern-$idx")); $idx++) { |
15 | for (my $idx = 0; defined (my $res = $self->x_resource ("selection.pattern-$idx")); $idx++) { |
16 | no re 'eval'; # just to be sure |
16 | no re 'eval'; # just to be sure |
17 | $res = utf8::encode $self->locale_decode ($res); |
17 | $res = $self->locale_decode ($res); |
|
|
18 | utf8::encode $res; |
18 | push @{ $self->{patterns} }, qr/$res/; |
19 | push @{ $self->{patterns} }, qr/$res/; |
19 | } |
20 | } |
20 | |
21 | |
21 | () |
22 | () |
22 | } |
23 | } |
… | |
… | |
66 | my $curlen = $line->offset_of ($self->selection_end) |
67 | my $curlen = $line->offset_of ($self->selection_end) |
67 | - $line->offset_of ($self->selection_beg); |
68 | - $line->offset_of ($self->selection_beg); |
68 | |
69 | |
69 | my @matches; |
70 | my @matches; |
70 | |
71 | |
71 | # not doing matches in unicode mode helps speed |
72 | if ($markofs < $line->l) { |
72 | # enourmously here. working in utf-8 should be |
73 | # convert markofs form character to UTF-8 offset space |
73 | # equivalent due to the magic of utf-8 encoding. |
74 | { |
|
|
75 | my $prefix = substr $text, 0, $markofs; |
74 | utf8::encode $text; |
76 | utf8::encode $prefix; |
75 | study $text; # _really_ helps, too :) |
77 | $markofs = length $prefix; |
|
|
78 | } |
76 | |
79 | |
77 | for my $regex (@mark_patterns, @{ $self->{patterns} }) { |
80 | # not doing matches in unicode mode helps speed |
78 | while ($text =~ /$regex/g) { |
81 | # enourmously here. working in utf-8 should be |
79 | if ($-[1] <= $markofs and $markofs <= $+[1]) { |
82 | # equivalent due to the magic of utf-8 encoding. |
80 | my $ofs = $-[1]; |
83 | utf8::encode $text; |
81 | my $match = $1; |
84 | study $text; # _really_ helps, too :) |
82 | |
85 | |
|
|
86 | for my $regex (@mark_patterns, @{ $self->{patterns} }) { |
|
|
87 | while ($text =~ /$regex/g) { |
|
|
88 | if ($-[1] <= $markofs and $markofs <= $+[1]) { |
|
|
89 | my $ofs = $-[1]; |
|
|
90 | my $match = $1; |
|
|
91 | |
83 | for my $regex (@simplify_patterns) { |
92 | for my $regex (@simplify_patterns) { |
84 | if ($match =~ $regex) { |
93 | if ($match =~ $regex) { |
85 | $match = $1; |
94 | $match = $1; |
86 | $ofs += $-[1]; |
95 | $ofs += $-[1]; |
|
|
96 | } |
87 | } |
97 | } |
|
|
98 | |
|
|
99 | push @matches, [$ofs, length $match]; |
88 | } |
100 | } |
89 | |
|
|
90 | push @matches, [$ofs, length $match]; |
|
|
91 | } |
101 | } |
92 | } |
102 | } |
93 | } |
103 | } |
94 | |
104 | |
95 | # whole line |
105 | # whole line |
… | |
… | |
98 | for (sort { $a->[1] <=> $b->[1] or $b->[0] <=> $a->[0] } @matches) { |
108 | for (sort { $a->[1] <=> $b->[1] or $b->[0] <=> $a->[0] } @matches) { |
99 | my ($ofs, $len) = @$_; |
109 | my ($ofs, $len) = @$_; |
100 | |
110 | |
101 | next if $len <= $curlen; |
111 | next if $len <= $curlen; |
102 | |
112 | |
|
|
113 | # convert back from UTF-8 offset space to character space |
|
|
114 | { |
|
|
115 | my $length = substr $text, $ofs, $len; |
|
|
116 | utf8::decode $length; |
|
|
117 | $len = length $length; |
|
|
118 | } |
|
|
119 | { |
|
|
120 | my $prefix = substr $text, 0, $ofs; |
|
|
121 | utf8::decode $prefix; |
|
|
122 | $ofs = length $prefix; |
|
|
123 | } |
|
|
124 | |
103 | $self->selection_beg ($line->coord_of ($ofs)); |
125 | $self->selection_beg ($line->coord_of ($ofs)); |
104 | $self->selection_end ($line->coord_of ($ofs + $len)); |
126 | $self->selection_end ($line->coord_of ($ofs + $len)); |
105 | return 1; |
127 | return 1; |
106 | } |
128 | } |
107 | |
129 | |