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.143 by root, Wed Sep 3 06:07:39 2008 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

1package DC::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use common::sense;
4use utf8;
5 4
6use List::Util qw(min max); 5use List::Util qw(min max);
6
7use AnyEvent ();
7 8
8use DC; 9use DC;
9use DC::OpenGL; 10use DC::OpenGL;
10use DC::UI; 11use DC::UI;
11use DC::Macro; 12use DC::Macro;
12 13
13our @ISA = DC::UI::Base::; 14our @ISA = DC::UI::Base::;
15
16our @TEX_HIDDEN = map {
17 new_from_resource DC::Texture # MUST be POT
18 "hidden-$_.png", mipmap => 1, wrap => 1
19 } 0, 1, 2;
14 20
15my $magicmap_tex = 21my $magicmap_tex =
16 new_from_resource DC::Texture "magicmap.png", 22 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 23 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 24
… …
27 ); 33 );
28 34
29 $self 35 $self
30} 36}
31 37
32sub add_command { 38sub add_command {#d# remove
33 my ($self, $command, $tooltip, $widget, $cb) = @_; 39 my ($self, $command, $tooltip, $widget, $cb) = @_;
34 40
35 (my $data = $command) =~ s/\\//g; 41 (my $data = $command) =~ s/\\//g;
36 42
37 $tooltip =~ s/^\s+//; 43 $tooltip =~ s/^\s+//;
38 $tooltip = "<big>$data</big>\n\n$tooltip"; 44 $tooltip = "<big>$data</big>\n\n$tooltip";
39 $tooltip =~ s/\s+$//; 45 $tooltip =~ s/\s+$//;
40 46
41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 47 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42}
43
44sub clr_commands {
45 my ($self) = @_;
46
47 %{$::COMPLETER->{command}} = ();
48
49 $::COMPLETER->hide
50 if $::COMPLETER;
51} 48}
52 49
53sub server_login { 50sub server_login {
54 my ($server) = @_; 51 my ($server) = @_;
55 52
… …
163sub invoke_button_down { 160sub invoke_button_down {
164 my ($self, $ev, $x, $y) = @_; 161 my ($self, $ev, $x, $y) = @_;
165 162
166 if ($ev->{button} == 1) { 163 if ($ev->{button} == 1) {
167 $self->grab_focus; 164 $self->grab_focus;
168 return unless $::CONN; 165 return unless $::CONN && $self->{ctilesize};
169 166
170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 167 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 168 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172 169
173 $x -= DC::floor $::MAP->w * 0.5; 170 $x -= DC::floor $::MAP->w * 0.5;
… …
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 198 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 199 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 200 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 201 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 202# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
206 [
207 $::PICKUP_ENABLE->{state}
208 ? "Disable automatic pickup"
209 : "Enable automatic pickup",
210 sub { $::PICKUP_ENABLE->toggle }
211 ],
212 ); 203 );
213 204
214 if ($::CONN && $::CONN->{editor_support}) { 205 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [ 206# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 207# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
217# \&editor_invoke, 208# \&editor_invoke,
218# ]; 209# ];
219 210
220 for my $type (qw(test name)) { 211 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
221 $::CONN->{editor_support}{type} ne $type 212 $::CONN->{editor_support}{servertype} ne $type
222 or next; 213 or next;
223 my $server = $::CONN->{editor_support}{"${type}server"} 214 my $server = $::CONN->{editor_support}{"${type}server"}
224 or next; 215 or next;
225 216
226 push @items, [ 217 push @items, [
… …
402} 393}
403 394
404sub scroll { 395sub scroll {
405 my ($self, $dx, $dy) = @_; 396 my ($self, $dx, $dy) = @_;
406 397
407 $::MAP->scroll ($dx, $dy);
408
409 $self->movement_update; 398 $self->movement_update;
410 399
411 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 400 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
412 $self->{sdy} += $dy * $self->{tilesize}; 401 $self->{sdy} += $dy * $self->{tilesize};
402
403 # save old fow texture, if applicable
404 $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
405 $self->{lfdx} = $dx;
406 $self->{lfdy} = $dy;
407 $self->{lmdx} = $self->{dx};
408 $self->{lmdy} = $self->{dy};
409
410 $::MAP->scroll ($dx, $dy);
413} 411}
414 412
415sub set_magicmap { 413sub set_magicmap {
416 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
417 415
… …
426sub movement_update { 424sub movement_update {
427 my ($self) = @_; 425 my ($self) = @_;
428 426
429 if ($::CFG->{smooth_movement}) { 427 if ($::CFG->{smooth_movement}) {
430 if ($self->{sdx} || $self->{sdy}) { 428 if ($self->{sdx} || $self->{sdy}) {
431 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); 429 my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
433 431
434 # the minimum time for a single tile movement 432 # the minimum time for a single tile movement
435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); 433 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
434
435 $spd *= $self->{tilesize};
436 436
437 # jump if "impossibly high" speed 437 # jump if "impossibly high" speed
438 if ( 438 if (
439 (max abs $self->{sdx}, abs $self->{sdy}) 439 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $self->{tilesize} * $mintime * 1.1 440 > $spd * $mintime * 2.1
441 ) { 441 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
443 $self->{sdx} = $self->{sdy} = 0; 443 $self->{sdx} = $self->{sdy} = 0;
444 } else { 444 } else {
445 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction 445 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446 446
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 447 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 448 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449 449
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } 450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } 451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452
453 $self->update;
454 } 452 }
453
454 $self->update;
455 } 455 }
456 } else { 456 } else {
457 $self->{sdx} = $self->{sdy} = 0; 457 $self->{sdx} = $self->{sdy} = 0;
458 } 458 }
459 459
460 $self->{last_update} = EV::time; 460 $self->{last_update} = AE::time;
461} 461}
462 462
463sub refresh_hook { 463sub refresh_hook {
464 my ($self) = @_; 464 my ($self) = @_;
465 465
… …
486 486
487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
489 489
490 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
491 $sdx_t = $sdy_t = 0;#d# 491 # draw_fow_texture REQUIRES the fow texture to stay the same size.
492 my ($w, $h, $data) = $::MAP->fow_texture ( 492 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
493 $dx + (min 0, $sdx_t),
494 $dy + (min 0, $sdy_t),
495 $sw + abs $sdx_t,
496 $sh + abs $sdy_t
497 );
498 493
499 $self->{fow_texture} = new DC::Texture 494 $self->{fow_texture} = new DC::Texture
500 w => $w, 495 w => $w,
501 h => $h, 496 h => $h,
502 data => $data, 497 data => $data,
… …
509 glNewList ($self->{list} ||= glGenList); 504 glNewList ($self->{list} ||= glGenList);
510 505
511 glPushMatrix; 506 glPushMatrix;
512 glTranslate $sx0, $sy0; 507 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 508 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 glTranslate $self->{sdx}, $self->{sdy}; 509 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
515 510
516 $::MAP->draw ($dx, $dy, $sw, $sh, 511 $::MAP->draw ($dx, $dy, $sw, $sh,
517 $self->{tilesize}, 512 ($self->{tilesize}) x 2,
518 $::CONN->{player}{tag}, 513 $::CONN->{player}{tag},
519 -$self->{sdx}, -$self->{sdy}); 514 -$self->{sdx}, -$self->{sdy});
520 515
521 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
522 glScale $self->{tilesize}, $self->{tilesize}; 516 glScale $self->{tilesize}, $self->{tilesize};
523 517
524 if (my $tex = $self->{fow_texture}) { 518 if (my $tex = $self->{fow_texture}) {
525 glPushMatrix; 519 my @prev_fow_params;
526 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
527 glScale 1/3, 1/3;
528 glEnable GL_TEXTURE_2D;
529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
530 520
521 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
522 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
523 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
524
525 if ($d1 * $d2) {
526 @prev_fow_params = (
527 (min 1, $d1 / $d2),
528 $self->{lmdx} - $dx - $self->{lfdx},
529 $self->{lmdy} - $dy - $self->{lfdy},
530 @{$self->{prev_fow_texture}}{qw(name data)}
531 );
532 }
533 }
534
535 DC::Texture::draw_fow_texture
531 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 536 $::CFG->{fow_intensity},
532 $self->{fow_texture}->draw_quad_alpha (0, 0); 537 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
533 538 @{$self->{fow_texture}}{qw(name data s t w h)},
534 glDisable GL_TEXTURE_2D; 539 @prev_fow_params;
535 glPopMatrix;
536 } 540 }
537 541
538 if ($self->{magicmap}) { 542 if ($self->{magicmap}) {
539 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 543 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
540 544
541 $x += $::MAP->ox + $self->{dx}; 545 $x += $::MAP->ox + $self->{dx};
542 $y += $::MAP->oy + $self->{dy}; 546 $y += $::MAP->oy + $self->{dy};
543 547
544 glTranslate - $x - 1, - $y - 1; 548 glTranslate - $x - 1, - $y - 1;
545 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 549 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
546 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 550 $::MAP->draw_magicmap ($w, $h, $data);
547 } 551 }
548 552
549 glPopMatrix; 553 glPopMatrix;
550 glEndList; 554 glEndList;
551 } 555 }
552 } else { 556 } else {
557 delete $self->{last_fow_texture};
558 delete $self->{fow_texture};
559
553 glDeleteList delete $self->{list} 560 glDeleteList delete $self->{list}
554 if $self->{list}; 561 if $self->{list};
555 } 562 }
556} 563}
557 564
… …
593 $self->SUPER::DESTROY; 600 $self->SUPER::DESTROY;
594} 601}
595 602
596package DC::MapWidget::MapMap; 603package DC::MapWidget::MapMap;
597 604
598use strict; 605use common::sense;
599use utf8;
600 606
601our @ISA = DC::UI::Base::; 607our @ISA = DC::UI::Base::;
602 608
603use Time::HiRes qw(time);
604use DC::OpenGL; 609use DC::OpenGL;
605 610
606sub size_request { 611sub size_request {
607 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 612 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
608} 613}
609 614
610sub refresh_hook { 615sub refresh_hook {
611 my ($self) = @_; 616 my ($self) = @_;
612 617
613 if ($::MAP && $self->{texture_atime} < time) { 618 if ($::MAP && $self->{texture_atime} < AE::now) {
614 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
620
621 return unless $w && $h;
615 622
616 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 623 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
617 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 624 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
618 625
619 my $ox = 0.5 * ($w - $sw); 626 my $ox = 0.5 * ($w - $sw);
… …
631 $self->{sh} = $sh; 638 $self->{sh} = $sh;
632 639
633 $self->{x0} = $x0; 640 $self->{x0} = $x0;
634 $self->{y0} = $y0; 641 $self->{y0} = $y0;
635 642
636 $self->{texture_atime} = time + 1/3; 643 $self->{texture_atime} = AE::now + 1/2;
637 644
638 $self->{texture} = 645 $self->{texture} =
639 new DC::Texture 646 new DC::Texture
640 w => $w, 647 w => $w,
641 h => $h, 648 h => $h,
… …
696 glDisable GL_BLEND; 703 glDisable GL_BLEND;
697} 704}
698 705
699package DC::MapWidget::Command; 706package DC::MapWidget::Command;
700 707
701use strict; 708use common::sense;
702 709
703use DC::OpenGL; 710use DC::OpenGL;
704 711
705our @ISA = DC::UI::Frame::; 712our @ISA = DC::UI::Frame::;
706 713
… …
802 ); 809 );
803 810
804 $self 811 $self
805} 812}
806 813
814sub reset {
815 my ($self) = @_;
816
817 $self->hide;
818 delete $self->{command_list};
819}
820
807sub set_prefix { 821sub set_prefix {
808 my ($self, $prefix) = @_; 822 my ($self, $prefix) = @_;
809 823
810 $self->{entry}->set_text ($prefix); 824 $self->{entry}->set_text ($prefix);
811 $self->show; 825 $self->show;
… …
848 my $text = $self->{entry}->get_text; 862 my $text = $self->{entry}->get_text;
849 863
850 length $text 864 length $text
851 or return $self->hide; 865 or return $self->hide;
852 866
853 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 867 return unless $::CONN;
868
869 # regenerate spell list if necessary
870 $self->{command_list}{spells} ||= [
871 map { ("cast $_->{name}", "invoke $_->{name}") }
872 values %{ $::CONN->{spell} }
873 ];
854 874
855 if ($text ne $self->{last_search}) { 875 if ($text ne $self->{last_search}) {
856 my @match; 876 my @match;
857 877
858 if ($text =~ /^(.*?)\s+$/) { 878 if ($text =~ /^(.*?)\s+$/) {
879 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
859 @match = [$cmd, "(appended whitespace suppresses completion)"]; 880 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
860 } else { 881 } else {
882 # @match is [command, penalty, command with arguments] until sort
883
884 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
885
886 my $first_char = substr $cmd, 0, 1;
887
861 my $regexp = do { 888 my $regexp_abbrev = do {
862 my ($beg, @chr) = split //, lc $cmd; 889 my ($beg, @chr) = split //, lc $cmd;
863 890
864 # the following regex is used to match our "completion entry" 891 # the following regex is used to match our "completion entry"
865 # to an actual command - the parentheses match kind of "overhead" 892 # to an actual command - the parentheses match kind of "overhead"
866 # - the more characters the parentheses match, the less attractive 893 # - the more characters the parentheses match, the less attractive
867 # is the match. 894 # is the match.
868 my $regexp = "^\Q$beg\E" 895 my $regexp = "^\Q$beg\E"
869 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 896 . join "", map "(?:.*?[ _\-]|(.*?))\Q$_\E", @chr;
870 qr<$regexp> 897 qr<$regexp>
871 }; 898 };
872 899
873 my @penalty; 900 my $regexp_partial = do {
901 my $regexp = "^\Q$text\E(.*)";
902 qr<$regexp>
903 };
874 904
875 for (keys %{$self->{command}}) { 905 for my $list (values %{ $self->{command_list} }) {
906 for (@$list) {
907 # we only match and score if the first character matches,
908 # so quickly rule out all others first.
909 next unless $first_char = substr $_, 0, 1;
910
911 my @scores;
912
913 # 1. Complete command [with args]
914 # command is a prefix of the text
915 # score is length of complete command matched
916 # e.g. "invoke summon pet monster bat"
917 # "invoke" "summon pet monster bat" = 6
918 # "invoke summon pet monster" "bat" = 25
919 if ((substr $text, 0, length $_) eq $_) {
920 push @scores, [$_, length $_, $text];
921 }
922
923 # 2. Partial command
924 # text is a prefix of the full command
925 # score is the length of the input text
926 # e.g. "invoke s"
927 # "invoke small fireball" = 8
928 # "invoke summon pet monster" = 8
929
930 if ($_ =~ $regexp_partial) {
931 push @scores, [$_, length $text, $_];
932 }
933
934 # 3. Abbreviation match
935 # attempts to use first word of text as an abbreviated command
936 # score is length of word + 1 - 3 per non-word-initial character
937
876 if (@penalty = $_ =~ $regexp) { 938 if (my @penalty = $_ =~ $regexp_abbrev) {
877 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 939 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
940 }
941
942 # Pick the best option for this command
943 push @match, (sort {
944 $b->[1] <=> $a->[1]
945 } @scores)[0];
878 } 946 }
879 } 947 }
880 948
949 # @match is now [command object, command with arguments]
881 @match = map $self->{command}{$_->[0]}, 950 @match = map [$self->{command}{$_->[0]}, $_->[2]],
882 sort { 951 sort {
883 $a->[1] <=> $b->[1] 952 $b->[1] <=> $a->[1]
884 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 953 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
885 or (length $b->[0]) <=> (length $a->[0]) 954 or (length $b->[0]) <=> (length $a->[0])
886 } @match; 955 } @match;
887 } 956 }
888 957
… …
907 $label->{fg} = [1, 1, 1, 1]; 976 $label->{fg} = [1, 1, 1, 1];
908 $label->{bg} = [0, 0, 0, 0]; 977 $label->{bg} = [0, 0, 0, 0];
909 } 978 }
910 979
911 if (@matches) { 980 if (@matches) {
912 $self->{select} = "$matches[0][0]$arg"; 981 $self->{select} = "$matches[0][1]";
913 982
914 $labels[0]->{fg} = [0, 0, 0, 1]; 983 $labels[0]->{fg} = [0, 0, 0, 1];
915 $labels[0]->{bg} = [1, 1, 1, 0.8]; 984 $labels[0]->{bg} = [1, 1, 1, 0.8];
916 } else { 985 } else {
917 $self->{select} = "$cmd$arg"; 986 $self->{select} = "$text";
918 } 987 }
919 988
920 for my $match (@matches) { 989 for my $match (@matches) {
921 my $label = shift @labels; 990 my $label = shift @labels;
922 991
923 if (@labels) { 992 if (@labels) {
924 $label->set_text ("$match->[0]$arg"); 993 $label->set_text ("$match->[1]");
925 $label->set_tooltip ($match->[1]); 994 $label->set_tooltip ("$match->[0][1]");
926 } else { 995 } else {
927 $label->set_text ("..."); 996 $label->set_text ("...");
928 $label->set_tooltip ("Use Cursor-Down to view more matches"); 997 $label->set_tooltip ("Use Cursor-Down to view more matches");
929 last; 998 last;
930 } 999 }

Diff Legend

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