--- deliantra/server/include/cfperl.h	2006/08/24 13:13:49	1.1
+++ deliantra/server/include/cfperl.h	2006/08/31 09:19:34	1.18
@@ -1,5 +1,183 @@
 //
 // cfperl.h perl interface
 //
+#ifndef CFPERL_H__
+#define CFPERL_H__
 
+#include <cstdio>
+
+using namespace std;
+
+#include <EXTERN.h>
+#include <perl.h>
+
+#include "keyword.h"
+
+// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
+#undef localtime
+#undef srand48
+#undef drand48
+#undef srandom
+#undef readdir
+#undef getprotobyname
+#undef gethostbyname
+#undef ctime
+#undef strerror
+
+// perl bug #40256: perl does overwrite those with reentrant versions
+// but does not initialise their state structures.
+#undef random
+#undef crypt
+
+void cfperl_init ();
+void cfperl_boot ();
 void cfperl_main ();
+
+enum event_klass
+{
+  KLASS_NONE,
+  KLASS_GLOBAL,
+  KLASS_PLAYER,
+  KLASS_OBJECT,
+  KLASS_MAP,
+};
+
+enum event_type
+{
+# define def(klass,name) EVENT_ ## klass ## _ ## name,
+#  include "eventinc.h"
+# undef def
+  NUM_EVENT_TYPES
+};
+
+#define ARG_AV(o)     DT_AV    , static_cast<AV *>   (o)
+#define ARG_INT(v)    DT_INT   , static_cast<int>    (v)
+#define ARG_INT64(v)  DT_INT64 , static_cast<sint64> (v)
+#define ARG_DOUBLE(v) DT_DOUBLE, static_cast<double> (v)
+#define ARG_STRING(v) DT_STRING, static_cast<const char *> (v)
+#define ARG_DATA(s,l) DT_DATA  , static_cast<const void *> (s), (l)
+#define ARG_OBJECT(o) DT_OBJECT, (void *)static_cast<struct object *>    (o)
+#define ARG_MAP(o)    DT_MAP   , (void *)static_cast<struct mapstruct *> (o)
+#define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<struct pl *>        (o)
+#define ARG_ARCH(o)   DT_ARCH  , (void *)static_cast<struct archetype *> (o)
+#define ARG_PARTY(o)  DT_PARTY , (void *)static_cast<struct party *>     (o)
+#define ARG_REGION(o) DT_REGION, (void *)static_cast<struct region *>    (o)
+
+// the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
+
+// all these return true when the normal event processing should be skipped (if any)
+#define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END)
+
+#define INVOKE(klass, event, ...)     INVOKE_(EVENT_ ## klass  ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_GLOBAL(event, ...)     INVOKE_(EVENT_ ## GLOBAL ## _ ## event,                  ## __VA_ARGS__)
+#define INVOKE_OBJECT(event, op, ...) INVOKE_(EVENT_ ## OBJECT ## _ ## event, ARG_OBJECT (op), ## __VA_ARGS__)
+#define INVOKE_PLAYER(event, pl, ...) INVOKE_(EVENT_ ## PLAYER ## _ ## event, ARG_PLAYER (pl), ## __VA_ARGS__)
+#define INVOKE_MAP(event, map, ...)   INVOKE_(EVENT_ ## MAP    ## _ ## event, ARG_MAP (map)  , ## __VA_ARGS__)
+
+//TODO should index into @result
+#define RESULT(idx,type) cfperl_result_ ## type (idx)
+#define RESULT_INT(idx) RESULT(idx, INT)
+
+bool cfperl_invoke (event_type event, ...);
+int cfperl_result_INT (int idx);
+
+struct attachable_base
+{
+  SV *self;
+  AV *cb;    // CF+ perl self and callback
+  const char *attach; // generic extension attachment information
+
+  void clear ();     // called when free'ing objects
+  void optimise ();  // possibly save some memory by destroying unneeded data
+  void instantiate (data_type type, void *obj);
+
+  void attachable_init ()
+  {
+    self   = 0;
+    cb     = 0;
+    attach = 0;
+  }
+};
+
+// objects attachable from perl (or any other extension) should include or
+// derive using the curiously recurring template pattern, to avoid
+// virtual method calls etc.
+template<class subclass>
+struct attachable : attachable_base
+{
+  void instantiate ()
+  {
+    if (attach)
+      attachable_base::instantiate ((data_type) cftype<subclass>::dt, static_cast<subclass *>(this));
+  }
+};
+
+struct object_freezer
+{
+  AV *av;
+  SV *text;
+
+  object_freezer ();
+  ~object_freezer ();
+
+  void put (attachable_base *ext);
+
+  template<class subclass>
+  void put (attachable<subclass> *obj)
+  {
+    put ((attachable_base *)obj);
+  }
+
+  void put (keyword k);
+  void put (const char *v);
+  void put (int v);
+
+  template<typename value>
+  void put (keyword k, value v)
+  {
+    put (k);
+    put (v);
+  }
+
+  bool save (const char *filename);
+
+  operator bool () { return !!av; }
+};
+
+// compatibility support, should be removed when no longer needed
+int fprintf (object_freezer &freezer, const char *format, ...);
+int fputs (const char *s, object_freezer &freezer);
+
+// a single key-value line from a file
+struct token {
+   keyword k;
+   const char *v;
+
+   token (keyword k, const char *v = 0) : k(k), v(v) { }
+};
+
+struct object_thawer
+{
+  AV *av;
+  FILE *fp;
+  char line[1024];
+
+  object_thawer (const char *filename = 0);
+  ~object_thawer ();
+
+  void get (data_type type, void *obj, attachable_base *ext, int oid);
+
+  template<class subclass>
+  void get (attachable<subclass> *obj, int oid)
+  {
+    if (av)
+      get ((data_type) cftype<subclass>::dt, (subclass *)obj, obj, oid);
+  }
+
+  token get_token ();
+
+  operator FILE *() { return fp; }
+};
+
+#endif
+