1 | package DC::MapWidget; |
1 | package DC::MapWidget; |
2 | |
2 | |
3 | use strict; |
3 | use common::sense; |
4 | use utf8; |
|
|
5 | |
4 | |
6 | use List::Util qw(min max); |
5 | use List::Util qw(min max); |
7 | |
6 | |
8 | use DC; |
7 | use DC; |
9 | use DC::OpenGL; |
8 | use DC::OpenGL; |
10 | use DC::UI; |
9 | use DC::UI; |
11 | use DC::Macro; |
10 | use DC::Macro; |
12 | |
11 | |
13 | our @ISA = DC::UI::Base::; |
12 | our @ISA = DC::UI::Base::; |
14 | |
13 | |
|
|
14 | our @TEX_HIDDEN = map { |
|
|
15 | new_from_resource DC::Texture # MUST be POT |
|
|
16 | "hidden-$_.png", mipmap => 1, wrap => 1 |
|
|
17 | } 0, 1, 2; |
|
|
18 | |
15 | my $magicmap_tex = |
19 | my $magicmap_tex = |
16 | new_from_file DC::Texture DC::find_rcfile "magicmap.png", |
20 | new_from_resource DC::Texture "magicmap.png", |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
21 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
18 | |
22 | |
19 | sub new { |
23 | sub new { |
20 | my $class = shift; |
24 | my $class = shift; |
21 | |
25 | |
… | |
… | |
163 | sub invoke_button_down { |
167 | sub invoke_button_down { |
164 | my ($self, $ev, $x, $y) = @_; |
168 | my ($self, $ev, $x, $y) = @_; |
165 | |
169 | |
166 | if ($ev->{button} == 1) { |
170 | if ($ev->{button} == 1) { |
167 | $self->grab_focus; |
171 | $self->grab_focus; |
168 | return unless $::CONN; |
172 | return unless $::CONN && $self->{ctilesize}; |
169 | |
173 | |
170 | my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
174 | 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}; |
175 | my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
172 | |
176 | |
173 | $x -= DC::floor $::MAP->w * 0.5; |
177 | $x -= DC::floor $::MAP->w * 0.5; |
… | |
… | |
201 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
205 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
202 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
206 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
203 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
207 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
204 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
208 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
205 | # ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
209 | # ["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 | ); |
210 | ); |
213 | |
211 | |
214 | if ($::CONN && $::CONN->{editor_support}) { |
212 | if ($::CONN && $::CONN->{editor_support}) { |
215 | # push @items, [ |
213 | # push @items, [ |
216 | # "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", |
214 | # "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", |
217 | # \&editor_invoke, |
215 | # \&editor_invoke, |
218 | # ]; |
216 | # ]; |
219 | |
217 | |
220 | for my $type (qw(test name)) { |
218 | for my $type (@{ $::CONN->{editor_support}{servertypes} }) { |
221 | $::CONN->{editor_support}{type} ne $type |
219 | $::CONN->{editor_support}{servertype} ne $type |
222 | or next; |
220 | or next; |
223 | my $server = $::CONN->{editor_support}{"${type}server"} |
221 | my $server = $::CONN->{editor_support}{"${type}server"} |
224 | or next; |
222 | or next; |
225 | |
223 | |
226 | push @items, [ |
224 | push @items, [ |
… | |
… | |
402 | } |
400 | } |
403 | |
401 | |
404 | sub scroll { |
402 | sub scroll { |
405 | my ($self, $dx, $dy) = @_; |
403 | my ($self, $dx, $dy) = @_; |
406 | |
404 | |
407 | $::MAP->scroll ($dx, $dy); |
|
|
408 | |
|
|
409 | $self->movement_update; |
405 | $self->movement_update; |
410 | |
406 | |
411 | $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement |
407 | $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement |
412 | $self->{sdy} += $dy * $self->{tilesize}; |
408 | $self->{sdy} += $dy * $self->{tilesize}; |
|
|
409 | |
|
|
410 | # save old fow texture, if applicable |
|
|
411 | $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture}; |
|
|
412 | $self->{lfdx} = $dx; |
|
|
413 | $self->{lfdy} = $dy; |
|
|
414 | $self->{lmdx} = $self->{dx}; |
|
|
415 | $self->{lmdy} = $self->{dy}; |
|
|
416 | |
|
|
417 | $::MAP->scroll ($dx, $dy); |
413 | } |
418 | } |
414 | |
419 | |
415 | sub set_magicmap { |
420 | sub set_magicmap { |
416 | my ($self, $w, $h, $x, $y, $data) = @_; |
421 | my ($self, $w, $h, $x, $y, $data) = @_; |
417 | |
422 | |
… | |
… | |
432 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
437 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
433 | |
438 | |
434 | # the minimum time for a single tile movement |
439 | # the minimum time for a single tile movement |
435 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); |
440 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); |
436 | |
441 | |
|
|
442 | $spd *= $self->{tilesize}; |
|
|
443 | |
437 | # jump if "impossibly high" speed |
444 | # jump if "impossibly high" speed |
438 | if ( |
445 | if ( |
439 | (max abs $self->{sdx}, abs $self->{sdy}) |
446 | (max abs $self->{sdx}, abs $self->{sdy}) |
440 | > $spd * $self->{tilesize} * $mintime * 1.1 |
447 | > $spd * $mintime * 2.1 |
441 | ) { |
448 | ) { |
442 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# |
449 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d# |
443 | $self->{sdx} = $self->{sdy} = 0; |
450 | $self->{sdx} = $self->{sdy} = 0; |
444 | } else { |
451 | } else { |
445 | $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction |
452 | $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction |
446 | |
453 | |
447 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
454 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
448 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
455 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
449 | |
456 | |
450 | if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } |
457 | 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 } |
458 | if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } |
452 | |
|
|
453 | $self->update; |
|
|
454 | } |
459 | } |
|
|
460 | |
|
|
461 | $self->update; |
455 | } |
462 | } |
456 | } else { |
463 | } else { |
457 | $self->{sdx} = $self->{sdy} = 0; |
464 | $self->{sdx} = $self->{sdy} = 0; |
458 | } |
465 | } |
459 | |
466 | |
… | |
… | |
486 | |
493 | |
487 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
494 | 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; |
495 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
489 | |
496 | |
490 | if ($::CFG->{fow_enable}) { |
497 | if ($::CFG->{fow_enable}) { |
491 | $sdx_t = $sdy_t = 0;#d# |
498 | # draw_fow_texture REQUIRES the fow texture to stay the same size. |
492 | my ($w, $h, $data) = $::MAP->fow_texture ( |
499 | 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 | |
500 | |
499 | $self->{fow_texture} = new DC::Texture |
501 | $self->{fow_texture} = new DC::Texture |
500 | w => $w, |
502 | w => $w, |
501 | h => $h, |
503 | h => $h, |
502 | data => $data, |
504 | data => $data, |
… | |
… | |
509 | glNewList ($self->{list} ||= glGenList); |
511 | glNewList ($self->{list} ||= glGenList); |
510 | |
512 | |
511 | glPushMatrix; |
513 | glPushMatrix; |
512 | glTranslate $sx0, $sy0; |
514 | glTranslate $sx0, $sy0; |
513 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
515 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
514 | glTranslate $self->{sdx}, $self->{sdy}; |
516 | glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy}; |
515 | |
517 | |
516 | $::MAP->draw ($dx, $dy, $sw, $sh, |
518 | $::MAP->draw ($dx, $dy, $sw, $sh, |
517 | $self->{tilesize}, |
519 | $self->{tilesize}, |
518 | $::CONN->{player}{tag}, |
520 | $::CONN->{player}{tag}, |
519 | -$self->{sdx}, -$self->{sdy}); |
521 | -$self->{sdx}, -$self->{sdy}); |
520 | |
522 | |
521 | #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player |
|
|
522 | glScale $self->{tilesize}, $self->{tilesize}; |
523 | glScale $self->{tilesize}, $self->{tilesize}; |
523 | |
524 | |
524 | if (my $tex = $self->{fow_texture}) { |
525 | if (my $tex = $self->{fow_texture}) { |
525 | glPushMatrix; |
526 | 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 | |
527 | |
|
|
528 | if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) { |
|
|
529 | my $d1 = DC::distance $self->{sdx}, $self->{sdy}; |
|
|
530 | my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize; |
|
|
531 | |
|
|
532 | if ($d1 * $d2) { |
|
|
533 | @prev_fow_params = ( |
|
|
534 | (min 1, $d1 / $d2), |
|
|
535 | $self->{lmdx} - $dx - $self->{lfdx}, |
|
|
536 | $self->{lmdy} - $dy - $self->{lfdy}, |
|
|
537 | @{$self->{prev_fow_texture}}{qw(name data)} |
|
|
538 | ); |
|
|
539 | } |
|
|
540 | } |
|
|
541 | |
|
|
542 | DC::Texture::draw_fow_texture |
531 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
543 | $::CFG->{fow_intensity}, |
532 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
544 | $TEX_HIDDEN[$::CFG->{fow_texture}]{name}, |
533 | |
545 | @{$self->{fow_texture}}{qw(name data s t w h)}, |
534 | glDisable GL_TEXTURE_2D; |
546 | @prev_fow_params; |
535 | glPopMatrix; |
|
|
536 | } |
547 | } |
537 | |
548 | |
538 | if ($self->{magicmap}) { |
549 | if ($self->{magicmap}) { |
539 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
550 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
540 | |
551 | |
541 | $x += $::MAP->ox + $self->{dx}; |
552 | $x += $::MAP->ox + $self->{dx}; |
542 | $y += $::MAP->oy + $self->{dy}; |
553 | $y += $::MAP->oy + $self->{dy}; |
543 | |
554 | |
544 | glTranslate - $x - 1, - $y - 1; |
555 | glTranslate - $x - 1, - $y - 1; |
545 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
556 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
546 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
557 | $::MAP->draw_magicmap ($w, $h, $data); |
547 | } |
558 | } |
548 | |
559 | |
549 | glPopMatrix; |
560 | glPopMatrix; |
550 | glEndList; |
561 | glEndList; |
551 | } |
562 | } |
552 | } else { |
563 | } else { |
|
|
564 | delete $self->{last_fow_texture}; |
|
|
565 | delete $self->{fow_texture}; |
|
|
566 | |
553 | glDeleteList delete $self->{list} |
567 | glDeleteList delete $self->{list} |
554 | if $self->{list}; |
568 | if $self->{list}; |
555 | } |
569 | } |
556 | } |
570 | } |
557 | |
571 | |
… | |
… | |
593 | $self->SUPER::DESTROY; |
607 | $self->SUPER::DESTROY; |
594 | } |
608 | } |
595 | |
609 | |
596 | package DC::MapWidget::MapMap; |
610 | package DC::MapWidget::MapMap; |
597 | |
611 | |
598 | use strict; |
612 | use common::sense; |
599 | use utf8; |
|
|
600 | |
613 | |
601 | our @ISA = DC::UI::Base::; |
614 | our @ISA = DC::UI::Base::; |
602 | |
615 | |
603 | use Time::HiRes qw(time); |
616 | use Time::HiRes qw(time); |
604 | use DC::OpenGL; |
617 | use DC::OpenGL; |
… | |
… | |
610 | sub refresh_hook { |
623 | sub refresh_hook { |
611 | my ($self) = @_; |
624 | my ($self) = @_; |
612 | |
625 | |
613 | if ($::MAP && $self->{texture_atime} < time) { |
626 | if ($::MAP && $self->{texture_atime} < time) { |
614 | my ($w, $h) = @$self{qw(w h)}; |
627 | my ($w, $h) = @$self{qw(w h)}; |
|
|
628 | |
|
|
629 | return unless $w && $h; |
615 | |
630 | |
616 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
631 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
617 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
632 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
618 | |
633 | |
619 | my $ox = 0.5 * ($w - $sw); |
634 | my $ox = 0.5 * ($w - $sw); |
… | |
… | |
696 | glDisable GL_BLEND; |
711 | glDisable GL_BLEND; |
697 | } |
712 | } |
698 | |
713 | |
699 | package DC::MapWidget::Command; |
714 | package DC::MapWidget::Command; |
700 | |
715 | |
701 | use strict; |
716 | use common::sense; |
702 | |
717 | |
703 | use DC::OpenGL; |
718 | use DC::OpenGL; |
704 | |
719 | |
705 | our @ISA = DC::UI::Frame::; |
720 | our @ISA = DC::UI::Frame::; |
706 | |
721 | |
… | |
… | |
848 | my $text = $self->{entry}->get_text; |
863 | my $text = $self->{entry}->get_text; |
849 | |
864 | |
850 | length $text |
865 | length $text |
851 | or return $self->hide; |
866 | or return $self->hide; |
852 | |
867 | |
853 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
|
|
854 | |
|
|
855 | if ($text ne $self->{last_search}) { |
868 | if ($text ne $self->{last_search}) { |
856 | my @match; |
869 | my @match; |
857 | |
870 | |
858 | if ($text =~ /^(.*?)\s+$/) { |
871 | if ($text =~ /^(.*?)\s+$/) { |
|
|
872 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
859 | @match = [$cmd, "(appended whitespace suppresses completion)"]; |
873 | @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]); |
860 | } else { |
874 | } else { |
|
|
875 | # @match is [command, penalty, command with arguments] until sort |
|
|
876 | |
|
|
877 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
|
|
878 | |
861 | my $regexp = do { |
879 | my $regexp_abbrev = do { |
862 | my ($beg, @chr) = split //, lc $cmd; |
880 | my ($beg, @chr) = split //, lc $cmd; |
863 | |
881 | |
864 | # the following regex is used to match our "completion entry" |
882 | # the following regex is used to match our "completion entry" |
865 | # to an actual command - the parentheses match kind of "overhead" |
883 | # to an actual command - the parentheses match kind of "overhead" |
866 | # - the more characters the parentheses match, the less attractive |
884 | # - the more characters the parentheses match, the less attractive |
… | |
… | |
868 | my $regexp = "^\Q$beg\E" |
886 | my $regexp = "^\Q$beg\E" |
869 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
887 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
870 | qr<$regexp> |
888 | qr<$regexp> |
871 | }; |
889 | }; |
872 | |
890 | |
873 | my @penalty; |
891 | my $regexp_partial = do { |
|
|
892 | my $regexp = "^\Q$text\E(.*)"; |
|
|
893 | qr<$regexp> |
|
|
894 | }; |
874 | |
895 | |
875 | for (keys %{$self->{command}}) { |
896 | for (keys %{$self->{command}}) { |
876 | if (@penalty = $_ =~ $regexp) { |
897 | my @scores; |
877 | push @match, [$_, length join "", map "::$_", grep defined, @penalty]; |
898 | |
|
|
899 | # 1. Complete command [with args] |
|
|
900 | # command is a prefix of the text |
|
|
901 | # score is length of complete command matched |
|
|
902 | # e.g. "invoke summon pet monster bat" |
|
|
903 | # "invoke" "summon pet monster bat" = 6 |
|
|
904 | # "invoke summon pet monster" "bat" = 25 |
|
|
905 | if ($text =~ /^\Q$_\E(.*)/) { |
|
|
906 | push @scores, [$_, length $_, $text]; |
878 | } |
907 | } |
|
|
908 | |
|
|
909 | # 2. Partial command |
|
|
910 | # text is a prefix of the full command |
|
|
911 | # score is the length of the input text |
|
|
912 | # e.g. "invoke s" |
|
|
913 | # "invoke small fireball" = 8 |
|
|
914 | # "invoke summon pet monster" = 8 |
|
|
915 | |
|
|
916 | if ($_ =~ $regexp_partial) { |
|
|
917 | push @scores, [$_, length $text, $_]; |
|
|
918 | } |
|
|
919 | |
|
|
920 | # 3. Abbreviation match |
|
|
921 | # attempts to use first word of text as an abbreviated command |
|
|
922 | # score is length of word + 1 - 3 per non-word-initial character |
|
|
923 | |
|
|
924 | if (my @penalty = $_ =~ $regexp_abbrev) { |
|
|
925 | push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"]; |
|
|
926 | } |
|
|
927 | |
|
|
928 | # Pick the best option for this command |
|
|
929 | push @match, (sort { |
|
|
930 | $b->[1] <=> $a->[1] |
|
|
931 | } @scores)[0]; |
879 | } |
932 | } |
880 | |
933 | |
|
|
934 | # @match is now [command object, command with arguments] |
881 | @match = map $self->{command}{$_->[0]}, |
935 | @match = map [$self->{command}{$_->[0]}, $_->[2]], |
882 | sort { |
936 | sort { |
883 | $a->[1] <=> $b->[1] |
937 | $b->[1] <=> $a->[1] |
884 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
938 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
885 | or (length $b->[0]) <=> (length $a->[0]) |
939 | or (length $b->[0]) <=> (length $a->[0]) |
886 | } @match; |
940 | } @match; |
887 | } |
941 | } |
888 | |
942 | |
… | |
… | |
907 | $label->{fg} = [1, 1, 1, 1]; |
961 | $label->{fg} = [1, 1, 1, 1]; |
908 | $label->{bg} = [0, 0, 0, 0]; |
962 | $label->{bg} = [0, 0, 0, 0]; |
909 | } |
963 | } |
910 | |
964 | |
911 | if (@matches) { |
965 | if (@matches) { |
912 | $self->{select} = "$matches[0][0]$arg"; |
966 | $self->{select} = "$matches[0][1]"; |
913 | |
967 | |
914 | $labels[0]->{fg} = [0, 0, 0, 1]; |
968 | $labels[0]->{fg} = [0, 0, 0, 1]; |
915 | $labels[0]->{bg} = [1, 1, 1, 0.8]; |
969 | $labels[0]->{bg} = [1, 1, 1, 0.8]; |
916 | } else { |
970 | } else { |
917 | $self->{select} = "$cmd$arg"; |
971 | $self->{select} = "$text"; |
918 | } |
972 | } |
919 | |
973 | |
920 | for my $match (@matches) { |
974 | for my $match (@matches) { |
921 | my $label = shift @labels; |
975 | my $label = shift @labels; |
922 | |
976 | |
923 | if (@labels) { |
977 | if (@labels) { |
924 | $label->set_text ("$match->[0]$arg"); |
978 | $label->set_text ("$match->[1]"); |
925 | $label->set_tooltip ($match->[1]); |
979 | $label->set_tooltip ("$match->[0][1]"); |
926 | } else { |
980 | } else { |
927 | $label->set_text ("..."); |
981 | $label->set_text ("..."); |
928 | $label->set_tooltip ("Use Cursor-Down to view more matches"); |
982 | $label->set_tooltip ("Use Cursor-Down to view more matches"); |
929 | last; |
983 | last; |
930 | } |
984 | } |