--- rxvt-unicode/src/iom.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/iom.h	2006/05/31 00:39:48	1.29
@@ -1,8 +1,10 @@
 /*
-    iom.h -- generic I/O multiplexor
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    iom.h -- generic I/O multiplexer
+    Copyright (C) 2003-2006 Marc Lehmann <gvpe@schmorp.de>
  
-    This program is free software; you can redistribute it and/or modify
+    This file is part of GVPE.
+
+    GVPE 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 2 of the License, or
     (at your option) any later version.
@@ -13,91 +15,212 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    along with gvpe; if not, write to the Free Software
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef VPE_IOM_H__
-#define VPE_IOM_H__
+#ifndef IOM_H__
+#define IOM_H__
 
-#include <cassert>
+// required:
+// - a vector template like simplevec or stl's vector
+// - defines for all watcher types required in your app
+// edit iom_conf.h as appropriate.
+#include "iom_conf.h"
+
+#if IOM_CHILD
+# undef IOM_SIG
+# define IOM_SIG 1
+#endif
 
-#include "rxvtvec.h"
 #include "callback.h"
 
 typedef double tstamp;
-
 extern tstamp NOW;
 
+// TSTAMP_MAX must still fit into a positive struct timeval
+#define TSTAMP_MAX (double)(1UL<<31)
+
+struct watcher;
+#if IOM_IO
 struct io_watcher;
+#endif
+#if IOM_TIME
 struct time_watcher;
+#endif
+#if IOM_CHECK
+struct check_watcher;
+#endif
+#if IOM_IDLE
+struct idle_watcher;
+#endif
+#if IOM_SIG
+struct sig_watcher;
+#endif
+#if IOM_CHILD
+struct child_watcher;
+#endif
+
+template<class watcher>
+struct io_manager_vec : vector<watcher *> {
+  void erase_unordered (unsigned int pos)
+  {
+    watcher *w = (*this)[this->size () - 1];
+    this->pop_back ();
+
+    if (!this->empty ())
+      if (((*this)[pos] = w)) // '=' is correct!
+        w->active = pos + 1;
+  }
+};
 
+// only used as a namespace, and for initialisation purposes
 class io_manager {
-  simplevec<io_watcher *> iow;
-  simplevec<time_watcher *> tw; // actually a heap
+  template<class watcher>
+  static void reg (watcher &w, io_manager_vec<watcher> &queue);
+
+  template<class watcher>
+  static void unreg (watcher &w, io_manager_vec<watcher> &queue);
 
-  void idle_cb (time_watcher &w); time_watcher *idle;
 public:
+#if IOM_TIME
+  // fetch time only
+  static tstamp now ();
+
+  // set NOW
+  static void set_now ();
+#endif
+
   // register a watcher
-  void reg (io_watcher *w);
-  void unreg (io_watcher *w);
-  void reg (time_watcher *w);
-  void unreg (time_watcher *w);
+#if IOM_IO
+  static void reg (io_watcher    &w); static void unreg (io_watcher    &w);
+#endif
+#if IOM_TIME
+  static void reg (time_watcher  &w); static void unreg (time_watcher  &w);
+#endif
+#if IOM_CHECK
+  static void reg (check_watcher &w); static void unreg (check_watcher &w);
+#endif
+#if IOM_IDLE
+  static void reg (idle_watcher  &w); static void unreg (idle_watcher  &w);
+#endif
+#if IOM_SIG
+  static void reg (sig_watcher   &w); static void unreg (sig_watcher   &w);
+#endif
+#if IOM_CHILD
+  static void reg (child_watcher &w); static void unreg (child_watcher &w);
+#endif
   
-  void loop ();
-
-  io_manager ();
-  ~io_manager ();
+  static void loop ();
 };
 
-extern io_manager iom; // a singleton, together with it's construction/destruction problems.
+struct watcher {
+  int active; /* 0 == inactive, else index into respective vector */
 
-enum { EVENT_READ = 1, EVENT_WRITE = 2 };
+  bool is_active () { return active; }
 
-struct io_watcher : callback2<void, io_watcher &, short> {
+  watcher () : active (0) { }
+};
+
+#if IOM_IO
+enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 };
+
+struct io_watcher : watcher, callback<void (io_watcher &, short)> {
   int fd;
   short events;
 
-  template<class O1, class O2>
-  io_watcher (O1 *object, void (O2::*method)(io_watcher &, short))
-    : callback2<void, io_watcher &, short>(object,method)
-    { }
+  void set (int fd_, short events_) { fd = fd_; events = events_; }
+
+  void set (short events_) { set (fd, events_); }
+  void start () { io_manager::reg (*this); }
+  void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); }
+  void stop () { io_manager::unreg (*this); }
+
+  template<class O, class M>
+  io_watcher (O object, M method)
+  : callback<void (io_watcher &, short)> (object, method)
+  { }
+  ~io_watcher () { stop (); }
+};
+#endif
 
-  ~io_watcher ();
+#if IOM_TIME
+struct time_watcher : watcher, callback<void (time_watcher &)> {
+  tstamp at;
 
-  void set(int fd_, short events_) { fd = fd_; events = events_; }
+  void trigger ();
 
-  void set(short events_) { set (fd, events_); }
-  void start (int fd_, short events_) { set (fd_, events_); iom.reg (this); }
-  void stop () { iom.unreg (this); }
+  void set (tstamp when) { at = when; }
+  void operator () () { trigger (); }
+  void start () { io_manager::reg (*this); }
+  void start (tstamp when) { set (when); io_manager::reg (*this); }
+  void stop () { io_manager::unreg (*this); }
+
+  template<class O, class M>
+  time_watcher (O object, M method)
+  : callback<void (time_watcher &)> (object, method), at (0)
+  { }
+  ~time_watcher () { stop (); }
 };
+#endif
 
-#define TSTAMP_CANCEL -1.
-
-struct time_watcher : callback1<void, time_watcher &> {
-  tstamp at;
+#if IOM_CHECK
+// run before checking for new events
+struct check_watcher : watcher, callback<void (check_watcher &)> {
+  void start () { io_manager::reg (*this); }
+  void stop () { io_manager::unreg (*this); }
+
+  template<class O, class M>
+  check_watcher (O object, M method)
+  : callback<void (check_watcher &)> (object, method)
+  { }
+  ~check_watcher () { stop (); }
+};
+#endif
 
-  template<class O1, class O2>
-  time_watcher (O1 *object, void (O2::*method)(time_watcher &))
-    : callback1<void, time_watcher &>(object,method)
+#if IOM_IDLE
+// run after checking for any i/o, but before waiting
+struct idle_watcher : watcher, callback<void (idle_watcher &)> {
+  void start () { io_manager::reg (*this); }
+  void stop () { io_manager::unreg (*this); }
+
+  template<class O, class M>
+  idle_watcher (O object, M method)
+    : callback<void (idle_watcher &)> (object, method)
     { }
+  ~idle_watcher () { stop (); }
+};
+#endif
 
-  ~time_watcher ();
-
-  void trigger ();
+#if IOM_SIG
+struct sig_watcher : watcher, callback<void (sig_watcher &)> {
+  int signum;
+
+  void start (int signum);
+  void stop () { io_manager::unreg (*this); }
+
+  template<class O, class M>
+  sig_watcher (O object, M method)
+  : callback<void(sig_watcher &)> (object, method), signum (0)
+  { }
+  ~sig_watcher () { stop (); }
+};
+#endif
 
-  void set (tstamp when) { at = when; }
-  void operator ()() { trigger (); }
-  void start () { iom.reg (this); }
-  void start (tstamp when) { set (when); iom.reg (this); }
-  void stop () { iom.unreg (this); }
-
-  void reset (tstamp when = TSTAMP_CANCEL)
-    {
-      stop ();
-      at = when;
-    }
+#if IOM_CHILD
+struct child_watcher : watcher, callback<void (child_watcher &, int)> {
+  int /*pid_t*/ pid;
+
+  void start (int pid) { this->pid = pid; io_manager::reg (*this); }
+  void stop () { io_manager::unreg (*this); }
+
+  template<class O, class M>
+  child_watcher (O object, M method)
+  : callback<void (child_watcher &, int)> (object, method), pid (0)
+  { }
+  ~child_watcher () { stop (); }
 };
+#endif
 
 #endif