--- deliantra/Deliantra-Client/DC/MapWidget.pm	2008/04/17 20:13:17	1.128
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2008/07/19 20:33:47	1.133
@@ -29,12 +29,6 @@
    $self
 }
 
-sub set_tilesize {
-   my ($self, $tilesize) = @_;
-
-   $self->{tilesize} = $tilesize;
-}
-
 sub add_command {
    my ($self, $command, $tooltip, $widget, $cb) = @_;
 
@@ -208,7 +202,7 @@
             ["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 }],
+#            ["Server Messages…",  sub { $::MESSAGE_WINDOW->toggle_visibility }],
             [
                $::PICKUP_ENABLE->{state}
                   ? "Disable automatic pickup"
@@ -322,6 +316,11 @@
 
    $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | 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 ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
       if ($mod & DC::KMOD_SHIFT) {
          $self->{shft}++;
@@ -349,6 +348,9 @@
    my $mod = $ev->{mod};
    my $sym = $ev->{sym};
 
+   delete $self->{last_mod};
+   delete $self->{last_sym};
+
    if ($::CFG->{shift_fire_stop}) {
       if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
          $::CONN->user_send ("fire_stop");
@@ -384,6 +386,23 @@
    0
 }
 
+sub set_tilesize {
+   my ($self, $tilesize) = @_;
+
+   $self->{tilesize} = $tilesize;
+}
+
+sub scroll {
+   my ($self, $dx, $dy) = @_;
+
+   $::MAP->scroll ($dx, $dy);
+
+   $self->movement_update;
+
+   $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
+   $self->{sdy} += $dy * $self->{tilesize};
+}
+
 sub set_magicmap {
    my ($self, $w, $h, $x, $y, $data) = @_;
 
@@ -395,19 +414,63 @@
    $self->update;
 }
 
+sub movement_update {
+   my ($self) = @_;
+
+   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);
+
+         # jump if "impossibly high" speed
+         if (
+            (max abs $self->{sdx}, abs $self->{sdy})
+            > $spd * $self->{tilesize} * $mintime * 1.1
+         ) {
+            #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
+            $self->{sdx} = $self->{sdy} = 0;
+         } else {
+            my $upd = 0;
+
+            $spd *= $self->{tilesize} * $diff * 1.0001;
+
+            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; $upd = 1 }
+            if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy; $upd = 1 }
+
+            $self->update if $upd;
+         }
+      }
+   } else {
+      $self->{sdx} = $self->{sdy} = 0;
+   }
+
+   $self->{last_update} = EV::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;
 
+         # width/height of map, in tiles
          my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
          my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
 
-         my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;
-         my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;
+         # the map displacement, in tiles
+         my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize};
+         my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize};
 
+         # 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;
 
@@ -430,10 +493,13 @@
          glNewList ($self->{list} ||= glGenList);
 
          glPushMatrix;
-         glTranslate $sx0, $sy0;
+         glTranslate $sx0 + $self->{sdx}, $sy0 + $self->{sdy};
          glScale $::CFG->{map_scale}, $::CFG->{map_scale};
 
-         $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
+         $::MAP->draw ($dx, $dy, $sw, $sh,
+                       $self->{tilesize},
+                       $::CONN->{player}{tag},
+                       -$self->{sdx}, -$self->{sdy});
 
          glScale $self->{tilesize}, $self->{tilesize};