ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.32 by root, Mon May 22 03:40:43 2006 UTC vs.
Revision 1.51 by root, Thu Jun 8 01:51:32 2006 UTC

… …
14 14
15 my $self = $class->SUPER::new ( 15 my $self = $class->SUPER::new (
16 z => -1, 16 z => -1,
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19
20 smooth_matrix => [
21 0.05, 0.13, 0.05,
22 0.13, 0.30, 0.13,
23 0.05, 0.13, 0.05,
24 ],
25
19 @_ 26 @_
20 ); 27 );
21 28
29 $self->{completer} = new CFClient::MapWidget::Command::
30 command => $self->{command},
31 can_focus => 1,
32 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. "
34 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n"
38 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40 ;
41
22 $self 42 $self
23} 43}
24 44
25sub DESTROY { 45sub add_command {
46 my ($self, $command, $tooltip, $widget, $cb) = @_;
47
48 (my $data = $command) =~ s/\\//g;
49
50 $tooltip =~ s/^\s+//;
51 $tooltip = "<big>$data</big>\n\n$tooltip";
52 $tooltip =~ s/\s+$//;
53
54 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
55}
56
57sub clr_commands {
26 my $self = shift; 58 my ($self) = @_;
27 59
28 glDeleteList $self->{list}; 60 %{$self->{completer}{command}} = ();
29
30 $self->SUPER::DESTROY;
31} 61}
32 62
33sub button_down { 63sub button_down {
34 my ($self, $ev, $x, $y) = @_; 64 my ($self, $ev, $x, $y) = @_;
35 65
36 $self->focus_in; 66 $self->focus_in;
37 67
38 if ($ev->{button} == 2) { 68 if ($ev->{button} == 1) {
69 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
71
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99;
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99;
74
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
76
77 } elsif ($ev->{button} == 2) {
39 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 78 my ($ox, $oy) = ($ev->{x}, $ev->{y});
40 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 79 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41 80
42 $self->{motion} = sub { 81 $self->{motion} = sub {
43 my ($ev, $x, $y) = @_; 82 my ($ev, $x, $y) = @_;
… …
48 $::CFG->{map_shift_y} = $bh + $y - $oy; 87 $::CFG->{map_shift_y} = $bh + $y - $oy;
49 88
50 $self->update; 89 $self->update;
51 }; 90 };
52 } 91 }
92
93 1
53} 94}
54 95
55sub button_up { 96sub button_up {
56 my ($self, $ev, $x, $y) = @_; 97 my ($self, $ev, $x, $y) = @_;
57 98
58 delete $self->{motion}; 99 delete $self->{motion};
100
101 1
59} 102}
60 103
61sub mouse_motion { 104sub mouse_motion {
62 my ($self, $ev, $x, $y) = @_; 105 my ($self, $ev, $x, $y) = @_;
63 106
107 if ($self->{motion}) {
64 $self->{motion}->($ev, $x, $y) if $self->{motion}; 108 $self->{motion}->($ev, $x, $y);
109 } else {
110 return 0;
111 }
112
113 1
65} 114}
66 115
67sub size_request { 116sub size_request {
68 ( 117 (
69 1 + 32 * int $::WIDTH / 32, 118 1 + 32 * int $::WIDTH / 32,
… …
76 125
77 $self->{need_update} = 1; 126 $self->{need_update} = 1;
78 $self->SUPER::update; 127 $self->SUPER::update;
79} 128}
80 129
130my %DIR = (
131 CFClient::SDLK_KP8, [1, "north"],
132 CFClient::SDLK_KP9, [2, "northeast"],
133 CFClient::SDLK_KP6, [3, "east"],
134 CFClient::SDLK_KP3, [4, "southeast"],
135 CFClient::SDLK_KP2, [5, "south"],
136 CFClient::SDLK_KP1, [6, "southwest"],
137 CFClient::SDLK_KP4, [7, "west"],
138 CFClient::SDLK_KP7, [8, "northwest"],
139
140 CFClient::SDLK_UP, [1, "north"],
141 CFClient::SDLK_RIGHT, [3, "east"],
142 CFClient::SDLK_DOWN, [5, "south"],
143 CFClient::SDLK_LEFT, [7, "west"],
144);
145
146sub key_down {
147 my ($self, $ev) = @_;
148
149 return 0 unless $::CONN;
150
151 my $mod = $ev->{mod};
152 my $sym = $ev->{sym};
153 my $uni = $ev->{unicode};
154
155 if ($sym == CFClient::SDLK_KP5) {
156 $::CONN->user_send ("stay fire");
157 } elsif ($uni == ord ",") {
158 $::CONN->user_send ("take");
159 } elsif ($uni == ord " ") {
160 $::CONN->user_send ("apply");
161 } elsif ($uni == ord ".") {
162 $::CONN->user_send ($self->{completer}{last_command})
163 if exists $self->{completer}{last_command};
164 } elsif ($uni == ord "\t") {
165 $::INV_WINDOW->toggle_visibility;
166 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
167 $::CONN->user_send ("rotateshoottype +");
168 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
169 $::CONN->user_send ("rotateshoottype -");
170 } elsif ($uni == ord '"') {
171 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
172 $self->{completer}->show;
173 } elsif ($uni == ord "'") {
174 $self->{completer}->set_prefix ("");
175 $self->{completer}->show;
176 } elsif (exists $DIR{$sym}) {
177 if ($mod & CFClient::KMOD_SHIFT) {
178 $self->{shft}++;
179 $::CONN->user_send ("fire $DIR{$sym}[0]");
180 } elsif ($mod & CFClient::KMOD_CTRL) {
181 $self->{ctrl}++;
182 $::CONN->user_send ("run $DIR{$sym}[0]");
183 } else {
184 $::CONN->user_send ("$DIR{$sym}[1]");
185 }
186 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
187 $::BIND_EDITOR->set_binding (undef, undef, [],
188 sub {
189 my ($mod, $sym, $cmds) = @_;
190 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
191 });
192 $::BIND_EDITOR->start;
193 $::BIND_EDITOR->show;
194 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
195 $::BIND_EDITOR->stop;
196 $::BIND_EDITOR->ask_for_bind_and_commit;
197 $::BIND_EDITOR->hide;
198 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
199 $::CONN->user_send ($_) for @$bind_cmd;
200 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
201 $self->{completer}->key_down ($ev);
202 $self->{completer}->show;
203 } else {
204 return 0;
205 }
206
207 1
208}
209
210sub key_up {
211 my ($self, $ev) = @_;
212
213 my $res = 0;
214 my $mod = $ev->{mod};
215 my $sym = $ev->{sym};
216
217 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
218 $::CONN->user_send ("fire_stop");
219 $res = 1;
220 }
221
222 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
223 $::CONN->user_send ("run_stop");
224 $res = 1;
225 }
226
227 $res
228}
229
81sub draw { 230sub draw {
82 my ($self) = @_; 231 my ($self) = @_;
83 232
233 my $focused = $CFClient::UI::FOCUS == $self
234 || $CFClient::UI::FOCUS == $self->{completer}{entry};
235
84 return 236 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 237 unless $focused || !$::FAST;
86 238
87 if (delete $self->{need_update}) { 239 if (delete $self->{need_update}) {
88 glNewList $self->{list}; 240 glNewList $self->{list};
89 241
90 if ($::MAP) { 242 if ($::MAP) {
… …
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 252 glTranslate $sx0 - 32, $sy0 - 32, 0;
101 253
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 254 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103 255
104 if ($::CFG->{fow_enable}) { 256 if ($::CFG->{fow_enable}) {
105 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 257 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
106 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 258 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107 glConvolutionFilter2D ( 259 glConvolutionFilter2D (
108 GL_CONVOLUTION_2D, 260 GL_CONVOLUTION_2D,
109 GL_ALPHA, 261 GL_ALPHA,
110 3, 3, 262 3, 3,
111 GL_ALPHA, GL_FLOAT, 263 GL_ALPHA, GL_FLOAT,
112 pack "f*", 264 (pack "f*", @{ $self->{smooth_matrix} }),
113 0.05, 0.13, 0.05,
114 0.13, 0.30, 0.13,
115 0.05, 0.13, 0.05,
116 ); 265 );
117 glEnable GL_CONVOLUTION_2D; 266 glEnable GL_CONVOLUTION_2D;
118 } 267 }
119 268
269 $self->{fow_texture_name} ||= glGenTexture;
120 # try to re-use the texture name: TODO improve texture class instead 270 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122 271
123 $self->{fow_texture} = new CFClient::Texture 272 $self->{fow_texture} = new CFClient::Texture
124 w => $w, 273 w => $w,
125 h => $h, 274 h => $h,
126 data => $data, 275 data => $data,
127 name => $prev_name, # a bit hackish 276 name => $self->{fow_texture_name},
128 internalformat => GL_ALPHA, 277 internalformat => GL_ALPHA,
129 format => GL_ALPHA; 278 format => GL_ALPHA;
130 279
131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 280 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132 281
… …
148 glPushMatrix; 297 glPushMatrix;
149 glCallList $self->{list}; 298 glCallList $self->{list};
150 glPopMatrix; 299 glPopMatrix;
151 300
152 # TNT2 emulates logops in software (or worse :) 301 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS == $self) { 302 if ($focused) {
154 (delete $self->{out_of_focus})->destroy 303 (delete $self->{out_of_focus})->destroy
155 if $self->{out_of_focus}; 304 if $self->{out_of_focus};
156 } else { 305 } else {
157 glColor 0.4, 0.2, 0.2, 0.6; 306 glColor 0.4, 0.2, 0.2, 0.6;
158 glEnable GL_BLEND; 307 glEnable GL_BLEND;
… …
163 glVertex $::WIDTH, $::HEIGHT; 312 glVertex $::WIDTH, $::HEIGHT;
164 glVertex $::WIDTH, 0; 313 glVertex $::WIDTH, 0;
165 glEnd; 314 glEnd;
166 glDisable GL_BLEND; 315 glDisable GL_BLEND;
167 316
168 $self->{out_of_focus} ||= do { 317# $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label 318# my $label = new CFClient::UI::Label
170 x => 0, 319# x => 0,
171 y => 0, 320# y => 0,
172 z => 1, 321# z => 1,
173 ellipsise => 0, 322# ellipsise => 0,
174 text => "Map Out of Focus (click map to play)"; 323# text => "map out of focus (click map to play)";
175 324#
176 $label->show; 325# $label->show;
177 $label->update; 326# $label->update;
178 327#
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 328# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move ( 329# $label->move_abs (
181 ($::WIDTH - $label->{w}) * 0.5, 330# ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5, 331# ($::HEIGHT - $label->{h}) * 0.5,
183 ); 332# );
184 }); 333# });
185 334#
186 $label 335# $label
187 }; 336# };
188 } 337 }
189} 338}
190 339
191my %DIR = ( 340sub DESTROY {
192 CFClient::SDLK_KP8, [1, "north"],
193 CFClient::SDLK_KP9, [2, "northeast"],
194 CFClient::SDLK_KP6, [3, "east"],
195 CFClient::SDLK_KP3, [4, "southeast"],
196 CFClient::SDLK_KP2, [5, "south"],
197 CFClient::SDLK_KP1, [6, "southwest"],
198 CFClient::SDLK_KP4, [7, "west"],
199 CFClient::SDLK_KP7, [8, "northwest"],
200
201 CFClient::SDLK_UP, [1, "north"],
202 CFClient::SDLK_RIGHT, [3, "east"],
203 CFClient::SDLK_DOWN, [5, "south"],
204 CFClient::SDLK_LEFT, [7, "west"],
205);
206
207sub key_down {
208 my ($self, $ev) = @_;
209
210 return unless $::CONN;
211
212 my $mod = $ev->{mod};
213 my $sym = $ev->{sym};
214 my $uni = $ev->{unicode};
215
216 if ($sym == CFClient::SDLK_KP5) {
217 $::CONN->user_send ("stay fire");
218 } elsif ($uni == ord ",") {
219 $::CONN->user_send ("take");
220 } elsif ($uni == ord "\t" or $uni == ord " ") {
221 $::CONN->user_send ("apply");
222 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
223 $::CONN->user_send ("rotateshoottype +");
224 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
225 $::CONN->user_send ("rotateshoottype -");
226 } elsif ($uni == ord "'") {
227 $self->emit ('activate_console');
228 } elsif ($uni == ord "/") {
229 $self->emit (activate_console => '/');
230 } elsif (exists $DIR{$sym}) {
231 if ($mod & CFClient::KMOD_SHIFT) {
232 $self->{shft}++;
233 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 } elsif ($mod & CFClient::KMOD_CTRL) {
235 $self->{ctrl}++;
236 $::CONN->user_send ("run $DIR{$sym}[0]");
237 } else {
238 $::CONN->user_send ("$DIR{$sym}[1]");
239 }
240 } elsif ($ev->{unicode}) {
241 $self->{command_widget} ||=
242 new CFClient::MapWidget::Command::
243 command => $self->{command},
244 can_focus => 1,
245 connect_execute => sub {
246 # todo: support callback instead of user_send
247 $::CONN->user_send ($_[1]);
248 },
249 connect_close => sub {
250 (delete $self->{command_widget})->hide;
251 $self->focus_in;
252 },
253 ;
254 $self->{command_widget}->key_down ($ev)
255 unless $ev->{unicode} == 20;
256 return unless $self->{command_widget};
257 $self->{command_widget}->show;
258 $self->{command_widget}->focus_in;
259 }
260}
261
262sub key_up {
263 my ($self, $ev) = @_;
264
265 my $mod = $ev->{mod};
266 my $sym = $ev->{sym};
267
268 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269 $::CONN->user_send ("fire_stop");
270 }
271 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272 $::CONN->user_send ("run_stop");
273 }
274}
275
276sub add_command {
277 my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279 (my $data = $command) =~ s/\\//g;
280
281 $tooltip =~ s/^\s+//;
282
283 $tooltip = "<big>$data</big>\n\n$tooltip";
284
285 $tooltip =~ s/\s+$//;
286
287 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
288}
289
290sub clr_commands {
291 my ($self) = @_; 341 my $self = shift;
292 342
293 %{$self->{command}} = (); 343 glDeleteList $self->{list};
344
345 $self->SUPER::DESTROY;
294} 346}
295 347
296package CFClient::MapWidget::MapMap; 348package CFClient::MapWidget::MapMap;
297 349
298our @ISA = CFClient::UI::Base::; 350our @ISA = CFClient::UI::Base::;
… …
399 fontsize => $_, 451 fontsize => $_,
400 ), (0.8) x 16 452 ), (0.8) x 16
401 ]; 453 ];
402 454
403 $self->{entry} = new CFClient::UI::Entry 455 $self->{entry} = new CFClient::UI::Entry
404 connect_changed => sub { 456 on_changed => sub {
405 $self->update_labels; 457 $self->update_labels;
458 },
459 on_key_down => sub {
460 my ($entry, $ev) = @_;
461
462 my $self = $entry->{parent}{parent};
463
464 if ($ev->{sym} == 13) {
465 if (exists $self->{select}) {
466 $self->{last_command} = $self->{select};
467 $::CONN->user_send ($self->{select});
468 $self->hide;
469 }
470 } elsif ($ev->{sym} == 27) {
471 $self->hide;
472 return;
473 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
474 ++$self->{select_offset}
475 if $self->{select_offset} < $#{ $self->{last_match} || [] };
476 $self->update_labels;
477 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
478 --$self->{select_offset}
479 if $self->{select_offset};
480 $self->update_labels;
481 } else {
482 return 0;
483 }
484
485 1
406 }; 486 }
487 ;
407 488
408 $self->{vbox}->add ( 489 $self->{vbox}->add (
409 $self->{entry}, 490 $self->{entry},
410 @{$self->{label}}, 491 @{$self->{label}},
411 ); 492 );
412 493
413 $self 494 $self
414} 495}
415 496
497sub set_prefix {
498 my ($self, $prefix) = @_;
499
500 $self->{entry}->set_text ($prefix);
501 $self->show;
502}
503
416sub size_allocate { 504sub size_allocate {
417 my ($self, $w, $h) = @_; 505 my ($self, $w, $h) = @_;
418 506
419 $self->SUPER::size_allocate ($w, $h); 507 $self->SUPER::size_allocate ($w, $h);
420 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 508 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
509}
510
511sub show {
512 my ($self) = @_;
513
514 $self->SUPER::show;
515 $self->{entry}->focus_in;
516}
517
518sub hide {
519 my ($self) = @_;
520
521 $self->SUPER::hide;
522 $self->{entry}->set_text ("");
421} 523}
422 524
423sub key_down { 525sub key_down {
424 my ($self, $ev) = @_; 526 my ($self, $ev) = @_;
425 527
426 if ($ev->{sym} == 13) { 528 $self->{entry}->key_down ($ev)
427 if (exists $self->{select}) { 529}
428 $self->emit (execute => $self->{select}); 530
429 $self->emit ("close"); 531sub update_labels {
532 my ($self) = @_;
533
534 my $text = $self->{entry}->get_text;
535
536 length $text
537 or return $self->hide;
538
539 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
540
541 if ($text ne $self->{last_search}) {
542 my @match;
543
544 if ($text =~ /^(.*?)\s+$/) {
545 @match = [$cmd, "(appended whitespace suppresses completion)"];
546 } else {
547 my $regexp = do {
548 my ($beg, @chr) = split //, lc $cmd;
549
550 # the following regex is used to match our "completion entry"
551 # to an actual command - the parentheses match kind of "overhead"
552 # - the more characters the parentheses match, the less attractive
553 # is the match.
554 my $regexp = "^\Q$beg\E"
555 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
556 qr<$regexp>
557 };
558
559 my @penalty;
560
561 for (keys %{$self->{command}}) {
562 if (@penalty = $_ =~ $regexp) {
563 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
564 }
565 }
566
567 @match = map $self->{command}{$_->[0]},
568 sort {
569 $a->[1] <=> $b->[1]
570 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
571 or (length $b->[0]) <=> (length $a->[0])
572 } @match;
430 } 573 }
431 } elsif ($ev->{sym} == 27) {
432 $self->{entry}->set_text ("");
433 $self->emit ("close");
434 return;
435 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
436 ++$self->{select_offset}
437 if $self->{select_offset} < $#{ $self->{last_match} || [] };
438 $self->update_labels;
439 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
440 --$self->{select_offset}
441 if $self->{select_offset};
442 $self->update_labels;
443 } else {
444 #$self->{entry}{force_alloc} = 1;
445 $self->{entry}->key_down ($ev);
446 }
447}
448 574
449sub update_labels {
450 my ($self) = @_;
451
452 my $text = $self->{entry}->get_text;
453
454 length $text
455 or return $self->emit ("close");
456
457 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
458
459 if ($cmd ne $self->{last_search}) {
460 my $regexp = do {
461 my ($beg, @chr) = split //, lc $cmd;
462
463 # the following regex is used to match our "completion entry"
464 # to an actual command - the parentheses match kind of "overhead"
465 # - the more characters the parentheses match, the less attractive
466 # is the match.
467 my $regexp = "^\Q$beg\E"
468 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
469 qr<$regexp>
470 };
471
472 my @match;
473 my @penalty;
474
475 for (keys %{$self->{command}}) {
476 if (@penalty = $_ =~ $regexp) {
477 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
478 }
479 }
480
481 @match = map $self->{command}{$_->[0]},
482 sort {
483 $a->[1] <=> $b->[1]
484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 } @match;
486
487 $self->{last_search} = $cmd; 575 $self->{last_search} = $text;
488 $self->{last_match} = \@match; 576 $self->{last_match} = \@match;
489 577
490 $self->{select_offset} = 0; 578 $self->{select_offset} = 0;
491 } 579 }
492 580

Diff Legend

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