--- deliantra/Deliantra-Client/DC/MapWidget.pm 2007/12/26 11:42:58 1.123
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2012/11/09 22:53:57 1.165
@@ -1,19 +1,25 @@
-package CFPlus::MapWidget;
+package DC::MapWidget;
-use strict;
-use utf8;
+use common::sense;
use List::Util qw(min max);
-use CFPlus;
-use CFPlus::OpenGL;
-use CFPlus::UI;
-use CFPlus::Macro;
+use AnyEvent ();
-our @ISA = CFPlus::UI::Base::;
+use DC;
+use DC::OpenGL;
+use DC::UI;
+use DC::Macro;
+
+our @ISA = DC::UI::Base::;
+
+our @TEX_HIDDEN = map {
+ new_from_resource DC::Texture # MUST be POT
+ "hidden-$_.png", mipmap => 1, wrap => 1
+ } 0, 1, 2;
my $magicmap_tex =
- new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
+ new_from_resource DC::Texture "magicmap.png",
mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
sub new {
@@ -29,12 +35,6 @@
$self
}
-sub set_tilesize {
- my ($self, $tilesize) = @_;
-
- $self->{tilesize} = $tilesize;
-}
-
sub add_command {
my ($self, $command, $tooltip, $widget, $cb) = @_;
@@ -68,24 +68,24 @@
my $editsup = $::CONN && $::CONN->{editor_support}
or return;
- CFPlus::background {
+ DC::background {
print "preparing editor startup...\n";
my $server = $editsup->{gameserver} || "default";
$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
- local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
- local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
+ local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
+ local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
print "map directory is $mapdir\n";
print "lib directory is $libdir\n";
- my $ua = CFPlus::lwp_useragent;
+ my $ua = DC::lwp_useragent;
for my $file (qw(archetypes crossfire.0)) {
my $url = "$editsup->{lib_root}$file";
print "mirroring $url...\n";
- CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
+ DC::lwp_check $ua->mirror ($url, "$libdir/$file");
printf "%s size %d octets\n", $file, -s "$libdir/$file";
}
@@ -100,14 +100,14 @@
# try to get the most recent head revision, what a hack,
# this should have been returned while downloading *sigh*
- my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
+ my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
if ($log =~ /\?rev=(\d+\.\d+)"/) {
my $rev = $1;
print "downloading revision $rev...\n";
- my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
+ my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
my $meta = {
%$editsup,
@@ -122,7 +122,7 @@
File::Path::mkpath (File::Basename::dirname ($mappath));
open my $fh, ">:raw:perlio", "$mappath.meta"
or die "$mappath.meta: $!\n";
- print $fh CFPlus::encode_json $meta;
+ print $fh DC::encode_json $meta;
close $fh;
open my $fh, ">:raw:perlio:utf8", $mappath
or die "$mappath: $!\n";
@@ -171,13 +171,13 @@
if ($ev->{button} == 1) {
$self->grab_focus;
- return unless $::CONN;
+ return unless $::CONN && $self->{ctilesize};
- my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
- my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
+ my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
+ my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
- $x -= CFPlus::floor $::MAP->w * 0.5;
- $y -= CFPlus::floor $::MAP->h * 0.5;
+ $x -= DC::floor $::MAP->w * 0.5;
+ $y -= DC::floor $::MAP->h * 0.5;
if ($::CONN) {
$::CONN->lookat ($x, $y)
@@ -208,29 +208,23 @@
["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
- ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
- [
- $::PICKUP_ENABLE->{state}
- ? "Disable automatic pickup"
- : "Enable automatic pickup",
- sub { $::PICKUP_ENABLE->toggle }
- ],
+# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
);
if ($::CONN && $::CONN->{editor_support}) {
- push @items, [
- "Edit this map (" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")",
- \&editor_invoke,
- ];
+# push @items, [
+# "Edit this map (" . (DC::asxml $::CONN->{map_info}[0]) . ")",
+# \&editor_invoke,
+# ];
- for my $type (qw(test name)) {
- $::CONN->{editor_support}{type} ne $type
+ for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
+ $::CONN->{editor_support}{servertype} ne $type
or next;
my $server = $::CONN->{editor_support}{"${type}server"}
or next;
push @items, [
- "Login on $type server (" . (CFPlus::asxml $server) . ")",
+ "Login on $type server (" . (DC::asxml $server) . ")",
sub { server_login $server },
];
}
@@ -248,7 +242,7 @@
],
;
- (new CFPlus::UI::Menu
+ (new DC::UI::Menu
items => \@items,
)->popup ($ev);
}
@@ -280,8 +274,8 @@
my ($self) = @_;
(
- $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
- $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
+ $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
+ $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
)
}
@@ -293,24 +287,29 @@
}
my %DIR = (
- ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
- ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
- ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
- ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
- ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
- ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
- ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
- ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
- ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
-
- ( "," . CFPlus::SDLK_UP ), [1, "north"],
- ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
- ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
- ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
- ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
- ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
- ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
- ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
+ ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
+ ( "," . DC::SDLK_KP8 ), [1, "north"],
+ ( "," . DC::SDLK_KP9 ), [2, "northeast"],
+ ( "," . DC::SDLK_KP6 ), [3, "east"],
+ ( "," . DC::SDLK_KP3 ), [4, "southeast"],
+ ( "," . DC::SDLK_KP2 ), [5, "south"],
+ ( "," . DC::SDLK_KP1 ), [6, "southwest"],
+ ( "," . DC::SDLK_KP4 ), [7, "west"],
+ ( "," . DC::SDLK_KP7 ), [8, "northwest"],
+
+ ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
+ ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
+ ( "," . DC::SDLK_END ), [6, "southwest"],
+ ( "," . DC::SDLK_HOME ), [8, "northwest"],
+
+ ( "," . DC::SDLK_UP ), [1, "north"],
+ ("1," . DC::SDLK_UP ), [2, "northeast"],
+ ( "," . DC::SDLK_RIGHT ), [3, "east"],
+ ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
+ ( "," . DC::SDLK_DOWN ), [5, "south"],
+ ("1," . DC::SDLK_DOWN ), [6, "southwest"],
+ ( "," . DC::SDLK_LEFT ), [7, "west"],
+ ("1," . DC::SDLK_LEFT ), [8, "northwest"],
);
sub invoke_key_down {
@@ -320,16 +319,23 @@
my $sym = $ev->{sym};
my $uni = $ev->{unicode};
- $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
+ $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
- if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) {
- if ($mod & CFPlus::KMOD_SHIFT) {
+ # ignore repeated keypresses
+ return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
+ $self->{last_mod} = $mod;
+ $self->{last_sym} = $sym;
+
+ my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
+
+ if ($::CONN && $dir) {
+ if ($mod & DC::KMOD_SHIFT) {
$self->{shft}++;
if ($dir->[0] != $self->{fire_dir}) {
$::CONN->user_send ("fire $dir->[0]");
}
$self->{fire_dir} = $dir->[0];
- } elsif ($mod & CFPlus::KMOD_CTRL) {
+ } elsif ($mod & DC::KMOD_CTRL) {
$self->{ctrl}++;
$::CONN->user_send ("run $dir->[0]");
} else {
@@ -349,18 +355,23 @@
my $mod = $ev->{mod};
my $sym = $ev->{sym};
+ delete $self->{last_mod};
+ delete $self->{last_sym};
+
if ($::CFG->{shift_fire_stop}) {
- if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
+ if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
}
} else {
- if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
+ my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
+
+ if ($dir && delete $self->{shft}) {
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
- } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT)
+ } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
&& delete $self->{shft}) { # XXX: is RSHIFT ok?
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
@@ -368,7 +379,7 @@
}
}
- if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
+ if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
$::CONN->user_send ("run_stop");
$res = 1;
}
@@ -384,6 +395,30 @@
0
}
+sub set_tilesize {
+ my ($self, $tilesize) = @_;
+
+ $self->{tilesize} = $tilesize;
+}
+
+sub scroll {
+ my ($self, $dx, $dy) = @_;
+
+ $self->movement_update;
+
+ $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
+ $self->{sdy} += $dy * $self->{tilesize};
+
+ # save old fow texture, if applicable
+ $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
+ $self->{lfdx} = $dx;
+ $self->{lfdy} = $dy;
+ $self->{lmdx} = $self->{dx};
+ $self->{lmdy} = $self->{dy};
+
+ $::MAP->scroll ($dx, $dy);
+}
+
sub set_magicmap {
my ($self, $w, $h, $x, $y, $data) = @_;
@@ -395,29 +430,77 @@
$self->update;
}
+sub movement_update {
+ my ($self) = @_;
+
+ if ($::CFG->{smooth_movement}) {
+ if ($self->{sdx} || $self->{sdy}) {
+ my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
+ my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
+
+ # the minimum time for a single tile movement
+ my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
+
+ $spd *= $self->{tilesize};
+
+ # jump if "impossibly high" speed
+ if (
+ (max abs $self->{sdx}, abs $self->{sdy})
+ > $spd * $mintime * 2.1
+ ) {
+ #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
+ $self->{sdx} = $self->{sdy} = 0;
+ } else {
+ $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
+
+ my $dx = $self->{sdx} < 0 ? -$spd : $spd;
+ my $dy = $self->{sdy} < 0 ? -$spd : $spd;
+
+ if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
+ if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
+ }
+
+ $self->update;
+ }
+ } else {
+ $self->{sdx} = $self->{sdy} = 0;
+ }
+
+ $self->{last_update} = AE::time;
+}
+
sub refresh_hook {
my ($self) = @_;
if ($::MAP && $::CONN) {
if (delete $self->{need_update}) {
+ $self->movement_update;
+
my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
- my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
- my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
+ my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
+ my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
- my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
- my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+ # width/height of map, in tiles
+ my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
+ my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
+
+ # the map displacement, in tiles
+ my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
+ my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
+ # the upper left "visible" corner, in pixels
my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
- my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
- my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
+ my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
+ my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
if ($::CFG->{fow_enable}) {
+ # draw_fow_texture REQUIRES the fow texture to stay the same size.
my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
- $self->{fow_texture} = new CFPlus::Texture
+ $self->{fow_texture} = new DC::Texture
w => $w,
h => $h,
data => $data,
@@ -432,22 +515,37 @@
glPushMatrix;
glTranslate $sx0, $sy0;
glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+ glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
- $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
+ $::MAP->draw ($dx, $dy, $sw, $sh,
+ ($self->{tilesize}) x 2,
+ $::CONN->{player}{tag},
+ -$self->{sdx}, -$self->{sdy});
glScale $self->{tilesize}, $self->{tilesize};
if (my $tex = $self->{fow_texture}) {
- glPushMatrix;
- glScale 1/3, 1/3;
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+ my @prev_fow_params;
- glColor +($::CFG->{fow_intensity}) x 3, 0.9;
- $self->{fow_texture}->draw_quad_alpha (0, 0);
+ if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
+ my $d1 = DC::distance $self->{sdx}, $self->{sdy};
+ my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
+
+ if ($d1 * $d2) {
+ @prev_fow_params = (
+ (min 1, $d1 / $d2),
+ $self->{lmdx} - $dx - $self->{lfdx},
+ $self->{lmdy} - $dy - $self->{lfdy},
+ @{$self->{prev_fow_texture}}{qw(name data)}
+ );
+ }
+ }
- glDisable GL_TEXTURE_2D;
- glPopMatrix;
+ DC::Texture::draw_fow_texture
+ $::CFG->{fow_intensity},
+ $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
+ @{$self->{fow_texture}}{qw(name data s t w h)},
+ @prev_fow_params;
}
if ($self->{magicmap}) {
@@ -458,13 +556,16 @@
glTranslate - $x - 1, - $y - 1;
glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
- $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
+ $::MAP->draw_magicmap ($w, $h, $data);
}
glPopMatrix;
glEndList;
}
} else {
+ delete $self->{last_fow_texture};
+ delete $self->{fow_texture};
+
glDeleteList delete $self->{list}
if $self->{list};
}
@@ -477,8 +578,8 @@
return unless $self->{list};
- my $focused = $CFPlus::UI::FOCUS == $self
- || $CFPlus::UI::FOCUS == $::COMPLETER->{entry};
+ my $focused = $DC::UI::FOCUS == $self
+ || $DC::UI::FOCUS == $::COMPLETER->{entry};
return
unless $focused || !$::FAST;
@@ -508,15 +609,13 @@
$self->SUPER::DESTROY;
}
-package CFPlus::MapWidget::MapMap;
+package DC::MapWidget::MapMap;
-use strict;
-use utf8;
+use common::sense;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
-use Time::HiRes qw(time);
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub size_request {
($::HEIGHT * 0.2, $::HEIGHT * 0.2)
@@ -525,9 +624,11 @@
sub refresh_hook {
my ($self) = @_;
- if ($::MAP && $self->{texture_atime} < time) {
+ if ($::MAP && $self->{texture_atime} < AE::now) {
my ($w, $h) = @$self{qw(w h)};
+ return unless $w && $h;
+
my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
@@ -548,14 +649,14 @@
$self->{x0} = $x0;
$self->{y0} = $y0;
- $self->{texture_atime} = time + 1/3;
+ $self->{texture_atime} = AE::now + 1/2;
$self->{texture} =
- new CFPlus::Texture
+ new DC::Texture
w => $w,
h => $h,
data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
- type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+ type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
}
}
@@ -611,13 +712,13 @@
glDisable GL_BLEND;
}
-package CFPlus::MapWidget::Command;
+package DC::MapWidget::Command;
-use strict;
+use common::sense;
-use CFPlus::OpenGL;
+use DC::OpenGL;
-our @ISA = CFPlus::UI::Frame::;
+our @ISA = DC::UI::Frame::;
sub new {
my $class = shift;
@@ -627,11 +728,12 @@
@_,
);
- $self->add ($self->{vbox} = new CFPlus::UI::VBox);
+ $self->add ($self->{vbox} = new DC::UI::VBox);
$self->{label} = [
map
- CFPlus::UI::Label->new (
+ DC::UI::Label->new (
+ align => 0,
can_hover => 1,
can_events => 1,
tooltip_width => 0.33,
@@ -639,7 +741,7 @@
), (0.8) x 16
];
- $self->{entry} = new CFPlus::UI::Entry
+ $self->{entry} = new DC::UI::Entry
on_changed => sub {
$self->update_labels;
0
@@ -648,10 +750,10 @@
my ($entry, $ev, $x, $y) = @_;
if ($ev->{button} == 3) {
- (new CFPlus::UI::Menu
+ (new DC::UI::Menu
items => [
- ["bind " . (CFPlus::asxml $self->{select}) . " to a key"
- => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
+ ["bind " . (DC::asxml $self->{select}) . " to a key"
+ => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
],
)->popup ($ev);
return 1;
@@ -676,7 +778,7 @@
} elsif ($ev->{sym} == 27) {
$self->{hist_ptr} = 0;
$self->hide;
- } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
+ } elsif ($ev->{sym} == DC::SDLK_DOWN) {
if ($self->{hist_ptr} > 1) {
$self->{hist_ptr}--;
$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
@@ -688,7 +790,7 @@
if $self->{select_offset} < $#{ $self->{last_match} || [] };
}
$self->update_labels;
- } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
+ } elsif ($ev->{sym} == DC::SDLK_UP) {
if ($self->{select_offset}) {
--$self->{select_offset}
} else {
@@ -764,15 +866,20 @@
length $text
or return $self->hide;
- my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
-
if ($text ne $self->{last_search}) {
my @match;
if ($text =~ /^(.*?)\s+$/) {
- @match = [$cmd, "(appended whitespace suppresses completion)"];
+ my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
+ @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
} else {
- my $regexp = do {
+ # @match is [command, penalty, command with arguments] until sort
+
+ my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
+
+ my $first_char = substr $cmd, 0, 1;
+
+ my $regexp_abbrev = do {
my ($beg, @chr) = split //, lc $cmd;
# the following regex is used to match our "completion entry"
@@ -780,21 +887,61 @@
# - the more characters the parentheses match, the less attractive
# is the match.
my $regexp = "^\Q$beg\E"
- . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
+ . join "", map "(?:.*?[ \\\\]|(.*?))\Q$_\E", @chr;
qr<$regexp>
};
- my @penalty;
+ my $regexp_partial = do {
+ my $regexp = "^\Q$text\E(.*)";
+ qr<$regexp>
+ };
for (keys %{$self->{command}}) {
- if (@penalty = $_ =~ $regexp) {
- push @match, [$_, length join "", map "::$_", grep defined, @penalty];
+ # we only match and score if the first character matches,
+ # so quickly rule out all others first.
+ next unless $first_char = substr $_, 0, 1;
+
+ my @scores;
+
+ # 1. Complete command [with args]
+ # command is a prefix of the text
+ # score is length of complete command matched
+ # e.g. "invoke summon pet monster bat"
+ # "invoke" "summon pet monster bat" = 6
+ # "invoke summon pet monster" "bat" = 25
+ if ((substr $text, 0, length $_) eq $_) {
+ push @scores, [$_, length $_, $text];
}
+
+ # 2. Partial command
+ # text is a prefix of the full command
+ # score is the length of the input text
+ # e.g. "invoke s"
+ # "invoke small fireball" = 8
+ # "invoke summon pet monster" = 8
+
+ if ($_ =~ $regexp_partial) {
+ push @scores, [$_, length $text, $_];
+ }
+
+ # 3. Abbreviation match
+ # attempts to use first word of text as an abbreviated command
+ # score is length of word + 1 - 3 per non-word-initial character
+
+ if (my @penalty = $_ =~ $regexp_abbrev) {
+ push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
+ }
+
+ # Pick the best option for this command
+ push @match, (sort {
+ $b->[1] <=> $a->[1]
+ } @scores)[0];
}
- @match = map $self->{command}{$_->[0]},
+ # @match is now [command object, command with arguments]
+ @match = map [$self->{command}{$_->[0]}, $_->[2]],
sort {
- $a->[1] <=> $b->[1]
+ $b->[1] <=> $a->[1]
or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
or (length $b->[0]) <=> (length $a->[0])
} @match;
@@ -823,20 +970,20 @@
}
if (@matches) {
- $self->{select} = "$matches[0][0]$arg";
+ $self->{select} = "$matches[0][1]";
$labels[0]->{fg} = [0, 0, 0, 1];
$labels[0]->{bg} = [1, 1, 1, 0.8];
} else {
- $self->{select} = "$cmd$arg";
+ $self->{select} = "$text";
}
for my $match (@matches) {
my $label = shift @labels;
if (@labels) {
- $label->set_text ("$match->[0]$arg");
- $label->set_tooltip ($match->[1]);
+ $label->set_text ("$match->[1]");
+ $label->set_tooltip ("$match->[0][1]");
} else {
$label->set_text ("...");
$label->set_tooltip ("Use Cursor-Down to view more matches");
@@ -856,7 +1003,7 @@
my ($self) = @_;
# hack
- local $CFPlus::UI::FOCUS = $self->{entry};
+ local $DC::UI::FOCUS = $self->{entry};
$self->SUPER::_draw;
}