--- deliantra/server/include/cfperl.h	2007/08/01 20:07:06	1.85
+++ deliantra/server/include/cfperl.h	2008/01/13 12:14:52	1.93
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 //
@@ -37,7 +37,7 @@
 #include <perl.h>
 #include <XSUB.h>
 
-#include <EventAPI.h>
+#include <EVAPI.h>
 #include <CoroAPI.h>
 
 #include "util.h"
@@ -57,6 +57,7 @@
 #undef gethostbyname
 #undef ctime
 #undef strerror
+#undef _
 
 // same here, massive symbol spamming
 #undef do_open
@@ -71,6 +72,11 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+#define _(msg)  (msg)
+#define N_(msg) (msg)
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 // some macros to simplify perl in-calls
 
 #define CHECK_ERROR			\
@@ -156,7 +162,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 INTERFACE_CLASS (attachable)
-struct attachable
+struct attachable : refcnt_base
 {
   static MGVTBL vtbl;
 
@@ -167,14 +173,9 @@
     F_DESTROYED   = 0x01,
     F_DEBUG_TRACE = 0x02,
   };
-
-  // object is delete'd after the refcount reaches 0
   int ACC (RW, flags);
-  mutable int ACC (RW, refcnt);
-
-  MTH void refcnt_inc () const { ++refcnt; }
-  MTH void refcnt_dec () const { --refcnt; }
 
+  // object is delete'd after the refcount reaches 0
   MTH int refcnt_cnt () const;
   // check wether the object has died and destroy
   MTH void refcnt_chk () { if (expect_false (refcnt <= 0)) do_check (); }
@@ -203,17 +204,27 @@
   void optimise ();   // possibly save some memory by destroying unneeded data
 
   attachable ()
-  : flags (0), refcnt (0), self (0), cb (0), attach (0)
+  : flags (0), self (0), cb (0), attach (0)
   {
   }
 
   attachable (const attachable &src)
-  : flags (0), refcnt (0), self (0), cb (0), attach (src.attach)
+  : flags (0), self (0), cb (0), attach (src.attach)
   {
   }
 
   // set a custom key to the given value, or delete it if value = 0
-  void set_key (const char *key, const char *value = 0);
+  void set_key (const char *key, const char *value = 0, bool is_utf8 = 0);
+
+  void set_key_text (const char *key, const char *value = 0)
+  {
+    set_key (key, value, 1);
+  }
+
+  void set_key_data (const char *key, const char *value = 0)
+  {
+    set_key (key, value, 0);
+  }
 
   attachable &operator =(const attachable &src);
 
@@ -249,6 +260,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+INTERFACE_CLASS(object_freezer)
 struct object_freezer : dynbuf_text
 {
   AV *av;
@@ -362,12 +374,13 @@
     put (k, (T *)v);
   }
 
-  bool save (const char *path);
+  MTH bool save (const_octet_string path);
   char *as_string (); // like strdup
 
   operator bool () { return !!av; }
 };
 
+INTERFACE_CLASS(object_thawer)
 struct object_thawer
 {
   char *line; // current beginning of line
@@ -377,10 +390,10 @@
   keyword kw;
   char *kw_str; // the keyword parsed, as string
   char *value;  // the value, or 0 if no value
-  char *value_nn; // the value, or the empty string if no value
+  const char *value_nn; // the value, or the empty string if no value
   const char *name;
 
-  operator bool () { return !!text; }
+  operator bool () const { return !!text; }
 
   object_thawer (const char *path = 0);
   object_thawer (const char *data, AV *perlav);
@@ -389,10 +402,11 @@
   void get (attachable *obj, int oid);
 
   // parse next line
-  void next ();
+  MTH void next ();
   // skip the current key-value (usually fetch next line, for
   // multiline-fields, skips till the corresponding end-kw
-  void skip ();
+  MTH void skip ();
+  MTH void skip_block (); // skips till and over KW_end
 
   char *get_str () { return value; } // may be 0
   void get_ml (keyword kend, shstr &sh);
@@ -418,8 +432,18 @@
   void get (uint32 &i) { i = get_sint64 (); }
   void get (sint64 &i) { i = get_sint64 (); }
 
-  void parse_warn (const char *msg);
-  bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+  MTH void parse_warn (const char *msg);
+  MTH bool parse_error (const char *type = 0, const char *name = 0, bool skip = true);
+
+  struct delayed_ref {
+    attachable *op;
+    object_ptr *ptr;
+    const char *ref;
+  };
+  std::vector<delayed_ref> delrefs;
+
+  void delayed_deref (attachable *op, object_ptr &ptr, const char *ref);
+  MTH void resolve_delayed_derefs (bool deref = true);
 };
 
 //TODO: remove
@@ -467,61 +491,50 @@
   static void wait_for_tick_begin ();
 };
 
-struct watcher_base
+struct evapi
 {
-  static struct EventAPI *GEventAPI;
+  static struct EVAPI *GEVAPI;
 };
 
-template<class base>
-struct watcher : watcher_base
+struct iow : ev_io, evapi, callback<void (iow &, int)>
 {
-  base *pe;
-
-  void start   (bool repeat = false)        { GEventAPI->start   ((pe_watcher *)pe, repeat); }
-  void stop    (bool cancel_events = false) { GEventAPI->stop    ((pe_watcher *)pe, cancel_events); }
-  void now     ()                           { GEventAPI->now     ((pe_watcher *)pe); }
-  void suspend ()                           { GEventAPI->suspend ((pe_watcher *)pe); }
-  void resume  ()                           { GEventAPI->resume  ((pe_watcher *)pe); }
-
-  void prio    (int new_prio)               { ((pe_watcher *)pe)->prio = new_prio; }
-
-  ~watcher ()
+  static void thunk (EV_P_ struct ev_io *w_, int revents)
   {
-    cancel ();
+    iow &w = *static_cast<iow *>(w_);
+    
+    w (w, revents);
   }
 
-private:
-  void cancel  ()                           { GEventAPI->cancel  ((pe_watcher *)pe); } // private
-};
-
-struct iw : watcher<pe_idle>, callback<void (iw &)>
-{
   template<class O, class M>
-  iw (O object, M method)
-  : callback<void (iw &)> (object, method)
+  iow (O object, M method)
+  : callback<void (iow &, int)> (object, method)
   {
-    alloc ();
+    ev_init ((ev_io *)this, thunk);
   }
 
-private:
-  void alloc ();
-};
-
-struct iow : watcher<pe_io>, callback<void (iow &, int)>
-{
-  template<class O, class M>
-  iow (O object, M method)
-  : callback<void (iow &, int)> (object, method)
+  void set (int fd, int events)
   {
-    alloc ();
+    ev_io_set ((ev_io *)this, fd, events);
   }
 
-  void fd (int fd);
-  int poll ();
+  int poll () const { return events; }
+
   void poll (int events);
 
-private:
-  void alloc ();
+  void start ()
+  {
+    ev_io_start (EV_DEFAULT, (ev_io *)this);
+  }
+
+  void stop ()
+  {
+    ev_io_stop (EV_DEFAULT, (ev_io *)this);
+  }
+
+  ~iow ()
+  {
+    stop ();
+  }
 };
 
 #endif