--- deliantra/server/lib/cf.pm	2006/03/07 01:37:06	1.6
+++ deliantra/server/lib/cf.pm	2006/07/19 08:50:42	1.22
@@ -4,6 +4,9 @@
 use List::Util;
 use Storable;
 
+use Event;
+$Event::Eval = 1; # no idea why this is required, but it is
+
 use strict;
 
 our %COMMAND;
@@ -24,6 +27,8 @@
    };
 }
 
+my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply!
+
 # generate property mutators
 sub prop_gen {
    my ($prefix, $class) = @_;
@@ -43,7 +48,7 @@
 
       *{"$class\::set_$sub"} = sub {
          $_[0]->set_property ($type, $idx, $_[1]);
-      };
+      } unless $ignore_set{$prop};
    }
 }
 
@@ -61,29 +66,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 {
@@ -100,19 +109,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;
       }
    }
@@ -155,6 +172,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};
@@ -173,6 +194,11 @@
       }
    }
 
+   # remove extcmds
+   for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) {
+      delete $extcmd{$name};
+   }
+
    Symbol::delete_package $pkg;
 }
 
@@ -196,11 +222,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;
       };
@@ -214,9 +242,34 @@
    }
 };
 
+#############################################################################
+# 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) = @_;
+
+   my $path = $map->tmpname;
+   defined $path or return;
+
+   unlink "$path.cfperl";
+};
+
 *on_mapin =
 *on_mapload = sub {
-   my $map = shift->{map};
+   my ($map) = @_;
 
    my $path = $map->tmpname;
    $path = $map->path unless defined $path;
@@ -233,7 +286,7 @@
 };
 
 *on_mapout = sub {
-   my $map = shift->{map};
+   my ($map) = @_;
 
    my $path = $map->tmpname;
    $path = $map->path unless defined $path;
@@ -244,17 +297,78 @@
       open my $fh, ">:raw", "$path.cfperl"
          or die "$path.cfperl: $!";
 
+      stat $path;
+
       print $fh Storable::nfreeze {
+         size    => (stat _)[7],
+         time    => (stat _)[9],
          version => 1,
-         obs => $obs,
+         obs     => $obs,
       };
+
+      chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
    } else {
       unlink "$path.cfperl";
    }
 };
 
+#############################################################################
+# load/save perl data associated with player->ob objects
+
+*on_player_load = sub {
+   my ($ob, $path) = @_;
+
+   if (open my $fh, "<:raw", "$path.cfperl") {
+
+      #d##TODO#remove
+
+      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");
+
+         %$o = %{ Storable::thaw pack "H*", $value };
+      }
+   }
+};
+
+*on_player_save = sub {
+   my ($ob, $path) = @_;
+
+   $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
+      for grep %$_, $ob, $ob->inv;
+
+   unlink "$path.cfperl";#d##TODO#remove
+};
+
+#############################################################################
+# core extensions - in perl
+
+# rough implementation of a future "reply" method that works
+# with dialog boxes.
+sub cf::object::player::reply($$;$) {
+   my ($self, $msg, $flags) = @_;
+
+   $flags = cf::NDI_WHITE unless @_ >= 3;
+
+   $self->message ($msg, $flags);
+}
+
+#############################################################################
+# initialisation
+
 register "<global>", __PACKAGE__;
 
+unshift @INC, maps_directory "perl";
+
 load_extensions;
 
 1