--- deliantra/server/lib/cf.pm	2007/06/30 03:00:54	1.289
+++ deliantra/server/lib/cf.pm	2007/07/10 16:23:59	1.302
@@ -31,6 +31,7 @@
 use IO::AIO 2.32 ();
 use Time::HiRes;
 use Compress::LZF;
+use Digest::MD5 ();
 
 # configure various modules to our taste
 #
@@ -250,7 +251,7 @@
 
 =cut
 
-our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max
+our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
 
 sub to_json   ($) { $json_coder->encode ($_[0]) }
 sub from_json ($) { $json_coder->decode ($_[0]) }
@@ -411,6 +412,15 @@
 
 =cut
 
+sub _store_scalar {
+   open my $fh, ">", \my $buf
+         or die "fork_call: cannot open fh-to-buf in child : $!";
+      Storable::store_fd $_[0], $fh;
+   close $fh;
+
+   $buf
+}
+
 sub fork_call(&@) {
    my ($cb, @args) = @_;
 
@@ -423,22 +433,31 @@
       close $fh2;
 
       my $res = (Coro::Handle::unblock $fh1)->readline (undef);
+      warn "pst<$res>" unless $res =~ /^pst/;
       $res = Coro::Storable::thaw $res;
 
       waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
 
-      die $$res unless "ARRAY" eq ref $res;
+      Carp::confess $$res unless "ARRAY" eq ref $res;
 
       return wantarray ? @$res : $res->[-1];
    } else {
       reset_signals;
       local $SIG{__WARN__};
       local $SIG{__DIE__};
+      # just in case, this hack effectively disables event
+      # in the child. cleaner and slower would be canceling all watchers,
+      # but this works for the time being.
+      local $Coro::idle;
+      $Coro::current->prio (Coro::PRIO_MAX);
+
       eval {
          close $fh1;
 
          my @res = eval { $cb->(@args) };
-         syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
+
+         syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
+         close $fh2;
       };
 
       warn $@ if $@;
@@ -1088,7 +1107,7 @@
    on_extcmd => sub {
       my ($pl, $buf) = @_;
 
-      my $msg = eval { from_json $buf };
+      my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
 
       if (ref $msg) {
          if (my $cb = $EXTCMD{$msg->{msgtype}}) {
@@ -1402,14 +1421,31 @@
          $self->gender ? $2 : $1
       }ge
       # replace H<hint text>
-      || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
+      || s{H<([^\>]*)>}
+          {
+             ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
+              "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
+              "")
+                [$self->{hintmode}]
+          }ge;
 
    # create single paragraphs (very hackish)
    s/(?<=\S)\n(?=\w)/ /g;
 
+   # compress some whitespace
+   s/\s+\n/\n/g; # ws line-ends
+   s/\n\n+/\n/g; # double lines
+   s/^\n+//;     # beginning lines
+   s/\n+$//;     # ending lines
+
    $_
 }
 
+sub hintmode {
+   $_[0]{hintmode} = $_[1] if @_ > 1;
+   $_[0]{hintmode}
+}
+
 =item $player->ext_reply ($msgid, %msg)
 
 Sends an ext reply to the player.
@@ -1420,7 +1456,7 @@
    my ($self, $id, %msg) = @_;
 
    $msg{msgid} = $id;
-   $self->send ("ext " . cf::to_json \%msg);
+   $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
 }
 
 =item $player->ext_event ($type, %msg)
@@ -2342,6 +2378,10 @@
 
    $self->enter_link;
 
+   # if exit is damned, update players death & WoR home-position
+   $self->contr->savebed ($slaying, $hp, $sp)
+      if $exit->flag (FLAG_DAMNED);
+
    (async {
       $self->deactivate_recursive; # just to be sure
       unless (eval {
@@ -2392,8 +2432,10 @@
 
    $msg = $self->pl->expand_cfpod ($msg);
 
+   return unless @extra || length $msg;
+
    if ($self->can_msg) {
-      $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
+      $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
    } else {
       # replace some tags by gcfclient-compatible ones
       for ($msg) {
@@ -2426,7 +2468,7 @@
    my ($self, $type, %msg) = @_;
 
    $msg{msgtype} = "event_$type";
-   $self->send_packet ("ext " . cf::to_json \%msg);
+   $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
 }
 
 =item $success = $client->query ($flags, "text", \&cb)
@@ -2459,6 +2501,11 @@
 }
 
 cf::client->attach (
+   on_connect => sub {
+      my ($ns) = @_;
+
+      $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
+   },
    on_reply => sub {
       my ($ns, $msg) = @_;
 
@@ -2483,13 +2530,13 @@
    on_exticmd => sub {
       my ($ns, $buf) = @_;
 
-      my $msg = eval { from_json $buf };
+      my $msg = eval { $ns->{json_coder}->decode ($buf) };
 
       if (ref $msg) {
          if (my $cb = $EXTICMD{$msg->{msgtype}}) {
             if (my %reply = $cb->($ns, $msg)) {
                $reply{msgid} = $msg->{msgid};
-               $ns->send ("ext " . cf::to_json \%reply);
+               $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
             }
          }
       } else {
@@ -2556,15 +2603,24 @@
 
 The following functions and methods are available within a safe environment:
 
-  cf::object contr pay_amount pay_player map
-  cf::object::player player
-  cf::player peaceful
-  cf::map trigger
+  cf::object
+     contr pay_amount pay_player map x y force_find force_add
+     insert remove
+
+  cf::object::player
+     player
+
+  cf::player
+     peaceful
+
+  cf::map
+     trigger
 
 =cut
 
 for (
-   ["cf::object"         => qw(contr pay_amount pay_player map)],
+   ["cf::object"         => qw(contr pay_amount pay_player map force_find force_add x y
+                               insert remove)],
    ["cf::object::player" => qw(player)],
    ["cf::player"         => qw(peaceful)],
    ["cf::map"            => qw(trigger)],
@@ -2666,10 +2722,12 @@
 
       while (my ($face, $info) = each %$faces) {
          my $idx = (cf::face::find $face) || cf::face::alloc $face;
-         cf::face::set $idx, $info->{visibility}, $info->{magicmap};
+         cf::face::set_visibility $idx, $info->{visibility};
+         cf::face::set_magicmap   $idx, $info->{magicmap};
          cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
          cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
-         Coro::cede;
+
+         cf::cede_to_tick;
       }
 
       while (my ($face, $info) = each %$faces) {
@@ -2677,11 +2735,13 @@
          my $idx = cf::face::find $face
             or next;
          if (my $smooth = cf::face::find $info->{smooth}) {
-            cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
+            cf::face::set_smooth      $idx, $smooth;
+            cf::face::set_smoothlevel $idx, $info->{smoothlevel};
          } else {
             warn "smooth face '$info->{smooth}' not found for face '$face'";
          }
-         Coro::cede;
+
+         cf::cede_to_tick;
       }
    }
 
@@ -2690,12 +2750,38 @@
 
       while (my ($anim, $info) = each %$anims) {
          cf::anim::set $anim, $info->{frames}, $info->{facings};
-         Coro::cede;
+         cf::cede_to_tick;
       }
 
       cf::anim::invalidate_all; # d'oh
    }
 
+   {
+      # TODO: for gcfclient pleasure, we should give resources
+      # that gcfclient doesn't grok a >10000 face index.
+      my $res = $facedata->{resource};
+      my $enc = JSON::XS->new->utf8->canonical;
+
+      while (my ($name, $info) = each %$res) {
+         my $meta = $enc->encode ({
+            name      => $name,
+            type      => $info->{type},
+            copyright => $info->{copyright},
+         });
+         my $data = pack "(w/a*)*", $meta, $info->{data};
+         my $chk  = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
+
+         use Data::Dumper; warn Dumper substr $data, 0, 100;#d#
+
+         my $idx = (cf::face::find $name) || cf::face::alloc $name;
+         cf::face::set_type $idx, 1;
+         cf::face::set_data $idx, 0, $data, $chk;
+
+         # TODO
+         cf::cede_to_tick;
+      }
+   }
+
    1
 }