--- deliantra/server/include/cfperl.h	2006/12/14 20:39:54	1.36
+++ deliantra/server/include/cfperl.h	2006/12/19 04:58:04	1.40
@@ -27,6 +27,10 @@
 #undef ctime
 #undef strerror
 
+// same here, massive symbol spamming
+#undef do_open
+#undef do_close
+
 // perl bug #40256: perl does overwrite those with reentrant versions
 // but does not initialise their state structures.
 #undef random
@@ -39,7 +43,7 @@
 {
   KLASS_NONE,
   KLASS_GLOBAL,
-  KLASS_SOCKET,
+  KLASS_CLIENT,
   KLASS_PLAYER,
   KLASS_OBJECT,
   KLASS_MAP,
@@ -66,7 +70,7 @@
 #define ARG_ARCH(o)   DT_ARCH  , (void *)static_cast<archetype *> (o)
 #define ARG_PARTY(o)  DT_PARTY , (void *)static_cast<party *>     (o)
 #define ARG_REGION(o) DT_REGION, (void *)static_cast<region *>    (o)
-#define ARG_SOCKET(o) DT_SOCKET, (void *)static_cast<client_socket *> (o)
+#define ARG_CLIENT(o) DT_CLIENT, (void *)static_cast<client *> (o)
 
 // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
 
@@ -76,7 +80,7 @@
 #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_SOCKET(event, ns, ...)  INVOKE_(EVENT_ ## SOCKET  ## _ ## event, ARG_SOCKET (ns), ## __VA_ARGS__)
+#define INVOKE_CLIENT(event, ns, ...)  INVOKE_(EVENT_ ## CLIENT  ## _ ## event, ARG_CLIENT (ns), ## __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__)
 
@@ -357,6 +361,19 @@
   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)
+  {
+    alloc ();
+  }
+
+private:
+  void alloc ();
+};
+
 struct iow : watcher<pe_io>, callback<void (iow &, int)>
 {
   template<class O, class M>
@@ -366,9 +383,9 @@
     alloc ();
   }
 
-  iow &fd (int fd);
+  void fd (int fd);
   int poll ();
-  iow &poll (int events);
+  void poll (int events);
 
 private:
   void alloc ();