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.129 by root, Mon May 5 20:22:03 2008 UTC vs.
Revision 1.157 by root, Mon Dec 21 03:30:23 2009 UTC

… …
11use DC::Macro; 11use DC::Macro;
12 12
13our @ISA = DC::UI::Base::; 13our @ISA = DC::UI::Base::;
14 14
15my $magicmap_tex = 15my $magicmap_tex =
16 new_from_file DC::Texture DC::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my $class = shift;
21 21
… …
25 tilesize => 32, 25 tilesize => 32,
26 @_ 26 @_
27 ); 27 );
28 28
29 $self 29 $self
30}
31
32sub set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
36} 30}
37 31
38sub add_command { 32sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 33 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 34
… …
169sub invoke_button_down { 163sub invoke_button_down {
170 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
171 165
172 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
173 $self->grab_focus; 167 $self->grab_focus;
174 return unless $::CONN; 168 return unless $::CONN && $self->{ctilesize};
175 169
176 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
177 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
178 172
179 $x -= DC::floor $::MAP->w * 0.5; 173 $x -= DC::floor $::MAP->w * 0.5;
… …
207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
212 [
213 $::PICKUP_ENABLE->{state}
214 ? "Disable automatic pickup"
215 : "Enable automatic pickup",
216 sub { $::PICKUP_ENABLE->toggle }
217 ],
218 ); 206 );
219 207
220 if ($::CONN && $::CONN->{editor_support}) { 208 if ($::CONN && $::CONN->{editor_support}) {
221# push @items, [ 209# push @items, [
222# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
… …
291 $self->{need_update} = 1; 279 $self->{need_update} = 1;
292 $self->SUPER::update; 280 $self->SUPER::update;
293} 281}
294 282
295my %DIR = ( 283my %DIR = (
296 ( "," . DC::SDLK_KP5 ), [0, "stay fire"], 284 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297 ( "," . DC::SDLK_KP8 ), [1, "north"], 285 ( "," . DC::SDLK_KP8 ), [1, "north"],
298 ( "," . DC::SDLK_KP9 ), [2, "northeast"], 286 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
299 ( "," . DC::SDLK_KP6 ), [3, "east"], 287 ( "," . DC::SDLK_KP6 ), [3, "east"],
300 ( "," . DC::SDLK_KP3 ), [4, "southeast"], 288 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
301 ( "," . DC::SDLK_KP2 ), [5, "south"], 289 ( "," . DC::SDLK_KP2 ), [5, "south"],
302 ( "," . DC::SDLK_KP1 ), [6, "southwest"], 290 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
303 ( "," . DC::SDLK_KP4 ), [7, "west"], 291 ( "," . DC::SDLK_KP4 ), [7, "west"],
304 ( "," . DC::SDLK_KP7 ), [8, "northwest"], 292 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
305 293
294 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
295 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
296 ( "," . DC::SDLK_END ), [6, "southwest"],
297 ( "," . DC::SDLK_HOME ), [8, "northwest"],
298
306 ( "," . DC::SDLK_UP ), [1, "north"], 299 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . DC::SDLK_UP ), [2, "northeast"], 300 ("1," . DC::SDLK_UP ), [2, "northeast"],
308 ( "," . DC::SDLK_RIGHT), [3, "east"], 301 ( "," . DC::SDLK_RIGHT ), [3, "east"],
309 ("1," . DC::SDLK_RIGHT), [4, "southeast"], 302 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
310 ( "," . DC::SDLK_DOWN ), [5, "south"], 303 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . DC::SDLK_DOWN ), [6, "southwest"], 304 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
312 ( "," . DC::SDLK_LEFT ), [7, "west"], 305 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . DC::SDLK_LEFT ), [8, "northwest"], 306 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
314); 307);
315 308
316sub invoke_key_down { 309sub invoke_key_down {
317 my ($self, $ev) = @_; 310 my ($self, $ev) = @_;
318 311
319 my $mod = $ev->{mod}; 312 my $mod = $ev->{mod};
320 my $sym = $ev->{sym}; 313 my $sym = $ev->{sym};
321 my $uni = $ev->{unicode}; 314 my $uni = $ev->{unicode};
322 315
323 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 316 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
324 317
325 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { 318 # ignore repeated keypresses
319 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
320 $self->{last_mod} = $mod;
321 $self->{last_sym} = $sym;
322
323 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
324
325 if ($::CONN && $dir) {
326 if ($mod & DC::KMOD_SHIFT) { 326 if ($mod & DC::KMOD_SHIFT) {
327 $self->{shft}++; 327 $self->{shft}++;
328 if ($dir->[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
329 $::CONN->user_send ("fire $dir->[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
330 } 330 }
… …
347 347
348 my $res = 0; 348 my $res = 0;
349 my $mod = $ev->{mod}; 349 my $mod = $ev->{mod};
350 my $sym = $ev->{sym}; 350 my $sym = $ev->{sym};
351 351
352 delete $self->{last_mod};
353 delete $self->{last_sym};
354
352 if ($::CFG->{shift_fire_stop}) { 355 if ($::CFG->{shift_fire_stop}) {
353 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { 356 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
354 $::CONN->user_send ("fire_stop"); 357 $::CONN->user_send ("fire_stop");
355 delete $self->{fire_dir}; 358 delete $self->{fire_dir};
356 $res = 1; 359 $res = 1;
357 } 360 }
358 } else { 361 } else {
359 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 362 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
363
364 if ($dir && delete $self->{shft}) {
360 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
361 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
362 $res = 1; 367 $res = 1;
363 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) 368 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
364 && delete $self->{shft}) { # XXX: is RSHIFT ok? 369 && delete $self->{shft}) { # XXX: is RSHIFT ok?
… …
366 delete $self->{fire_dir}; 371 delete $self->{fire_dir};
367 $res = 1; 372 $res = 1;
368 } 373 }
369 } 374 }
370 375
371 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { 376 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
372 $::CONN->user_send ("run_stop"); 377 $::CONN->user_send ("run_stop");
373 $res = 1; 378 $res = 1;
374 } 379 }
375 380
376 $res 381 $res
… …
382 $self->refresh_hook; 387 $self->refresh_hook;
383 388
384 0 389 0
385} 390}
386 391
392sub set_tilesize {
393 my ($self, $tilesize) = @_;
394
395 $self->{tilesize} = $tilesize;
396}
397
398sub scroll {
399 my ($self, $dx, $dy) = @_;
400
401 $self->movement_update;
402
403 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
404 $self->{sdy} += $dy * $self->{tilesize};
405
406 # save old fow texture, if applicable
407 $self->{last_fow_texture} = $self->{fow_texture}
408 if $::CFG->{smooth_transitions};
409 $self->{lfdx} = $dx;
410 $self->{lfdy} = $dy;
411 $self->{lmdx} = $self->{dx};
412 $self->{lmdy} = $self->{dy};
413
414 $::MAP->scroll ($dx, $dy);
415}
416
387sub set_magicmap { 417sub set_magicmap {
388 my ($self, $w, $h, $x, $y, $data) = @_; 418 my ($self, $w, $h, $x, $y, $data) = @_;
389 419
390 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 420 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
391 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 421 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
393 $self->{magicmap} = [$x, $y, $w, $h, $data]; 423 $self->{magicmap} = [$x, $y, $w, $h, $data];
394 424
395 $self->update; 425 $self->update;
396} 426}
397 427
428sub movement_update {
429 my ($self) = @_;
430
431 if ($::CFG->{smooth_movement}) {
432 if ($self->{sdx} || $self->{sdy}) {
433 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
434 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
435
436 # the minimum time for a single tile movement
437 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
438
439 $spd *= $self->{tilesize};
440
441 # jump if "impossibly high" speed
442 if (
443 (max abs $self->{sdx}, abs $self->{sdy})
444 > $spd * $mintime * 2.1
445 ) {
446 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
447 $self->{sdx} = $self->{sdy} = 0;
448 } else {
449 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
450
451 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
452 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
453
454 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
455 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
456 }
457
458 $self->update;
459 }
460 } else {
461 $self->{sdx} = $self->{sdy} = 0;
462 }
463
464 $self->{last_update} = EV::time;
465}
466
398sub refresh_hook { 467sub refresh_hook {
399 my ($self) = @_; 468 my ($self) = @_;
400 469
401 if ($::MAP && $::CONN) { 470 if ($::MAP && $::CONN) {
402 if (delete $self->{need_update}) { 471 if (delete $self->{need_update}) {
472 $self->movement_update;
473
403 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 474 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
404 475
476 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
477 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
478
479 # width/height of map, in tiles
405 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 480 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
406 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 481 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
407 482
483 # the map displacement, in tiles
408 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; 484 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
409 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; 485 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
410 486
487 # the upper left "visible" corner, in pixels
411 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 488 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
412 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 489 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
413 490
414 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 491 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
415 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 492 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
… …
430 glNewList ($self->{list} ||= glGenList); 507 glNewList ($self->{list} ||= glGenList);
431 508
432 glPushMatrix; 509 glPushMatrix;
433 glTranslate $sx0, $sy0; 510 glTranslate $sx0, $sy0;
434 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 511 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
512 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
435 513
436 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 514 $::MAP->draw ($dx, $dy, $sw, $sh,
515 $self->{tilesize},
516 $::CONN->{player}{tag},
517 -$self->{sdx}, -$self->{sdy});
437 518
438 glScale $self->{tilesize}, $self->{tilesize}; 519 glScale $self->{tilesize}, $self->{tilesize};
439 520
440 if (my $tex = $self->{fow_texture}) { 521 if (my $tex = $self->{fow_texture}) {
441 glPushMatrix; 522 if ($DC::OpenGL::GL_MULTITEX && $self->{last_fow_texture}) {#d#
442 glScale 1/3, 1/3; 523 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
443 glEnable GL_TEXTURE_2D; 524 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
445 525
446 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 526 if ($d1 * $d2) {
447 $self->{fow_texture}->draw_quad_alpha (0, 0); 527 DC::Texture::draw_fow_texture
528 $::CFG->{fow_intensity},
529 @{$self->{fow_texture}}{qw(name s t w h)},
530 (min 1, $d1 / $d2),
531 $self->{lmdx} - $dx - $self->{lfdx},
532 $self->{lmdy} - $dy - $self->{lfdy},
533 @{$self->{last_fow_texture}}{qw(name s t w h)};
534 } else {
535 delete $self->{last_fow_texture};
536 }
537 }
448 538
449 glDisable GL_TEXTURE_2D; 539 unless ($self->{last_fow_texture}) {
450 glPopMatrix; 540 DC::Texture::draw_fow_texture
541 $::CFG->{fow_intensity},
542 @{$self->{fow_texture}}{qw(name s t w h)};
543 }
451 } 544 }
452 545
453 if ($self->{magicmap}) { 546 if ($self->{magicmap}) {
454 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 547 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
455 548
456 $x += $::MAP->ox + $self->{dx}; 549 $x += $::MAP->ox + $self->{dx};
457 $y += $::MAP->oy + $self->{dy}; 550 $y += $::MAP->oy + $self->{dy};
458 551
459 glTranslate - $x - 1, - $y - 1; 552 glTranslate - $x - 1, - $y - 1;
460 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 553 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
461 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 554 $::MAP->draw_magicmap ($w, $h, $data);
462 } 555 }
463 556
464 glPopMatrix; 557 glPopMatrix;
465 glEndList; 558 glEndList;
466 } 559 }
… …
525sub refresh_hook { 618sub refresh_hook {
526 my ($self) = @_; 619 my ($self) = @_;
527 620
528 if ($::MAP && $self->{texture_atime} < time) { 621 if ($::MAP && $self->{texture_atime} < time) {
529 my ($w, $h) = @$self{qw(w h)}; 622 my ($w, $h) = @$self{qw(w h)};
623
624 return unless $w && $h;
530 625
531 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 626 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
532 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 627 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
533 628
534 my $ox = 0.5 * ($w - $sw); 629 my $ox = 0.5 * ($w - $sw);
… …
763 my $text = $self->{entry}->get_text; 858 my $text = $self->{entry}->get_text;
764 859
765 length $text 860 length $text
766 or return $self->hide; 861 or return $self->hide;
767 862
768 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
769
770 if ($text ne $self->{last_search}) { 863 if ($text ne $self->{last_search}) {
771 my @match; 864 my @match;
772 865
773 if ($text =~ /^(.*?)\s+$/) { 866 if ($text =~ /^(.*?)\s+$/) {
867 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
774 @match = [$cmd, "(appended whitespace suppresses completion)"]; 868 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
775 } else { 869 } else {
870 # @match is [command, penalty, command with arguments] until sort
871
872 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
873
776 my $regexp = do { 874 my $regexp_abbrev = do {
777 my ($beg, @chr) = split //, lc $cmd; 875 my ($beg, @chr) = split //, lc $cmd;
778 876
779 # the following regex is used to match our "completion entry" 877 # the following regex is used to match our "completion entry"
780 # to an actual command - the parentheses match kind of "overhead" 878 # to an actual command - the parentheses match kind of "overhead"
781 # - the more characters the parentheses match, the less attractive 879 # - the more characters the parentheses match, the less attractive
… …
783 my $regexp = "^\Q$beg\E" 881 my $regexp = "^\Q$beg\E"
784 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 882 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
785 qr<$regexp> 883 qr<$regexp>
786 }; 884 };
787 885
788 my @penalty; 886 my $regexp_partial = do {
887 my $regexp = "^\Q$text\E(.*)";
888 qr<$regexp>
889 };
789 890
790 for (keys %{$self->{command}}) { 891 for (keys %{$self->{command}}) {
791 if (@penalty = $_ =~ $regexp) { 892 my @scores;
792 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 893
894 # 1. Complete command [with args]
895 # command is a prefix of the text
896 # score is length of complete command matched
897 # e.g. "invoke summon pet monster bat"
898 # "invoke" "summon pet monster bat" = 6
899 # "invoke summon pet monster" "bat" = 25
900 if ($text =~ /^\Q$_\E(.*)/) {
901 push @scores, [$_, length $_, $text];
793 } 902 }
903
904 # 2. Partial command
905 # text is a prefix of the full command
906 # score is the length of the input text
907 # e.g. "invoke s"
908 # "invoke small fireball" = 8
909 # "invoke summon pet monster" = 8
910
911 if ($_ =~ $regexp_partial) {
912 push @scores, [$_, length $text, $_];
913 }
914
915 # 3. Abbreviation match
916 # attempts to use first word of text as an abbreviated command
917 # score is length of word + 1 - 3 per non-word-initial character
918
919 if (my @penalty = $_ =~ $regexp_abbrev) {
920 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
921 }
922
923 # Pick the best option for this command
924 push @match, (sort {
925 $b->[1] <=> $a->[1]
926 } @scores)[0];
794 } 927 }
795 928
929 # @match is now [command object, command with arguments]
796 @match = map $self->{command}{$_->[0]}, 930 @match = map [$self->{command}{$_->[0]}, $_->[2]],
797 sort { 931 sort {
798 $a->[1] <=> $b->[1] 932 $b->[1] <=> $a->[1]
799 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 933 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
800 or (length $b->[0]) <=> (length $a->[0]) 934 or (length $b->[0]) <=> (length $a->[0])
801 } @match; 935 } @match;
802 } 936 }
803 937
… …
822 $label->{fg} = [1, 1, 1, 1]; 956 $label->{fg} = [1, 1, 1, 1];
823 $label->{bg} = [0, 0, 0, 0]; 957 $label->{bg} = [0, 0, 0, 0];
824 } 958 }
825 959
826 if (@matches) { 960 if (@matches) {
827 $self->{select} = "$matches[0][0]$arg"; 961 $self->{select} = "$matches[0][1]";
828 962
829 $labels[0]->{fg} = [0, 0, 0, 1]; 963 $labels[0]->{fg} = [0, 0, 0, 1];
830 $labels[0]->{bg} = [1, 1, 1, 0.8]; 964 $labels[0]->{bg} = [1, 1, 1, 0.8];
831 } else { 965 } else {
832 $self->{select} = "$cmd$arg"; 966 $self->{select} = "$text";
833 } 967 }
834 968
835 for my $match (@matches) { 969 for my $match (@matches) {
836 my $label = shift @labels; 970 my $label = shift @labels;
837 971
838 if (@labels) { 972 if (@labels) {
839 $label->set_text ("$match->[0]$arg"); 973 $label->set_text ("$match->[1]");
840 $label->set_tooltip ($match->[1]); 974 $label->set_tooltip ("$match->[0][1]");
841 } else { 975 } else {
842 $label->set_text ("..."); 976 $label->set_text ("...");
843 $label->set_tooltip ("Use Cursor-Down to view more matches"); 977 $label->set_tooltip ("Use Cursor-Down to view more matches");
844 last; 978 last;
845 } 979 }

Diff Legend

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