--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/10/18 13:41:01	1.90
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2010/10/14 00:02:39	1.163
@@ -1,18 +1,23 @@
-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;
-
-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 {
@@ -21,22 +26,10 @@
    my $self = $class->SUPER::new (
       z         => -1,
       can_focus => 1,
-      list      => glGenList,
-
-      smooth_matrix => [
-         0.05, 0.13, 0.05,
-         0.13, 0.30, 0.13,
-         0.05, 0.13, 0.05,
-      ],
-
+      tilesize  => 32,
       @_
    );
 
-   $self->{completer} = new CFPlus::MapWidget::Command::
-      command   => $self->{command},
-      tooltip   => "#completer_help",
-   ;
-
    $self
 }
 
@@ -49,16 +42,16 @@
    $tooltip = "<big>$data</big>\n\n$tooltip";
    $tooltip =~ s/\s+$//;
 
-   $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
+   $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
 }
 
 sub clr_commands {
    my ($self) = @_;
 
-   %{$self->{completer}{command}} = ();
+   %{$::COMPLETER->{command}} = ();
 
-   $self->{completer}->hide
-      if $self->{completer};
+   $::COMPLETER->hide
+      if $::COMPLETER;
 }
 
 sub server_login {
@@ -69,45 +62,28 @@
    ::start_game ();
 }
 
-sub check_lwp($) {
-   my ($res) = @_;
-
-   $res->is_error
-      and die $res->status_line;
-
-   $res
-}
-
 sub editor_invoke {
    my $editsup = $::CONN && $::CONN->{editor_support}
       or return;
 
-   CFPlus::background {
+   DC::background {
       print "preparing editor startup...\n";
-      CFPlus::set_proxy;
 
       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";
 
-      require LWP::UserAgent;
-
-      my $ua = LWP::UserAgent->new (
-         agent      => "cfplus $CFPlus::VERSION",
-         keep_alive => 1,
-         env_proxy  => 1,
-         timeout    => 30,
-      );
+      my $ua = DC::lwp_useragent;
 
       for my $file (qw(archetypes crossfire.0)) {
          my $url = "$editsup->{lib_root}$file";
          print "mirroring $url...\n";
-         check_lwp $ua->mirror ($url, "$libdir/$file");
+         DC::lwp_check $ua->mirror ($url, "$libdir/$file");
          printf "%s size %d octets\n", $file, -s "$libdir/$file";
       }
 
@@ -122,14 +98,14 @@
 
          # try to get the most recent head revision, what a hack,
          # this should have been returned while downloading *sigh*
-         my $log = (check_lwp $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 = (check_lwp $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,
@@ -144,7 +120,7 @@
             File::Path::mkpath (File::Basename::dirname ($mappath));
             open my $fh, ">:raw:perlio", "$mappath.meta"
                or die "$mappath.meta: $!\n";
-            print $fh CFPlus::to_json $meta;
+            print $fh DC::encode_json $meta;
             close $fh;
             open my $fh, ">:raw:perlio:utf8", $mappath
                or die "$mappath: $!\n";
@@ -193,16 +169,17 @@
 
    if ($ev->{button} == 1) {
       $self->grab_focus;
-      return unless $::CONN;
+      return unless $::CONN && $self->{ctilesize};
 
-      my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
-      my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
+      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 -= int 0.5 * $self->{sw};
-      $y -= int 0.5 * $self->{sh};
+      $x -= DC::floor $::MAP->w * 0.5;
+      $y -= DC::floor $::MAP->h * 0.5;
 
-      $::CONN->lookat ($x, $y)
-         if $::CONN;
+      if ($::CONN) {
+         $::CONN->lookat ($x, $y)
+      }
 
    } elsif ($ev->{button} == 2) {
       $self->grab_focus;
@@ -229,29 +206,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 <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
-            \&editor_invoke,
-         ];
+#         push @items, [
+#            "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
+#            \&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 <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
+               "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
                sub { server_login $server },
             ];
          }
@@ -269,7 +240,7 @@
          ],
       ;
 
-      (new CFPlus::UI::Menu
+      (new DC::UI::Menu
          items => \@items,
       )->popup ($ev);
    }
@@ -298,9 +269,11 @@
 }
 
 sub size_request {
+   my ($self) = @_;
+
    (
-      32 * CFPlus::ceil $::WIDTH  / 32,
-      32 * CFPlus::ceil $::HEIGHT / 32,
+      $self->{tilesize} * DC::ceil $::WIDTH  / $self->{tilesize},
+      $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
    )
 }
 
@@ -312,19 +285,29 @@
 }
 
 my %DIR = (
-   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"],
-   CFPlus::SDLK_RIGHT, [3, "east"],
-   CFPlus::SDLK_DOWN,  [5, "south"],
-   CFPlus::SDLK_LEFT,  [7, "west"],
+   ( "," . 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 {
@@ -334,82 +317,33 @@
    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;
+
+   # ignore repeated keypresses
+   return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
+   $self->{last_mod} = $mod;
+   $self->{last_sym} = $sym;
 
-   if ($uni == ord "\t") {
-      $::PL_WINDOW->toggle_visibility;
-   } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
-      $::HELP_WINDOW->toggle_visibility;
-   } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
-      ::toggle_player_page ($::STATS_PAGE);
-   } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
-      ::toggle_player_page ($::SKILL_PAGE);
-   } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
-      ::toggle_player_page ($::SPELL_PAGE);
-   } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
-      ::toggle_player_page ($::INVENTORY_PAGE);
-   } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
-      $::SETUP_DIALOG->toggle_visibility;
-   } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
-      $::BIND_EDITOR->set_binding (undef, undef, [],
-         sub {
-            my ($mod, $sym, $cmds) = @_;
-            $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
-         });
-      $::BIND_EDITOR->start;
-      $::BIND_EDITOR->show;
-#TODO: elmex, what was this supposed to do? it currently crashes the client.
-#   } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
-#      $::BIND_EDITOR->stop;
-#      $::BIND_EDITOR->ask_for_bind_and_commit;
-#      $::BIND_EDITOR->hide;
-   } elsif (!$::CONN) {
-      return 0; # bindings further down need a valid connection
-
-   } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
-      $::CONN->user_send ("stay fire");
-   } elsif ($uni == ord ",") {
-      $::CONN->user_send ("take");
-   } elsif ($uni == ord " ") {
-      $::CONN->user_send ("apply");
-   } elsif ($uni == 13) {
-      $::CONN->user_send ("examine");
-   } elsif ($uni == ord ".") {
-      $::CONN->user_send ($self->{completer}{last_command})
-         if exists $self->{completer}{last_command};
-   } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
-      $::CONN->user_send ($_) for @$bind_cmd;
-   } elsif (($sym == CFPlus::SDLK_KP_PLUS  && !$mod) || $uni == ord "+") {
-      $::CONN->user_send ("rotateshoottype +");
-   } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
-      $::CONN->user_send ("rotateshoottype -");
-   } elsif ($uni == ord '"') {
-      $self->{completer}->set_prefix ("$::CFG->{say_command} ");
-      $self->{completer}->show;
-   } elsif ($uni == ord "'") {
-      $self->{completer}->set_prefix ("");
-      $self->{completer}->show;
-   } elsif (exists $DIR{$sym}) {
-      if ($mod & CFPlus::KMOD_SHIFT) {
+   my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
+
+   if ($::CONN && $dir) {
+      if ($mod & DC::KMOD_SHIFT) {
          $self->{shft}++;
-         if ($DIR{$sym}[0] != $self->{fire_dir}) {
-            $::CONN->user_send ("fire $DIR{$sym}[0]");
+         if ($dir->[0] != $self->{fire_dir}) {
+            $::CONN->user_send ("fire $dir->[0]");
          }
-         $self->{fire_dir} = $DIR{$sym}[0];
-      } elsif ($mod & CFPlus::KMOD_CTRL) {
+         $self->{fire_dir} = $dir->[0];
+      } elsif ($mod & DC::KMOD_CTRL) {
          $self->{ctrl}++;
-         $::CONN->user_send ("run $DIR{$sym}[0]");
+         $::CONN->user_send ("run $dir->[0]");
       } else {
-         $::CONN->user_send ("$DIR{$sym}[1]");
+         $::CONN->user_send ("$dir->[1]");
       }
-   } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
-      $self->{completer}->inject_key_down ($ev);
-      $self->{completer}->show;
-   } else {
-      return 0;
+
+      return 1;
    }
 
-   1
+   0
 }
 
 sub invoke_key_up {
@@ -419,25 +353,31 @@
    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{$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) && delete $self->{shft}) { # XXX: is RSHIFT ok?
+      } 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};
          $res = 1;
       }
    }
 
-   if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
+   if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
       $::CONN->user_send ("run_stop");
       $res = 1;
    }
@@ -445,109 +385,210 @@
    $res
 }
 
+sub invoke_visibility_change {
+   my ($self) = @_;
+
+   $self->refresh_hook;
+
+   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) = @_;
 
-   $x -= $::MAP->ox + int 0.5 * $::MAP->w;
-   $y -= $::MAP->oy + int 0.5 * $::MAP->h;
+   $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
+   $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
 
    $self->{magicmap} = [$x, $y, $w, $h, $data];
 
    $self->update;
 }
 
-sub draw {
+sub movement_update {
    my ($self) = @_;
 
-   return unless $::MAP;
+   if ($::CFG->{smooth_movement}) {
+      if ($self->{sdx} || $self->{sdy}) {
+         my $diff = EV::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 $focused = $CFPlus::UI::FOCUS == $self
-                 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
+            my $dx = $self->{sdx} < 0 ? -$spd : $spd;
+            my $dy = $self->{sdy} < 0 ? -$spd : $spd;
 
-   return
-      unless $focused || !$::FAST;
+            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 }
+         }
 
-   if (delete $self->{need_update}) {
-      my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
+         $self->update;
+      }
+   } else {
+      $self->{sdx} = $self->{sdy} = 0;
+   }
 
-      my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
-      my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+   $self->{last_update} = EV::time;
+}
 
-      my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
-      my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
+sub refresh_hook {
+   my ($self) = @_;
 
-      my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
-      my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
-
-      if ($::CFG->{fow_enable}) {
-         my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
-
-         if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
-            glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
-            glConvolutionFilter2D (
-               GL_CONVOLUTION_2D,
-               GL_ALPHA,
-               3, 3,
-               GL_ALPHA, GL_FLOAT,
-               (pack "f*", @{ $self->{smooth_matrix} }),
-            );
-            glEnable GL_CONVOLUTION_2D;
+   if ($::MAP && $::CONN) {
+      if (delete $self->{need_update}) {
+         $self->movement_update;
+
+         my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
+
+         my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
+         my $sdy_t = DC::ceil $self->{sdy} / $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} = 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 DC::Texture
+               w              => $w,
+               h              => $h,
+               data           => $data,
+               internalformat => GL_ALPHA,
+               format         => GL_ALPHA;
+         } else {
+            delete $self->{fow_texture};
          }
 
-         $self->{fow_texture} = new CFPlus::Texture
-            w              => $w,
-            h              => $h,
-            data           => $data,
-            internalformat => GL_ALPHA,
-            format         => GL_ALPHA;
+         glNewList ($self->{list} ||= glGenList);
 
-         glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
-      } else {
-         delete $self->{fow_texture};
-      }
+         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}) x 2,
+                       $::CONN->{player}{tag},
+                       -$self->{sdx}, -$self->{sdy});
+
+         glScale $self->{tilesize}, $self->{tilesize};
+
+         if (my $tex = $self->{fow_texture}) {
+            my @prev_fow_params;
+
+            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)}
+                  );
+               }
+            }
 
-      glNewList $self->{list};
+            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;
+         }
 
-      glPushMatrix;
-      glTranslate $sx0, $sy0;
-      glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+         if ($self->{magicmap}) {
+            my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
 
-      $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
+            $x += $::MAP->ox + $self->{dx};
+            $y += $::MAP->oy + $self->{dy};
 
-      glScale 32, 32;
+            glTranslate - $x - 1, - $y - 1;
+            glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
+            $::MAP->draw_magicmap ($w, $h, $data);
+         }
 
-      if (my $tex = $self->{fow_texture}) {
-         glEnable GL_TEXTURE_2D;
-         glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+         glPopMatrix;
+         glEndList;
+      }
+   } else {
+      delete $self->{last_fow_texture};
+      delete $self->{fow_texture};
 
-         glColor +($::CFG->{fow_intensity}) x 3, 0.9;
-         $self->{fow_texture}->draw_quad_alpha (0, 0);
+      glDeleteList delete $self->{list}
+         if $self->{list};
+   }
+}
 
-         glDisable GL_TEXTURE_2D;
-      }
+sub draw {
+   my ($self) = @_;
 
-      if ($self->{magicmap}) {
-         my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
+   $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
 
-         $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
-         $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
+   return unless $self->{list};
 
-         glTranslate - $x - 1, - $y - 1;
-         glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
-         $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
-      }
+   my $focused = $DC::UI::FOCUS == $self
+                 || $DC::UI::FOCUS == $::COMPLETER->{entry};
 
-      glPopMatrix;
-      glEndList;
-   }
+   return
+      unless $focused || !$::FAST;
 
    glCallList $self->{list};
 
    # TNT2 emulates logops in software (or worse :)
    unless ($focused) {
-      glColor 0.4, 0.2, 0.2, 0.6;
+      glColor_premultiply 0, 0, 1, 0.25;
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
       glBegin GL_QUADS;
       glVertex 0, 0;
       glVertex 0, $::HEIGHT;
@@ -566,15 +607,63 @@
    $self->SUPER::DESTROY;
 }
 
-package CFPlus::MapWidget::MapMap;
+package DC::MapWidget::MapMap;
 
-our @ISA = CFPlus::UI::Base::;
+use common::sense;
 
-use Time::HiRes qw(time);
-use CFPlus::OpenGL;
+our @ISA = DC::UI::Base::;
+
+use DC::OpenGL;
 
 sub size_request {
-   ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
+   ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
+}
+
+sub refresh_hook {
+   my ($self) = @_;
+
+   if ($::MAP && $self->{texture_atime} < EV::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;
+
+      my $ox = 0.5 * ($w - $sw);
+      my $oy = 0.5 * ($h - $sh);
+
+      my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
+      my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
+
+      #TODO: map scale is completely borked
+
+      my $x0 = int $ox - $sx + 0.5;
+      my $y0 = int $oy - $sy + 0.5;
+
+      $self->{sw} = $sw;
+      $self->{sh} = $sh;
+
+      $self->{x0} = $x0;
+      $self->{y0} = $y0;
+
+      $self->{texture_atime} = EV::now + 1/2;
+
+      $self->{texture} =
+         new DC::Texture
+            w    => $w,
+            h    => $h,
+            data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
+            type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+   }
+}
+
+sub invoke_visibility_change {
+   my ($self) = @_;
+
+   $self->refresh_hook;
+
+   0
 }
 
 sub invoke_size_allocate {
@@ -595,64 +684,39 @@
 sub _draw {
    my ($self) = @_;
 
-   $::MAP or return;
+   $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
 
-   my ($w, $h) = @$self{qw(w h)};
-
-   my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
-   my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
-
-   my $sx = int $::CFG->{map_shift_x} / 32;
-   my $sy = int $::CFG->{map_shift_y} / 32;
-
-   my $ox = 0.5 * ($w - $sw);
-   my $oy = 0.5 * ($h - $sh);
+   $self->{texture} or return;
 
    glEnable GL_BLEND;
    glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-   if ($self->{texture_atime} < time) {
-      $self->{texture_atime} = time + 1/3;
-
-      $self->{texture} =
-         new CFPlus::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;
-   }
-
    $self->{texture}->draw_quad (0, 0);
 
    glDisable GL_TEXTURE_2D;
 
    glTranslate 0.375, 0.375;
 
-   #TODO: map scale is completely borked
-
-   my $x0 = int $ox - $sx + 0.5;
-   my $y0 = int $oy - $sy + 0.5;
-
    glColor 1, 1, 0, 1;
    glBegin GL_LINE_LOOP;
-   glVertex $x0      , $y0      ;
-   glVertex $x0      , $y0 + $sh;
-   glVertex $x0 + $sw, $y0 + $sh;
-   glVertex $x0 + $sw, $y0      ;
+   glVertex $self->{x0}              , $self->{y0}              ;
+   glVertex $self->{x0}              , $self->{y0} + $self->{sh};
+   glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
+   glVertex $self->{x0} + $self->{sw}, $self->{y0}              ;
    glEnd;
    
    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;
@@ -662,11 +726,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,
@@ -674,7 +739,7 @@
          ), (0.8) x 16
    ];
 
-   $self->{entry} = new CFPlus::UI::Entry
+   $self->{entry} = new DC::UI::Entry
       on_changed => sub {
          $self->update_labels;
          0
@@ -683,10 +748,10 @@
          my ($entry, $ev, $x, $y) = @_;
 
          if ($ev->{button} == 3) {
-            (new CFPlus::UI::Menu
+            (new DC::UI::Menu
                items => [
-                  ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
-                   => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
+                  ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
+                   => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
                ],
             )->popup ($ev);
             return 1;
@@ -711,7 +776,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]);
@@ -723,7 +788,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 {
@@ -799,15 +864,18 @@
    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 $regexp_abbrev = do {
             my ($beg, @chr) = split //, lc $cmd;
 
             # the following regex is used to match our "completion entry"
@@ -819,17 +887,53 @@
             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];
+            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 ($text =~ /^\Q$_\E(.*)/) {
+               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;
@@ -858,20 +962,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");
@@ -891,7 +995,7 @@
    my ($self) = @_;
 
    # hack
-   local $CFPlus::UI::FOCUS = $self->{entry};
+   local $DC::UI::FOCUS = $self->{entry};
 
    $self->SUPER::_draw;
 }