--- deliantra/server/ext/item-worldmap.ext	2007/07/22 17:10:06	1.4
+++ deliantra/server/ext/item-worldmap.ext	2007/07/23 16:53:15	1.6
@@ -1,26 +1,40 @@
-#! perl # depends=widget
+#! perl # depends=widget mandatory
 
 # this module implements a rather fancy worldmap
 
-our $WORLDMAP_UPDATE_INTERVAL = $cfg::CFG{worldmap_update_interval} || 10;
+our $WORLDMAP_UPDATE_INTERVAL = $cf::CFG{worldmap_update_interval} || 10;
 
-cf::async_ext {
-   my $schedule_interval = Coro::Event->timer (after => 1);
+our $GENCOUNT = 0;
+our %PLAYERINFO;
 
-   while () {
-      $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL);
-      $schedule_interval->next;
+sub update_worldmap {
+   my ($ws) = @_;
+
+   my $labels = delete $ws->{labels};
+
+   while (my ($k, $v) = each %PLAYERINFO) {
+      if (my $old = $labels->{$k}) {
+         $ws->{labels}{$k} = $old;
+      } else {
+         $ws->{labels}{$k} = $ws->new (Label =>
+            text     => $k,
+            fontsize => 0.2,
+            c_rel    => 1,
+            c_halign => -.5,
+            c_valign => -1,
+         );
+         $ws->{canvas}->add ($ws->{labels}{$k});
+      }
+      $ws->{labels}{$k}->set (c_x => $v->[0], c_y => $v->[1]);
    }
-};
+}
 
 sub create_widgets {
    my ($ns) = @_;
 
-   my $info = { };
-
-   $info->{ws} = my $ws = $ns->new_widgetset;
+   my $ws = $ns->new_widgetset;
 
-   $info->{toplevel} = my $w = $ws->new (Toplevel =>
+   $ws->{toplevel} = my $w = $ws->new (Toplevel =>
       title   => "Worldmap",
       name    => "server_item_worldmap",
       force_w => 400,
@@ -29,6 +43,10 @@
       y       => "center",
       has_close_button => 1,
       on_delete => sub { shift->hide },
+      on_visibility_change => sub {
+         $_[0]{visibility} = $_[1];
+         update_worldmap $_[0]{ws} if $_[1];
+      },
    );
 
    my $face = cf::face::find "res/worldmap.jpg";
@@ -36,17 +54,18 @@
    $ns->flush_fx;
 
    $w->add (my $sw = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1));
-   $sw->add (my $canvas = $ws->new (Canvas => expand => 1));
-   $canvas->add_fixed ($ws->new (Face => expand => 1, size_w => undef, size_h => undef, face => $face), abs => 0, 0, rel => 1, 1);
-   $canvas->add_fixed ($ws->new (Label => text => "lb1"), abs => 10, 10, rel => 1, 1);
+   $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1));
 
-   $info
-}
+   $ws->{mapface} = $ws->new (Face =>
+      expand => 1,
+      size_w => undef,
+      size_h => undef,
+      face   => $face,
+   );
 
-sub update_worldmap {
-   my ($ns) = @_;
+   $ws->{canvas}->add ($ws->{mapface});
 
-   my $ws = $ns->{ws_worldmap} or return;
+   $ws
 }
 
 cf::object::attachment item_worldmap =>
@@ -58,9 +77,6 @@
       if ($ns->{can_widget}) {
          my $ws = $ns->{ws_worldmap} ||= create_widgets $ns;
          $ws->{toplevel}->toggle_visibility;
-         $ws->{toplevel}->get (visible => sub {
-            update_worldmap $ns;
-         });
       } else {
          $ns->send_msg ("log", "Your client doesn't support the (required) widget extension. Try CFPlus at http://crossfire.schmorp.de/.", cf::NDI_RED);
       }
@@ -69,3 +85,55 @@
    },
 ;
 
+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;
+            }
+         }
+               
+         $new{$name} = [$x, $y];
+      }
+
+      for (values %cf::PLAYER) {
+         my $ns = $_->ns
+            or next;
+
+         update_worldmap $ns->{ws_worldmap}
+            if $ns->{ws_worldmap} && $ns->{ws_worldmap}{toplevel}{visibility};
+      }
+   }
+};
+