--- deliantra/server/lib/cf.pm	2006/08/26 23:36:32	1.45
+++ deliantra/server/lib/cf.pm	2006/09/08 17:41:41	1.63
@@ -13,10 +13,10 @@
 
 use strict;
 
+_init_vars;
+
 our %COMMAND = ();
 our @EVENT;
-our %PROP_TYPE;
-our %PROP_IDX;
 our $LIBDIR = maps_directory "perl";
 
 our $TICK = MAX_TIME * 1e-6;
@@ -34,45 +34,11 @@
    };
 }
 
-my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply!
-
-# generate property mutators
-sub prop_gen {
-   my ($prefix, $class) = @_;
-
-   no strict 'refs';
-
-   for my $prop (keys %PROP_TYPE) {
-      $prop =~ /^\Q$prefix\E_(.*$)/ or next;
-      my $sub = lc $1;
-
-      my $type = $PROP_TYPE{$prop};
-      my $idx  = $PROP_IDX {$prop};
-
-      *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
-         $_[0]->get_property ($type, $idx)
-      };
-
-      *{"$class\::set_$sub"} = sub {
-         $_[0]->set_property ($type, $idx, $_[1]);
-      } unless $ignore_set{$prop};
-   }
-}
-
-# auto-generate most of the API
-
-prop_gen OBJECT_PROP => "cf::object";
-# CFAPI_OBJECT_ANIMATION?
-prop_gen PLAYER_PROP => "cf::object::player";
-
-prop_gen MAP_PROP    => "cf::map";
-prop_gen ARCH_PROP   => "cf::arch";
-
 @safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
 
 # we bless all objects into (empty) derived classes to force a method lookup
 # within the Safe compartment.
-for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
+for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) {
    no strict 'refs';
    @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
 }
@@ -105,23 +71,105 @@
 #############################################################################
 # "new" plug-in system
 
-=item cf::object::attach ... # NYI
+=head3 EVENTS AND OBJECT ATTACHMENTS
+
+=over 4
+
+=item $object->attach ($attachment, key => $value...)
+
+=item $object->detach ($attachment)
+
+Attach/detach a pre-registered attachment to an object.
+
+=item $player->attach ($attachment, key => $value...)
+
+=item $player->detach ($attachment)
+
+Attach/detach a pre-registered attachment to a player.
+
+=item $map->attach ($attachment, key => $value...)
+
+=item $map->detach ($attachment)
+
+Attach/detach a pre-registered attachment to a map.
+
+=item $bool = $object->attached ($name)
+
+=item $bool = $player->attached ($name)
+
+=item $bool = $map->attached ($name)
+
+Checks wether the named attachment is currently attached to the object.
 
 =item cf::attach_global ...
 
-=item cf::attach_to_type $object_type, ...
+Attach handlers for global events.
+
+This and all following C<attach_*>-functions expect any number of the
+following handler/hook descriptions:
+
+=over 4
+
+=item prio => $number
+
+Set the priority for all following handlers/hooks (unless overwritten
+by another C<prio> setting). Lower priority handlers get executed
+earlier. The default priority is C<0>, and many built-in handlers are
+registered at priority C<-1000>, so lower priorities should not be used
+unless you know what you are doing.
+
+=item on_I<event> => \&cb
+
+Call the given code reference whenever the named event happens (event is
+something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
+handlers are recognised generally depends on the type of object these
+handlers attach to).
+
+See F<include/eventinc.h> for the full list of events supported, and their
+class.
+
+=item package => package::
+
+Look for sub functions of the name C<< on_I<event> >> in the given
+package and register them.  Only handlers for eevents supported by the
+object/class are recognised.
+
+=back
+
+=item cf::attach_to_type $object_type, $subtype, ...
+
+Attach handlers for a specific object type (e.g. TRANSPORT) and
+subtype. If C<$subtype> is zero or undef, matches all objects of the given
+type.
 
 =item cf::attach_to_objects ...
 
+Attach handlers to all objects. Do not use this except for debugging or
+very rare events, as handlers are (obviously) called for I<all> objects in
+the game.
+
 =item cf::attach_to_players ...
 
+Attach handlers to all players.
+
 =item cf::attach_to_maps ...
 
+Attach handlers to all maps.
+
 =item cf:register_attachment $name, ...
 
-   prio    => $number, # lower is earlier
-   on_xxx  => \&cb,
-   package => package::,
+Register an attachment by name through which objects can refer to this
+attachment.
+
+=item cf:register_player_attachment $name, ...
+
+Register an attachment by name through which players can refer to this
+attachment.
+
+=item cf:register_map_attachment $name, ...
+
+Register an attachment by name through which maps can refer to this
+attachment.
 
 =cut
 
@@ -193,18 +241,67 @@
    \%undo
 }
 
-sub cf::object::attach {
-   die;
+sub _attach_attachment {
+   my ($obj, $name, %arg) = @_;
+
+   return if exists $obj->{_attachment}{$name};
+
+   my $res;
+
+   if (my $attach = $attachment{$name}) {
+      my $registry = $obj->registry;
+
+      for (@$attach) {
+         my ($klass, @attach) = @$_;
+         $res = _attach @$registry, $klass, @attach;
+      }
+
+      $obj->{$name} = \%arg;
+   } else {
+      warn "object uses attachment '$name' that is not available, postponing.\n";
+   }
+
+   $obj->{_attachment}{$name} = undef;
+
+   $res->{attachment} = $name;
+   $res
 }
 
+*cf::object::attach =
+*cf::player::attach =
+*cf::map::attach = sub {
+   my ($obj, $name, %arg) = @_;
+
+   _attach_attachment $obj, $name, %arg;
+};
+
+# all those should be optimised
+*cf::object::detach =
+*cf::player::detach =
+*cf::map::detach = sub {
+   my ($obj, $name) = @_;
+
+   delete $obj->{_attachment}{$name};
+   reattach ($obj);
+};
+
+*cf::object::attached =
+*cf::player::attached =
+*cf::map::attached = sub {
+   my ($obj, $name) = @_;
+
+   exists $obj->{_attachment}{$name}
+};
+
 sub attach_global {
    _attach @CB_GLOBAL, KLASS_GLOBAL, @_
 }
 
 sub attach_to_type {
    my $type = shift;
+   my $subtype = shift;
 
-   _attach @{$CB_TYPE[$type]}, KLASS_OBJECT, @_
+   _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
 }
 
 sub attach_to_objects {
@@ -222,7 +319,19 @@
 sub register_attachment {
    my $name = shift;
 
-   $attachment{$name} = [@_];
+   $attachment{$name} = [[KLASS_OBJECT, @_]];
+}
+
+sub register_player_attachment {
+   my $name = shift;
+
+   $attachment{$name} = [[KLASS_PLAYER, @_]];
+}
+
+sub register_map_attachment {
+   my $name = shift;
+
+   $attachment{$name} = [[KLASS_MAP, @_]];
 }
 
 our $override;
@@ -256,44 +365,130 @@
    0
 }
 
+=item $bool = cf::invoke EVENT_GLOBAL_XXX, ...
+
+=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
+
+=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
+
+=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
+
+Generate a global/object/player/map-specific event with the given arguments.
+
+This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
+removed in future versions), and there is no public API to access override
+results (if you must, access C<@cf::invoke_results> directly).
+
+=back
+
+=head2 methods valid for all pointers
+
+=over 4
+
+=item $object->valid
+
+=item $player->valid
+
+=item $map->valid
+
+Just because you have a perl object does not mean that the corresponding
+C-level object still exists. If you try to access an object that has no
+valid C counterpart anymore you get an exception at runtime. This method
+can be used to test for existence of the C object part without causing an
+exception.
+
+=back
+
+=cut
+
+*cf::object::valid =
+*cf::player::valid =
+*cf::map::valid = \&cf::_valid;
+
 #############################################################################
 # object support
 
 sub instantiate {
    my ($obj, $data) = @_;
-   my $registry = $obj->registry;
 
    $data = from_json $data;
 
    for (@$data) {
-      my ($pri, $name, @args) = @$_;
+      my ($name, $args) = @$_;
 
-      if (my $attach = $attachment{$name}) {
-         _attach @$registry, KLASS_OBJECT, @$attach;
+      $obj->attach ($name, %{$args || {} });
+   }
+}
 
-         if (my $cb = delete $registry->[EVENT_OBJECT_INSTANTIATE]) {
-            for (@$cb) {
-               eval { $_->[1]->($obj, @args); };
-               if ($@) {
-                  warn "$@";
-                  warn "... while processing '$name' instantiate with args <@args>\n";
-               }
-            }
+# basically do the same as instantiate, without calling instantiate
+sub reattach {
+   my ($obj) = @_;
+   my $registry = $obj->registry;
+
+   @$registry = ();
+
+   delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
+
+   for my $name (keys %{ $obj->{_attachment} || {} }) {
+      if (my $attach = $attachment{$name}) {
+         for (@$attach) {
+            my ($klass, @attach) = @$_;
+            _attach @$registry, $klass, @attach;
          }
       } else {
-         warn "object uses attachment $name that is not available, postponing.\n";
+         warn "object uses attachment '$name' that is not available, postponing.\n";
       }
+   }
+}
+
+sub object_freezer_save {
+   my ($filename, $rdata, $objs) = @_;
+
+   if (length $$rdata) {
+      warn sprintf "saving %s (%d,%d)\n",
+         $filename, length $$rdata, scalar @$objs;
+
+      if (open my $fh, ">:raw", "$filename~") {
+         chmod SAVE_MODE, $fh;
+         syswrite $fh, $$rdata;
+         close $fh;
+
+         if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
+            chmod SAVE_MODE, $fh;
+            syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
+            close $fh;
+            rename "$filename.pst~", "$filename.pst";
+         } else {
+            unlink "$filename.pst";
+         }
 
-      push @{$obj->{_attachment}}, $name;
+         rename "$filename~", $filename;
+      } else {
+         warn "FATAL: $filename~: $!\n";
+      }
+   } else {
+      unlink $filename;
+      unlink "$filename.pst";
    }
 }
 
-# basically do the same as instantiate, without calling instantiate
-sub reattach {
-   my ($obj) = @_;
-   my $registry = $obj->registry;
+sub object_thawer_load {
+   my ($filename) = @_;
+
+   local $/;
+
+   my $av;
 
-   warn "reattach<@_, $_>\n";
+   #TODO: use sysread etc.
+   if (open my $data, "<:raw:perlio", $filename) {
+      $data = <$data>;
+      if (open my $pst, "<:raw:perlio", "$filename.pst") {
+         $av = eval { (Storable::thaw <$pst>)->{objs} };
+      }
+      return ($data, $av);
+   }
+
+   ()
 }
 
 attach_to_objects
@@ -302,14 +497,11 @@
       my ($src, $dst) = @_;
 
       @{$dst->registry} = @{$src->registry};
-      warn "registry clone ", join ":", @{$src->registry};#d#
 
       %$dst = %$src;
 
-      $dst->{_attachment} = [@{ $src->{_attachment} }]
+      %{$dst->{_attachment}} = %{$src->{_attachment}}
          if exists $src->{_attachment};
-
-      warn "clone<@_>\n";#d#
    },
 ;
 
@@ -502,6 +694,12 @@
       # 7. reload cf.pm
       $msg->("reloading cf.pm");
       require cf;
+
+      $msg->("load extensions");
+      cf::load_extensions;
+
+      $msg->("reattach");
+      _global_reattach;
    };
    $msg->($@) if $@;
 
@@ -559,52 +757,7 @@
    my $path = $map->tmpname;
    defined $path or return;
 
-   unlink "$path.cfperl";
-};
-
-*cf::mapsupport::on_swapin =
-*cf::mapsupport::on_load = sub {
-   my ($map) = @_;
-
-   my $path = $map->tmpname;
-   $path = $map->path unless defined $path;
-
-   open my $fh, "<:raw", "$path.cfperl"
-      or return; # no perl data
-
-   my $data = Storable::thaw do { local $/; <$fh> };
-
-   $data->{version} <= 1
-      or return; # too new
-
-   $map->_set_obs ($data->{obs});
-};
-
-*cf::mapsupport::on_swapout = sub {
-   my ($map) = @_;
-
-   my $path = $map->tmpname;
-   $path = $map->path unless defined $path;
-
-   my $obs = $map->_get_obs;
-
-   if (defined $obs) {
-      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,
-      };
-
-      chmod SAVE_MODE, "$path.cfperl"; # very racy, but cf-compatible *g*
-   } else {
-      unlink "$path.cfperl";
-   }
+   unlink "$path.pst";
 };
 
 attach_to_maps prio => -10000, package => cf::mapsupport::;
@@ -616,6 +769,7 @@
    @_, map all_objects ($_->inv), @_
 }
 
+# TODO: compatibility cruft, remove when no longer needed
 attach_to_players
    on_load => sub {
       my ($pl, $path) = @_;
@@ -628,12 +782,6 @@
          }
       }
    },
-   on_save => sub {
-      my ($pl, $path) = @_;
-
-      $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
-         for grep %$_, all_objects $pl->ob;
-   },
 ;
 
 #############################################################################
@@ -752,6 +900,7 @@
 # the server's main()
 
 sub main {
+   load_extensions;
    Event::loop;
 }
 
@@ -762,8 +911,6 @@
 
 unshift @INC, $LIBDIR;
 
-load_extensions;
-
 $TICK_WATCHER = Event->timer (
    prio => 1,
    at   => $NEXT_TICK || 1,