--- deliantra/server/ext/item-worldmap.ext	2007/07/23 16:53:15	1.6
+++ deliantra/server/ext/item-worldmap.ext	2010/05/14 22:56:47	1.21
@@ -2,31 +2,57 @@
 
 # this module implements a rather fancy worldmap
 
-our $WORLDMAP_UPDATE_INTERVAL = $cf::CFG{worldmap_update_interval} || 10;
+our $WORLDMAP_UPDATE_INTERVAL = $cf::CFG{worldmap_update_interval} || 2;
 
 our $GENCOUNT = 0;
 our %PLAYERINFO;
 
+our ($MAPW, $MAPH) = (1024, 1024); # it's useful to know the map width/height in pixels
+
 sub update_worldmap {
    my ($ws) = @_;
 
-   my $labels = delete $ws->{labels};
+   return if $GENCOUNT == $ws->{gencount};
+   $ws->{gencount} = $GENCOUNT;
+
+   my $old = delete $ws->{labels};
+   my $new;
+
+   my $name = $ws->{ns}->pl->ob->name;
 
    while (my ($k, $v) = each %PLAYERINFO) {
-      if (my $old = $labels->{$k}) {
-         $ws->{labels}{$k} = $old;
-      } else {
-         $ws->{labels}{$k} = $ws->new (Label =>
+      my $label = (delete $old->{$k}) || do {
+         my $label = $ws->new (Label =>
             text     => $k,
             fontsize => 0.2,
-            c_rel    => 1,
+         );
+
+         my $marker = $ws->new (Face =>
+            face => $ws->{ns}->need_face ("res/map-arrow"),
+         );
+         my $children = [$label, $marker];
+
+         $ws->{canvas}->add (my $vbox = $ws->new (VBox =>
+            children => $children,
             c_halign => -.5,
             c_valign => -1,
-         );
-         $ws->{canvas}->add ($ws->{labels}{$k});
+         ));
+         $vbox->{children} = $children;
+
+         $vbox
+      };
+
+      $new->{$k} = $label;
+
+      if ($v != $label->{prevpos}) {
+         $label->set (c_x => $v->[0], c_y => $v->[1]);
+         $label->{prevpos} = $v;
+         $ws->{window}->make_visible ($v->[0], $v->[1], .2)
+            if $k eq $name;
       }
-      $ws->{labels}{$k}->set (c_x => $v->[0], c_y => $v->[1]);
    }
+
+   $ws->{labels} = $new;
 }
 
 sub create_widgets {
@@ -49,18 +75,13 @@
       },
    );
 
-   my $face = cf::face::find "res/worldmap.jpg";
-   $ns->send_face ($face);
-   $ns->flush_fx;
-
-   $w->add (my $sw = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
+   $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
    $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1));
 
    $ws->{mapface} = $ws->new (Face =>
-      expand => 1,
       size_w => undef,
       size_h => undef,
-      face   => $face,
+      face   => $ws->{ns}->need_face ("res/worldmap"),
    );
 
    $ws->{canvas}->add ($ws->{mapface});
@@ -78,62 +99,65 @@
          my $ws = $ns->{ws_worldmap} ||= create_widgets $ns;
          $ws->{toplevel}->toggle_visibility;
       } else {
-         $ns->send_msg ("log", "Your client doesn't support the (required) widget extension. Try CFPlus at http://crossfire.schmorp.de/.", cf::NDI_RED);
+         $ns->send_msg ("log", "Your client doesn't support the (required) widget extension. Try the deliantra client at http://www.deliantra.net/.", cf::NDI_RED);
       }
 
       cf::override 1;
    },
 ;
 
-cf::async_ext {
-   my $schedule_interval = Coro::Event->timer (after => 1);
-
-   while () {
-      $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL);
-      $schedule_interval->next;
-
-      cf::get_slot 0.05;
-
-      ++$GENCOUNT;
-
-      # recalculate player info
-      my %new;
-      for (values %cf::PLAYER) {
-         my $map = $_->ob->map
-            or next;
-         $map =~ /^\/world\/world_(\d\d\d)_(\d\d\d)/
-            or next;
-
-         my $ob = $_->ob;
-         my $x = ($1 - 100) * 50 + $ob->x;
-         my $y = ($2 - 100) * 50 + $ob->y;
-
-         0 <= $x && 0 <= $y && $x < 1500 && $y < 1500
-            or next;
-
-         # rounding saves network bandwidth...
-         $x = sprintf "%.3f", $x / 1500;
-         $y = sprintf "%.3f", $y / 1500;
-
-         my $name = $ob->name;
-
-         if (my $pi = delete $PLAYERINFO{$name}) {
-            if ($pi->[0] == $x && $pi->[1] == $y) {
-               $new{$name} = $pi;
-               next;
+cf::post_init {
+   our $UPDATER = cf::async_ext {
+      $Coro::current->{desc} = "worldmap updater";
+
+      while () {
+         Coro::EV::timer_once $WORLDMAP_UPDATE_INTERVAL;
+
+         cf::get_slot 0.01, -50, "worldmap update";
+
+         ++$GENCOUNT;
+
+         # recalculate player info
+         my %new;
+         for (values %cf::PLAYER) {
+            my $map = $_->ob->map
+               or next;
+            $map =~ /^\/world\/world_(\d\d\d)_(\d\d\d)/
+               or next;
+
+            my $ob = $_->ob;
+            my $x = ($1 - 100) * 50 + $ob->x;
+            my $y = ($2 - 100) * 50 + $ob->y;
+
+            0 <= $x && 0 <= $y && $x < 1500 && $y < 1500
+               or next;
+
+            $x = int $x * $MAPW / 1500;
+            $y = int $y * $MAPH / 1500;
+
+            my $name = $ob->name;
+
+            if (my $pi = delete $PLAYERINFO{$name}) {
+               if ($pi->[0] == $x && $pi->[1] == $y) {
+                  $new{$name} = $pi;
+                  next;
+               }
             }
+                  
+            $new{$name} = [$x, $y];
          }
-               
-         $new{$name} = [$x, $y];
-      }
 
-      for (values %cf::PLAYER) {
-         my $ns = $_->ns
-            or next;
+         *PLAYERINFO = \%new;
+
+         cf::get_slot 0.03, -50, "worldmap socket update";
+         for (values %cf::PLAYER) {
+            my $ns = $_->ns
+               or next;
 
-         update_worldmap $ns->{ws_worldmap}
-            if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility};
+            update_worldmap $ns->{ws_worldmap}
+               if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility};
+         }
       }
-   }
+   };
 };