… | |
… | |
17 | can_focus => 1, |
17 | can_focus => 1, |
18 | list => glGenList, |
18 | list => glGenList, |
19 | @_ |
19 | @_ |
20 | ); |
20 | ); |
21 | |
21 | |
|
|
22 | $self->{completer} = new CFClient::MapWidget::Command:: |
|
|
23 | command => $self->{command}, |
|
|
24 | can_focus => 1, |
|
|
25 | ; |
|
|
26 | |
22 | $self |
27 | $self |
23 | } |
28 | } |
24 | |
29 | |
25 | sub DESTROY { |
30 | sub add_command { |
|
|
31 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
|
|
32 | |
|
|
33 | (my $data = $command) =~ s/\\//g; |
|
|
34 | |
|
|
35 | $tooltip =~ s/^\s+//; |
|
|
36 | |
|
|
37 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
|
|
38 | |
|
|
39 | $tooltip =~ s/\s+$//; |
|
|
40 | |
|
|
41 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
|
|
42 | } |
|
|
43 | |
|
|
44 | sub clr_commands { |
26 | my $self = shift; |
45 | my ($self) = @_; |
27 | |
46 | |
28 | glDeleteList $self->{list}; |
47 | %{$self->{completer}{command}} = (); |
29 | |
|
|
30 | $self->SUPER::DESTROY; |
|
|
31 | } |
48 | } |
32 | |
49 | |
33 | sub button_down { |
50 | sub button_down { |
34 | my ($self, $ev, $x, $y) = @_; |
51 | my ($self, $ev, $x, $y) = @_; |
35 | |
52 | |
… | |
… | |
76 | |
93 | |
77 | $self->{need_update} = 1; |
94 | $self->{need_update} = 1; |
78 | $self->SUPER::update; |
95 | $self->SUPER::update; |
79 | } |
96 | } |
80 | |
97 | |
|
|
98 | my %DIR = ( |
|
|
99 | CFClient::SDLK_KP8, [1, "north"], |
|
|
100 | CFClient::SDLK_KP9, [2, "northeast"], |
|
|
101 | CFClient::SDLK_KP6, [3, "east"], |
|
|
102 | CFClient::SDLK_KP3, [4, "southeast"], |
|
|
103 | CFClient::SDLK_KP2, [5, "south"], |
|
|
104 | CFClient::SDLK_KP1, [6, "southwest"], |
|
|
105 | CFClient::SDLK_KP4, [7, "west"], |
|
|
106 | CFClient::SDLK_KP7, [8, "northwest"], |
|
|
107 | |
|
|
108 | CFClient::SDLK_UP, [1, "north"], |
|
|
109 | CFClient::SDLK_RIGHT, [3, "east"], |
|
|
110 | CFClient::SDLK_DOWN, [5, "south"], |
|
|
111 | CFClient::SDLK_LEFT, [7, "west"], |
|
|
112 | ); |
|
|
113 | |
|
|
114 | sub key_down { |
|
|
115 | my ($self, $ev) = @_; |
|
|
116 | |
|
|
117 | return unless $::CONN; |
|
|
118 | |
|
|
119 | my $mod = $ev->{mod}; |
|
|
120 | my $sym = $ev->{sym}; |
|
|
121 | my $uni = $ev->{unicode}; |
|
|
122 | |
|
|
123 | if ($sym == CFClient::SDLK_KP5) { |
|
|
124 | $::CONN->user_send ("stay fire"); |
|
|
125 | } elsif ($uni == ord ",") { |
|
|
126 | $::CONN->user_send ("take"); |
|
|
127 | } elsif ($uni == ord " ") { |
|
|
128 | $::CONN->user_send ("apply"); |
|
|
129 | } elsif ($uni == ord "\t") { |
|
|
130 | # TODO: toggle inventory |
|
|
131 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
|
|
132 | $::CONN->user_send ("rotateshoottype +"); |
|
|
133 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
|
|
134 | $::CONN->user_send ("rotateshoottype -"); |
|
|
135 | } elsif ($uni == ord '"') { |
|
|
136 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
|
|
137 | $self->{completer}->show; |
|
|
138 | } elsif ($uni == ord "'") { |
|
|
139 | $self->{completer}->set_prefix (""); |
|
|
140 | $self->{completer}->show; |
|
|
141 | } elsif (exists $DIR{$sym}) { |
|
|
142 | if ($mod & CFClient::KMOD_SHIFT) { |
|
|
143 | $self->{shft}++; |
|
|
144 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
|
|
145 | } elsif ($mod & CFClient::KMOD_CTRL) { |
|
|
146 | $self->{ctrl}++; |
|
|
147 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
|
|
148 | } else { |
|
|
149 | $::CONN->user_send ("$DIR{$sym}[1]"); |
|
|
150 | } |
|
|
151 | } elsif ($ev->{unicode}) { |
|
|
152 | $self->{completer}->key_down ($ev); |
|
|
153 | $self->{completer}->show; |
|
|
154 | } |
|
|
155 | } |
|
|
156 | |
|
|
157 | sub key_up { |
|
|
158 | my ($self, $ev) = @_; |
|
|
159 | |
|
|
160 | my $mod = $ev->{mod}; |
|
|
161 | my $sym = $ev->{sym}; |
|
|
162 | |
|
|
163 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
|
|
164 | $::CONN->user_send ("fire_stop"); |
|
|
165 | } |
|
|
166 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
|
|
167 | $::CONN->user_send ("run_stop"); |
|
|
168 | } |
|
|
169 | } |
|
|
170 | |
81 | sub draw { |
171 | sub draw { |
82 | my ($self) = @_; |
172 | my ($self) = @_; |
83 | |
173 | |
|
|
174 | my $focused = $CFClient::UI::FOCUS == $self |
|
|
175 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
|
|
176 | |
84 | return |
177 | return |
85 | unless $CFClient::UI::FOCUS == $self || !$::FAST; |
178 | unless $focused || !$::FAST; |
86 | |
179 | |
87 | if (delete $self->{need_update}) { |
180 | if (delete $self->{need_update}) { |
88 | glNewList $self->{list}; |
181 | glNewList $self->{list}; |
89 | |
182 | |
90 | if ($::MAP) { |
183 | if ($::MAP) { |
… | |
… | |
115 | 0.05, 0.13, 0.05, |
208 | 0.05, 0.13, 0.05, |
116 | ); |
209 | ); |
117 | glEnable GL_CONVOLUTION_2D; |
210 | glEnable GL_CONVOLUTION_2D; |
118 | } |
211 | } |
119 | |
212 | |
|
|
213 | $self->{fow_texture_name} ||= glGenTexture; |
120 | # try to re-use the texture name: TODO improve texture class instead |
214 | # try to re-use the texture name: TODO improve texture class instead |
121 | my $prev_name = ((delete $self->{fow_texture}) || {})->{name}; |
|
|
122 | |
215 | |
123 | $self->{fow_texture} = new CFClient::Texture |
216 | $self->{fow_texture} = new CFClient::Texture |
124 | w => $w, |
217 | w => $w, |
125 | h => $h, |
218 | h => $h, |
126 | data => $data, |
219 | data => $data, |
127 | name => $prev_name, # a bit hackish |
220 | name => $self->{fow_texture_name}, |
128 | internalformat => GL_ALPHA, |
221 | internalformat => GL_ALPHA, |
129 | format => GL_ALPHA; |
222 | format => GL_ALPHA; |
130 | |
223 | |
131 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
224 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
132 | |
225 | |
… | |
… | |
148 | glPushMatrix; |
241 | glPushMatrix; |
149 | glCallList $self->{list}; |
242 | glCallList $self->{list}; |
150 | glPopMatrix; |
243 | glPopMatrix; |
151 | |
244 | |
152 | # TNT2 emulates logops in software (or worse :) |
245 | # TNT2 emulates logops in software (or worse :) |
153 | if ($CFClient::UI::FOCUS != $self) { |
246 | if ($focused) { |
|
|
247 | (delete $self->{out_of_focus})->destroy |
|
|
248 | if $self->{out_of_focus}; |
|
|
249 | } else { |
154 | glColor 0.4, 0.2, 0.2, 0.9; |
250 | glColor 0.4, 0.2, 0.2, 0.6; |
155 | glEnable GL_BLEND; |
251 | glEnable GL_BLEND; |
156 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
252 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
157 | glBegin GL_QUADS; |
253 | glBegin GL_QUADS; |
158 | glVertex 0, 0; |
254 | glVertex 0, 0; |
159 | glVertex 0, $::HEIGHT; |
255 | glVertex 0, $::HEIGHT; |
160 | glVertex $::WIDTH, $::HEIGHT; |
256 | glVertex $::WIDTH, $::HEIGHT; |
161 | glVertex $::WIDTH, 0; |
257 | glVertex $::WIDTH, 0; |
162 | glEnd; |
258 | glEnd; |
163 | glDisable GL_BLEND; |
259 | glDisable GL_BLEND; |
164 | } |
|
|
165 | } |
|
|
166 | |
260 | |
167 | my %DIR = ( |
261 | $self->{out_of_focus} ||= do { |
168 | CFClient::SDLK_KP8, [1, "north"], |
262 | my $label = new CFClient::UI::Label |
169 | CFClient::SDLK_KP9, [2, "northeast"], |
263 | x => 0, |
170 | CFClient::SDLK_KP6, [3, "east"], |
264 | y => 0, |
171 | CFClient::SDLK_KP3, [4, "southeast"], |
265 | z => 1, |
172 | CFClient::SDLK_KP2, [5, "south"], |
266 | ellipsise => 0, |
173 | CFClient::SDLK_KP1, [6, "southwest"], |
267 | text => "map out of focus (click map to play)"; |
174 | CFClient::SDLK_KP4, [7, "west"], |
|
|
175 | CFClient::SDLK_KP7, [8, "northwest"], |
|
|
176 | |
268 | |
177 | CFClient::SDLK_UP, [1, "north"], |
269 | $label->show; |
178 | CFClient::SDLK_RIGHT, [3, "east"], |
270 | $label->update; |
179 | CFClient::SDLK_DOWN, [5, "south"], |
|
|
180 | CFClient::SDLK_LEFT, [7, "west"], |
|
|
181 | ); |
|
|
182 | |
271 | |
183 | sub key_down { |
272 | $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { |
184 | my ($self, $ev) = @_; |
273 | $label->move ( |
|
|
274 | ($::WIDTH - $label->{w}) * 0.5, |
|
|
275 | ($::HEIGHT - $label->{h}) * 0.5, |
|
|
276 | ); |
|
|
277 | }); |
185 | |
278 | |
186 | return unless $::CONN; |
279 | $label |
187 | |
|
|
188 | my $mod = $ev->{mod}; |
|
|
189 | my $sym = $ev->{sym}; |
|
|
190 | my $uni = $ev->{unicode}; |
|
|
191 | |
|
|
192 | if ($sym == CFClient::SDLK_KP5) { |
|
|
193 | $::CONN->user_send ("stay fire"); |
|
|
194 | } elsif ($uni == ord ",") { |
|
|
195 | $::CONN->user_send ("take"); |
|
|
196 | } elsif ($uni == ord "\t" or $uni == ord " ") { |
|
|
197 | $::CONN->user_send ("apply"); |
|
|
198 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
|
|
199 | $::CONN->user_send ("rotateshoottype +"); |
|
|
200 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
|
|
201 | $::CONN->user_send ("rotateshoottype -"); |
|
|
202 | } elsif ($uni == ord "'") { |
|
|
203 | $self->emit ('activate_console'); |
|
|
204 | } elsif ($uni == ord "/") { |
|
|
205 | $self->emit (activate_console => '/'); |
|
|
206 | } elsif (exists $DIR{$sym}) { |
|
|
207 | if ($mod & CFClient::KMOD_SHIFT) { |
|
|
208 | $self->{shft}++; |
|
|
209 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
|
|
210 | } elsif ($mod & CFClient::KMOD_CTRL) { |
|
|
211 | $self->{ctrl}++; |
|
|
212 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
|
|
213 | } else { |
|
|
214 | $::CONN->user_send ("$DIR{$sym}[1]"); |
|
|
215 | } |
280 | }; |
216 | } elsif ($ev->{unicode}) { |
|
|
217 | $self->{command_widget} ||= |
|
|
218 | new CFClient::MapWidget::Command:: |
|
|
219 | command => $self->{command}, |
|
|
220 | can_focus => 1, |
|
|
221 | connect_execute => sub { |
|
|
222 | # todo: support callback instead of user_send |
|
|
223 | $::CONN->user_send ($_[1]); |
|
|
224 | }, |
|
|
225 | connect_close => sub { |
|
|
226 | (delete $self->{command_widget})->hide; |
|
|
227 | $self->focus_in; |
|
|
228 | }, |
|
|
229 | ; |
|
|
230 | $self->{command_widget}->key_down ($ev) |
|
|
231 | unless $ev->{unicode} == 20; |
|
|
232 | return unless $self->{command_widget}; |
|
|
233 | $self->{command_widget}->show; |
|
|
234 | $self->{command_widget}->focus_in; |
|
|
235 | } |
281 | } |
236 | } |
282 | } |
237 | |
283 | |
238 | sub key_up { |
284 | sub DESTROY { |
239 | my ($self, $ev) = @_; |
|
|
240 | |
|
|
241 | my $mod = $ev->{mod}; |
|
|
242 | my $sym = $ev->{sym}; |
|
|
243 | |
|
|
244 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
|
|
245 | $::CONN->user_send ("fire_stop"); |
|
|
246 | } |
|
|
247 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
|
|
248 | $::CONN->user_send ("run_stop"); |
|
|
249 | } |
|
|
250 | } |
|
|
251 | |
|
|
252 | sub add_command { |
|
|
253 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
|
|
254 | |
|
|
255 | (my $data = $command) =~ s/\\//g; |
|
|
256 | |
|
|
257 | $tooltip =~ s/^\s+//; |
|
|
258 | |
|
|
259 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
|
|
260 | |
|
|
261 | $tooltip =~ s/\s+$//; |
|
|
262 | |
|
|
263 | $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
|
|
264 | } |
|
|
265 | |
|
|
266 | sub clr_commands { |
|
|
267 | my ($self) = @_; |
285 | my $self = shift; |
268 | |
286 | |
269 | %{$self->{command}} = (); |
287 | glDeleteList $self->{list}; |
|
|
288 | |
|
|
289 | $self->SUPER::DESTROY; |
270 | } |
290 | } |
271 | |
291 | |
272 | package CFClient::MapWidget::MapMap; |
292 | package CFClient::MapWidget::MapMap; |
273 | |
293 | |
274 | our @ISA = CFClient::UI::Base::; |
294 | our @ISA = CFClient::UI::Base::; |
… | |
… | |
377 | ]; |
397 | ]; |
378 | |
398 | |
379 | $self->{entry} = new CFClient::UI::Entry |
399 | $self->{entry} = new CFClient::UI::Entry |
380 | connect_changed => sub { |
400 | connect_changed => sub { |
381 | $self->update_labels; |
401 | $self->update_labels; |
|
|
402 | }, |
|
|
403 | connect_key_down => sub { |
|
|
404 | my ($entry, $ev) = @_; |
|
|
405 | |
|
|
406 | my $self = $entry->{parent}{parent}; |
|
|
407 | |
|
|
408 | if ($ev->{sym} == 13) { |
|
|
409 | if (exists $self->{select}) { |
|
|
410 | $::CONN->user_send ($self->{select}); |
|
|
411 | $self->hide; |
|
|
412 | } |
|
|
413 | } elsif ($ev->{sym} == 27) { |
|
|
414 | $self->hide; |
|
|
415 | return; |
|
|
416 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
|
|
417 | ++$self->{select_offset} |
|
|
418 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
|
|
419 | $self->update_labels; |
|
|
420 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
|
|
421 | --$self->{select_offset} |
|
|
422 | if $self->{select_offset}; |
|
|
423 | $self->update_labels; |
|
|
424 | } else { |
|
|
425 | return 0; |
|
|
426 | } |
|
|
427 | |
|
|
428 | 1 |
382 | }; |
429 | } |
|
|
430 | ; |
383 | |
431 | |
384 | $self->{vbox}->add ( |
432 | $self->{vbox}->add ( |
385 | $self->{entry}, |
433 | $self->{entry}, |
386 | @{$self->{label}}, |
434 | @{$self->{label}}, |
387 | ); |
435 | ); |
388 | |
436 | |
389 | $self |
437 | $self |
390 | } |
438 | } |
391 | |
439 | |
|
|
440 | sub set_prefix { |
|
|
441 | my ($self, $prefix) = @_; |
|
|
442 | |
|
|
443 | $self->{entry}->set_text ($prefix); |
|
|
444 | $self->show; |
|
|
445 | } |
|
|
446 | |
392 | sub size_allocate { |
447 | sub size_allocate { |
393 | my ($self, $w, $h) = @_; |
448 | my ($self, $w, $h) = @_; |
394 | |
449 | |
395 | $self->SUPER::size_allocate ($w, $h); |
450 | $self->SUPER::size_allocate ($w, $h); |
396 | $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
451 | $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
397 | } |
452 | } |
398 | |
453 | |
|
|
454 | sub show { |
|
|
455 | my ($self) = @_; |
|
|
456 | |
|
|
457 | $self->SUPER::show; |
|
|
458 | $self->{entry}->focus_in; |
|
|
459 | } |
|
|
460 | |
|
|
461 | sub hide { |
|
|
462 | my ($self) = @_; |
|
|
463 | |
|
|
464 | $self->SUPER::hide; |
|
|
465 | $self->{entry}->set_text (""); |
|
|
466 | } |
|
|
467 | |
399 | sub key_down { |
468 | sub key_down { |
400 | my ($self, $ev) = @_; |
469 | my ($self, $ev) = @_; |
401 | |
470 | |
402 | if ($ev->{sym} == 13) { |
471 | $self->{entry}->key_down ($ev); |
403 | if (exists $self->{select}) { |
472 | } |
404 | $self->emit (execute => $self->{select}); |
473 | |
405 | $self->emit ("close"); |
474 | sub update_labels { |
|
|
475 | my ($self) = @_; |
|
|
476 | |
|
|
477 | my $text = $self->{entry}->get_text; |
|
|
478 | |
|
|
479 | length $text |
|
|
480 | or return $self->hide; |
|
|
481 | |
|
|
482 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
|
|
483 | |
|
|
484 | if ($text ne $self->{last_search}) { |
|
|
485 | my @match; |
|
|
486 | |
|
|
487 | if ($text =~ /^(.*?)\s+$/) { |
|
|
488 | @match = [$cmd, "(appended whitespace suppresses completion)"]; |
|
|
489 | } else { |
|
|
490 | my $regexp = do { |
|
|
491 | my ($beg, @chr) = split //, lc $cmd; |
|
|
492 | |
|
|
493 | # the following regex is used to match our "completion entry" |
|
|
494 | # to an actual command - the parentheses match kind of "overhead" |
|
|
495 | # - the more characters the parentheses match, the less attractive |
|
|
496 | # is the match. |
|
|
497 | my $regexp = "^\Q$beg\E" |
|
|
498 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
|
|
499 | qr<$regexp> |
|
|
500 | }; |
|
|
501 | |
|
|
502 | my @penalty; |
|
|
503 | |
|
|
504 | for (keys %{$self->{command}}) { |
|
|
505 | if (@penalty = $_ =~ $regexp) { |
|
|
506 | push @match, [$_, length join "", map "::$_", grep defined, @penalty]; |
|
|
507 | } |
|
|
508 | } |
|
|
509 | |
|
|
510 | @match = map $self->{command}{$_->[0]}, |
|
|
511 | sort { |
|
|
512 | $a->[1] <=> $b->[1] |
|
|
513 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
|
|
514 | or (length $a->[0]) <=> (length $b->[0]) |
|
|
515 | } @match; |
406 | } |
516 | } |
407 | } elsif ($ev->{sym} == 27) { |
|
|
408 | $self->{entry}->set_text (""); |
|
|
409 | $self->emit ("close"); |
|
|
410 | return; |
|
|
411 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
|
|
412 | ++$self->{select_offset} |
|
|
413 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
|
|
414 | $self->update_labels; |
|
|
415 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
|
|
416 | --$self->{select_offset} |
|
|
417 | if $self->{select_offset}; |
|
|
418 | $self->update_labels; |
|
|
419 | } else { |
|
|
420 | #$self->{entry}{force_alloc} = 1; |
|
|
421 | $self->{entry}->key_down ($ev); |
|
|
422 | } |
|
|
423 | } |
|
|
424 | |
|
|
425 | sub update_labels { |
|
|
426 | my ($self) = @_; |
|
|
427 | |
|
|
428 | my $text = $self->{entry}->get_text; |
|
|
429 | |
|
|
430 | length $text |
|
|
431 | or return $self->emit ("close"); |
|
|
432 | |
|
|
433 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
|
|
434 | |
|
|
435 | if ($cmd ne $self->{last_search}) { |
|
|
436 | my $regexp = do { |
|
|
437 | my ($beg, @chr) = split //, lc $cmd; |
|
|
438 | |
|
|
439 | # the following regex is used to match our "completion entry" |
|
|
440 | # to an actual command - the parentheses match kind of "overhead" |
|
|
441 | # - the more characters the parentheses match, the less attractive |
|
|
442 | # is the match. |
|
|
443 | my $regexp = "^\Q$beg\E" |
|
|
444 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
|
|
445 | qr<$regexp> |
|
|
446 | }; |
|
|
447 | |
|
|
448 | my @match; |
|
|
449 | my @penalty; |
|
|
450 | |
|
|
451 | for (keys %{$self->{command}}) { |
|
|
452 | if (@penalty = $_ =~ $regexp) { |
|
|
453 | push @match, [$_, length join "", map "::$_", grep defined, @penalty]; |
|
|
454 | } |
|
|
455 | } |
|
|
456 | |
|
|
457 | @match = map $self->{command}{$_->[0]}, |
|
|
458 | sort { |
|
|
459 | $a->[1] <=> $b->[1] |
|
|
460 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
|
|
461 | } @match; |
|
|
462 | |
517 | |
463 | $self->{last_search} = $cmd; |
518 | $self->{last_search} = $cmd; |
464 | $self->{last_match} = \@match; |
519 | $self->{last_match} = \@match; |
465 | |
520 | |
466 | $self->{select_offset} = 0; |
521 | $self->{select_offset} = 0; |