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); |
|
|
6 | |
|
|
7 | use AnyEvent (); |
7 | |
8 | |
8 | use DC; |
9 | use DC; |
9 | use DC::OpenGL; |
10 | use DC::OpenGL; |
10 | use DC::UI; |
11 | use DC::UI; |
11 | use DC::Macro; |
12 | use DC::Macro; |
12 | |
13 | |
13 | our @ISA = DC::UI::Base::; |
14 | our @ISA = DC::UI::Base::; |
|
|
15 | |
|
|
16 | our @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 | |
15 | my $magicmap_tex = |
21 | my $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 | |
32 | sub add_command { |
38 | sub 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 | |
|
|
44 | sub clr_commands { |
|
|
45 | my ($self) = @_; |
|
|
46 | |
|
|
47 | %{$::COMPLETER->{command}} = (); |
|
|
48 | |
|
|
49 | $::COMPLETER->hide |
|
|
50 | if $::COMPLETER; |
|
|
51 | } |
48 | } |
52 | |
49 | |
53 | sub server_login { |
50 | sub server_login { |
54 | my ($server) = @_; |
51 | my ($server) = @_; |
55 | |
52 | |
… | |
… | |
163 | sub invoke_button_down { |
160 | sub 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 | |
404 | sub scroll { |
395 | sub 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 | |
415 | sub set_magicmap { |
413 | sub set_magicmap { |
416 | my ($self, $w, $h, $x, $y, $data) = @_; |
414 | my ($self, $w, $h, $x, $y, $data) = @_; |
417 | |
415 | |
… | |
… | |
426 | sub movement_update { |
424 | sub 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); |
436 | |
434 | |
… | |
… | |
457 | } |
455 | } |
458 | } else { |
456 | } else { |
459 | $self->{sdx} = $self->{sdy} = 0; |
457 | $self->{sdx} = $self->{sdy} = 0; |
460 | } |
458 | } |
461 | |
459 | |
462 | $self->{last_update} = EV::time; |
460 | $self->{last_update} = AE::time; |
463 | } |
461 | } |
464 | |
462 | |
465 | sub refresh_hook { |
463 | sub refresh_hook { |
466 | my ($self) = @_; |
464 | my ($self) = @_; |
467 | |
465 | |
… | |
… | |
488 | |
486 | |
489 | 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; |
490 | 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; |
491 | |
489 | |
492 | if ($::CFG->{fow_enable}) { |
490 | if ($::CFG->{fow_enable}) { |
493 | $sdx_t = $sdy_t = 0;#d# |
491 | # draw_fow_texture REQUIRES the fow texture to stay the same size. |
494 | my ($w, $h, $data) = $::MAP->fow_texture ( |
492 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
495 | $dx + (min 0, $sdx_t), |
|
|
496 | $dy + (min 0, $sdy_t), |
|
|
497 | $sw + abs $sdx_t, |
|
|
498 | $sh + abs $sdy_t |
|
|
499 | ); |
|
|
500 | |
493 | |
501 | $self->{fow_texture} = new DC::Texture |
494 | $self->{fow_texture} = new DC::Texture |
502 | w => $w, |
495 | w => $w, |
503 | h => $h, |
496 | h => $h, |
504 | data => $data, |
497 | data => $data, |
… | |
… | |
511 | glNewList ($self->{list} ||= glGenList); |
504 | glNewList ($self->{list} ||= glGenList); |
512 | |
505 | |
513 | glPushMatrix; |
506 | glPushMatrix; |
514 | glTranslate $sx0, $sy0; |
507 | glTranslate $sx0, $sy0; |
515 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
508 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
516 | glTranslate $self->{sdx}, $self->{sdy}; |
509 | glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy}; |
517 | |
510 | |
518 | $::MAP->draw ($dx, $dy, $sw, $sh, |
511 | $::MAP->draw ($dx, $dy, $sw, $sh, |
519 | $self->{tilesize}, |
512 | ($self->{tilesize}) x 2, |
520 | $::CONN->{player}{tag}, |
513 | $::CONN->{player}{tag}, |
521 | -$self->{sdx}, -$self->{sdy}); |
514 | -$self->{sdx}, -$self->{sdy}); |
522 | |
515 | |
523 | #glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player |
|
|
524 | glScale $self->{tilesize}, $self->{tilesize}; |
516 | glScale $self->{tilesize}, $self->{tilesize}; |
525 | |
517 | |
526 | if (my $tex = $self->{fow_texture}) { |
518 | if (my $tex = $self->{fow_texture}) { |
527 | glPushMatrix; |
519 | my @prev_fow_params; |
528 | glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); |
|
|
529 | glScale 1/3, 1/3; |
|
|
530 | glEnable GL_TEXTURE_2D; |
|
|
531 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
532 | |
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 |
533 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
536 | $::CFG->{fow_intensity}, |
534 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
537 | $TEX_HIDDEN[$::CFG->{fow_texture}]{name}, |
535 | |
538 | @{$self->{fow_texture}}{qw(name data s t w h)}, |
536 | glDisable GL_TEXTURE_2D; |
539 | @prev_fow_params; |
537 | glPopMatrix; |
|
|
538 | } |
540 | } |
539 | |
541 | |
540 | if ($self->{magicmap}) { |
542 | if ($self->{magicmap}) { |
541 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
543 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
542 | |
544 | |
543 | $x += $::MAP->ox + $self->{dx}; |
545 | $x += $::MAP->ox + $self->{dx}; |
544 | $y += $::MAP->oy + $self->{dy}; |
546 | $y += $::MAP->oy + $self->{dy}; |
545 | |
547 | |
546 | glTranslate - $x - 1, - $y - 1; |
548 | glTranslate - $x - 1, - $y - 1; |
547 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
549 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
548 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
550 | $::MAP->draw_magicmap ($w, $h, $data); |
549 | } |
551 | } |
550 | |
552 | |
551 | glPopMatrix; |
553 | glPopMatrix; |
552 | glEndList; |
554 | glEndList; |
553 | } |
555 | } |
554 | } else { |
556 | } else { |
|
|
557 | delete $self->{last_fow_texture}; |
|
|
558 | delete $self->{fow_texture}; |
|
|
559 | |
555 | glDeleteList delete $self->{list} |
560 | glDeleteList delete $self->{list} |
556 | if $self->{list}; |
561 | if $self->{list}; |
557 | } |
562 | } |
558 | } |
563 | } |
559 | |
564 | |
… | |
… | |
595 | $self->SUPER::DESTROY; |
600 | $self->SUPER::DESTROY; |
596 | } |
601 | } |
597 | |
602 | |
598 | package DC::MapWidget::MapMap; |
603 | package DC::MapWidget::MapMap; |
599 | |
604 | |
600 | use strict; |
605 | use common::sense; |
601 | use utf8; |
|
|
602 | |
606 | |
603 | our @ISA = DC::UI::Base::; |
607 | our @ISA = DC::UI::Base::; |
604 | |
608 | |
605 | use Time::HiRes qw(time); |
|
|
606 | use DC::OpenGL; |
609 | use DC::OpenGL; |
607 | |
610 | |
608 | sub size_request { |
611 | sub size_request { |
609 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
612 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
610 | } |
613 | } |
611 | |
614 | |
612 | sub refresh_hook { |
615 | sub refresh_hook { |
613 | my ($self) = @_; |
616 | my ($self) = @_; |
614 | |
617 | |
615 | if ($::MAP && $self->{texture_atime} < time) { |
618 | if ($::MAP && $self->{texture_atime} < AE::now) { |
616 | my ($w, $h) = @$self{qw(w h)}; |
619 | my ($w, $h) = @$self{qw(w h)}; |
617 | |
620 | |
618 | return unless $w && $h; |
621 | return unless $w && $h; |
619 | |
622 | |
620 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
623 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
… | |
… | |
635 | $self->{sh} = $sh; |
638 | $self->{sh} = $sh; |
636 | |
639 | |
637 | $self->{x0} = $x0; |
640 | $self->{x0} = $x0; |
638 | $self->{y0} = $y0; |
641 | $self->{y0} = $y0; |
639 | |
642 | |
640 | $self->{texture_atime} = time + 1/3; |
643 | $self->{texture_atime} = AE::now + 1/2; |
641 | |
644 | |
642 | $self->{texture} = |
645 | $self->{texture} = |
643 | new DC::Texture |
646 | new DC::Texture |
644 | w => $w, |
647 | w => $w, |
645 | h => $h, |
648 | h => $h, |
… | |
… | |
700 | glDisable GL_BLEND; |
703 | glDisable GL_BLEND; |
701 | } |
704 | } |
702 | |
705 | |
703 | package DC::MapWidget::Command; |
706 | package DC::MapWidget::Command; |
704 | |
707 | |
705 | use strict; |
708 | use common::sense; |
706 | |
709 | |
707 | use DC::OpenGL; |
710 | use DC::OpenGL; |
708 | |
711 | |
709 | our @ISA = DC::UI::Frame::; |
712 | our @ISA = DC::UI::Frame::; |
710 | |
713 | |
… | |
… | |
806 | ); |
809 | ); |
807 | |
810 | |
808 | $self |
811 | $self |
809 | } |
812 | } |
810 | |
813 | |
|
|
814 | sub reset { |
|
|
815 | my ($self) = @_; |
|
|
816 | |
|
|
817 | $self->hide; |
|
|
818 | delete $self->{command_list}; |
|
|
819 | } |
|
|
820 | |
811 | sub set_prefix { |
821 | sub set_prefix { |
812 | my ($self, $prefix) = @_; |
822 | my ($self, $prefix) = @_; |
813 | |
823 | |
814 | $self->{entry}->set_text ($prefix); |
824 | $self->{entry}->set_text ($prefix); |
815 | $self->show; |
825 | $self->show; |
… | |
… | |
852 | my $text = $self->{entry}->get_text; |
862 | my $text = $self->{entry}->get_text; |
853 | |
863 | |
854 | length $text |
864 | length $text |
855 | or return $self->hide; |
865 | or return $self->hide; |
856 | |
866 | |
857 | 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 | ]; |
858 | |
874 | |
859 | if ($text ne $self->{last_search}) { |
875 | if ($text ne $self->{last_search}) { |
860 | my @match; |
876 | my @match; |
861 | |
877 | |
862 | if ($text =~ /^(.*?)\s+$/) { |
878 | if ($text =~ /^(.*?)\s+$/) { |
|
|
879 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
863 | @match = [$cmd, "(appended whitespace suppresses completion)"]; |
880 | @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]); |
864 | } 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 | |
865 | my $regexp = do { |
888 | my $regexp_abbrev = do { |
866 | my ($beg, @chr) = split //, lc $cmd; |
889 | my ($beg, @chr) = split //, lc $cmd; |
867 | |
890 | |
868 | # the following regex is used to match our "completion entry" |
891 | # the following regex is used to match our "completion entry" |
869 | # to an actual command - the parentheses match kind of "overhead" |
892 | # to an actual command - the parentheses match kind of "overhead" |
870 | # - the more characters the parentheses match, the less attractive |
893 | # - the more characters the parentheses match, the less attractive |
871 | # is the match. |
894 | # is the match. |
872 | my $regexp = "^\Q$beg\E" |
895 | my $regexp = "^\Q$beg\E" |
873 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
896 | . join "", map "(?:.*?[ _\-]|(.*?))\Q$_\E", @chr; |
874 | qr<$regexp> |
897 | qr<$regexp> |
875 | }; |
898 | }; |
876 | |
899 | |
877 | my @penalty; |
900 | my $regexp_partial = do { |
|
|
901 | my $regexp = "^\Q$text\E(.*)"; |
|
|
902 | qr<$regexp> |
|
|
903 | }; |
878 | |
904 | |
879 | 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 | |
880 | if (@penalty = $_ =~ $regexp) { |
938 | if (my @penalty = $_ =~ $regexp_abbrev) { |
881 | 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]; |
882 | } |
946 | } |
883 | } |
947 | } |
884 | |
948 | |
|
|
949 | # @match is now [command object, command with arguments] |
885 | @match = map $self->{command}{$_->[0]}, |
950 | @match = map [$self->{command}{$_->[0]}, $_->[2]], |
886 | sort { |
951 | sort { |
887 | $a->[1] <=> $b->[1] |
952 | $b->[1] <=> $a->[1] |
888 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
953 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
889 | or (length $b->[0]) <=> (length $a->[0]) |
954 | or (length $b->[0]) <=> (length $a->[0]) |
890 | } @match; |
955 | } @match; |
891 | } |
956 | } |
892 | |
957 | |
… | |
… | |
911 | $label->{fg} = [1, 1, 1, 1]; |
976 | $label->{fg} = [1, 1, 1, 1]; |
912 | $label->{bg} = [0, 0, 0, 0]; |
977 | $label->{bg} = [0, 0, 0, 0]; |
913 | } |
978 | } |
914 | |
979 | |
915 | if (@matches) { |
980 | if (@matches) { |
916 | $self->{select} = "$matches[0][0]$arg"; |
981 | $self->{select} = "$matches[0][1]"; |
917 | |
982 | |
918 | $labels[0]->{fg} = [0, 0, 0, 1]; |
983 | $labels[0]->{fg} = [0, 0, 0, 1]; |
919 | $labels[0]->{bg} = [1, 1, 1, 0.8]; |
984 | $labels[0]->{bg} = [1, 1, 1, 0.8]; |
920 | } else { |
985 | } else { |
921 | $self->{select} = "$cmd$arg"; |
986 | $self->{select} = "$text"; |
922 | } |
987 | } |
923 | |
988 | |
924 | for my $match (@matches) { |
989 | for my $match (@matches) { |
925 | my $label = shift @labels; |
990 | my $label = shift @labels; |
926 | |
991 | |
927 | if (@labels) { |
992 | if (@labels) { |
928 | $label->set_text ("$match->[0]$arg"); |
993 | $label->set_text ("$match->[1]"); |
929 | $label->set_tooltip ($match->[1]); |
994 | $label->set_tooltip ("$match->[0][1]"); |
930 | } else { |
995 | } else { |
931 | $label->set_text ("..."); |
996 | $label->set_text ("..."); |
932 | $label->set_tooltip ("Use Cursor-Down to view more matches"); |
997 | $label->set_tooltip ("Use Cursor-Down to view more matches"); |
933 | last; |
998 | last; |
934 | } |
999 | } |