--- deliantra/server/lib/cf.pm	2006/03/17 03:22:00	1.9
+++ deliantra/server/lib/cf.pm	2006/07/19 22:19:19	1.23
@@ -3,6 +3,12 @@
 use Symbol;
 use List::Util;
 use Storable;
+use Opcode;
+use Safe;
+use Safe::Hole;
+
+use Event;
+$Event::Eval = 1; # no idea why this is required, but it is
 
 use strict;
 
@@ -63,29 +69,33 @@
 @cf::object::player::ISA = 'cf::object';
 @cf::object::map::ISA    = 'cf::object';
 
+$Event::DIED = sub {
+   warn "error in event callback: @_";
+};
+
 my %ext_pkg;
 my @exts;
 my @hook;
 my %command;
+my %extcmd;
 
 sub inject_event {
-   my ($data) = @_;
+   my $extension = shift;
+   my $event_code = shift;
 
-   my $cb = $hook[$data->{event_code}]{$data->{extension}}
+   my $cb = $hook[$event_code]{$extension}
       or return;
 
-   $cb->($data)
+   &$cb
 }
 
 sub inject_global_event {
-   my ($data) = @_;
+   my $event = shift;
 
-   my $cb = $hook[$data->{event_code}]
+   my $cb = $hook[$event]
       or return;
 
-   $_->($data) for values %$cb;
-
-   ()
+   List::Util::max map &$_, values %$cb
 }
 
 sub inject_command {
@@ -102,19 +112,27 @@
    my ($name, $time, $cb) = @_;
 
    my $caller = caller;
-
-   warn "registering command '$name/$time' to '$caller'";
+   #warn "registering command '$name/$time' to '$caller'";
 
    push @{ $command{$name} }, [$time, $cb, $caller];
    $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
 }
 
+sub register_extcmd {
+   my ($name, $cb) = @_;
+
+   my $caller = caller;
+   #warn "registering extcmd '$name' to '$caller'";
+
+   $extcmd{$name} = [$cb, $caller];
+}
+
 sub register {
    my ($base, $pkg) = @_;
 
    for my $idx (0 .. $#EVENT) {
       if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
-         warn "registering $EVENT[$idx] hook to '$pkg'\n";
+         #warn "registering $EVENT[$idx] hook to '$pkg'\n";
          $hook[$idx]{$base} = $ref;
       }
    }
@@ -147,7 +165,7 @@
    $ext_pkg{$base} = $pkg;
 
 #   no strict 'refs';
-#   @{"$pkg\::ISA"} = cf::ext::;
+#   @{"$pkg\::ISA"} = ext::;
 
    register $base, $pkg;
 }
@@ -157,6 +175,10 @@
 
    warn "removing extension $pkg\n";
 
+   if (my $cb = $pkg->can ("on_unload")) {
+      $cb->($pkg);
+   }
+
    # remove hooks
    for my $idx (0 .. $#EVENT) {
       delete $hook[$idx]{$pkg};
@@ -175,6 +197,11 @@
       }
    }
 
+   # remove extcmds
+   for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
+      delete $extcmd{$name};
+   }
+
    Symbol::delete_package $pkg;
 }
 
@@ -198,11 +225,13 @@
 
       warn "reloading...\n";
       eval {
+         $_->cancel for Event::all_watchers;
+
          unload_extension $_ for @exts;
          delete $INC{"cf.pm"};
 
          # don't, removes xs symbols, too
-         #Symbol::delete_package $pkg;
+         #Symbol::delete_package __PACKAGE__;
 
          require cf;
       };
@@ -217,10 +246,23 @@
 };
 
 #############################################################################
+# extcmd framework, basically convert ext <id> <pkg> arg1 args
+# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
+
+sub on_extcmd {
+   my ($pl, $buf) = @_;
+
+   my ($type) = $buf =~ s/^(\S+) // ? $1 : "";
+
+   $extcmd{$type}[0]->($pl, $buf)
+      if $extcmd{$type};
+}
+
+#############################################################################
 # load/save/clean perl data associated with a map
 
 *on_mapclean = sub {
-   my $map = shift->{map};
+   my ($map) = @_;
 
    my $path = $map->tmpname;
    defined $path or return;
@@ -230,7 +272,7 @@
 
 *on_mapin =
 *on_mapload = sub {
-   my $map = shift->{map};
+   my ($map) = @_;
 
    my $path = $map->tmpname;
    $path = $map->path unless defined $path;
@@ -247,7 +289,7 @@
 };
 
 *on_mapout = sub {
-   my $map = shift->{map};
+   my ($map) = @_;
 
    my $path = $map->tmpname;
    $path = $map->path unless defined $path;
@@ -277,47 +319,112 @@
 # load/save perl data associated with player->ob objects
 
 *on_player_load = sub {
-   my ($event) = @_;
-   my $path = $event->{message};
-   my $ob = $event->{who};
+   my ($ob, $path) = @_;
 
-   open my $fh, "<:raw", "$path.cfperl"
-      or return; # no perl data
+   if (open my $fh, "<:raw", "$path.cfperl") {
 
-   my $data = Storable::thaw do { local $/; <$fh> };
+      #d##TODO#remove
 
-   $data->{version} <= 1
-      or return; # too new
+      my $data = Storable::thaw do { local $/; <$fh> };
+
+      $data->{version} <= 1
+         or return; # too new
+
+      %$ob = %{$data->{ob}};
+      return;
+   }
+
+   for my $o ($ob, $ob->inv) {
+      if (my $value = $o->get_ob_key_value ("_perl_data")) {
+         $o->set_ob_key_value ("_perl_data");
 
-   %$ob = %{$data->{ob}};
+         %$o = %{ Storable::thaw pack "H*", $value };
+      }
+   }
 };
 
 *on_player_save = sub {
-   my ($event) = @_;
-   my $path = $event->{message};
-   my $ob = $event->{who};
+   my ($ob, $path) = @_;
 
-   if (keys %$ob) {
-      open my $fh, ">:raw", "$path.cfperl"
-         or die "$path.cfperl: $!";
+   $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
+      for grep %$_, $ob, $ob->inv;
 
-      stat $path;
+   unlink "$path.cfperl";#d##TODO#remove
+};
 
-      print $fh Storable::nfreeze {
-         size    => (stat _)[7],
-         time    => (stat _)[9],
-         version => 1,
-         ob      => $ob,
-      };
+#############################################################################
+# core extensions - in perl
 
-      chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
-   } else {
-      unlink "$path.cfperl";
-   }
-};
+=item cf::player::exists $login
+
+Returns true when the given account exists.
+
+=cut
+
+sub cf::player::exists($) {
+   cf::player::find $_[0]
+      or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
+}
+
+# rough implementation of a future "reply" method that works
+# with dialog boxes.
+sub cf::object::player::reply($$$;$) {
+   my ($self, $npc, $msg, $flags) = @_;
+
+   $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
+
+   $msg = $npc->name . " says: $msg" if $npc;
+
+   $self->message ($msg, $flags);
+}
+
+#############################################################################
+# map scripting support
+
+our $safe = new Safe "ext";
+our $safe_hole = new Safe::Hole;
+
+$SIG{FPE} = 'IGNORE';
+
+$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
+
+# here we would export the classes and methods available to script code
+#@ext::cf::object::player::ISA = @cf::object::player::ISA;
+#@ext::cf::object::map::ISA    = @cf::object::map::ISA;
+
+sub safe_eval($;@) {
+   my ($code, %vars) = @_;
+
+   my $qcode = $code;
+   $qcode =~ s/"/‟/g; # not allowed in #line filenames
+   $qcode =~ s/\n/\\n/g;
+
+   local $_;
+   local @ext::cf::_safe_eval_args = values %vars;
+
+   $safe->reval (
+      "do {\n"
+      . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
+      . "#line 0 \"{$qcode}\"\n"
+      . $code
+      . "\n}"
+   )
+}
+
+sub register_script_function {
+   my ($fun, $cb) = @_;
+
+   no strict 'refs';
+   *{"ext::$fun"} = $safe_hole->wrap ($cb);
+}
+
+#############################################################################
+# initialisation
 
 register "<global>", __PACKAGE__;
 
+unshift @INC, maps_directory "perl";
+
 load_extensions;
 
 1