--- rxvt-unicode/src/iom.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/iom.h	2004/01/29 23:26:01	1.9
@@ -1,6 +1,6 @@
 /*
     iom.h -- generic I/O multiplexor
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003, 2004 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,32 +17,100 @@
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  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"
 
-#include "rxvtvec.h"
 #include "callback.h"
 
-typedef double tstamp;
+#ifndef IOM_IO
+# define IOM_IO 0
+#endif
+#ifndef IOM_TIME
+# define IOM_TIME 0
+#endif
+#ifndef IOM_CHECK
+# define IOM_CHECK 0
+#endif
+#ifndef IOM_IDLE
+# define IOM_IDLE 0
+#endif
 
+typedef double tstamp;
 extern tstamp NOW;
 
+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
+
+template<class watcher>
+struct io_manager_vec : protected vector<watcher *> {
+  friend class io_manager;
+protected:
+#if IOM_CHECK
+  bool activity;
+#endif
+
+  void erase_unordered (unsigned int pos)
+  {
+    watcher *w = (*this)[size () - 1];
+    pop_back ();
+
+    if (size ())
+      if ((*this)[pos] = w)
+        w->active = pos + 1;
+  }
+};
 
 class io_manager {
-  simplevec<io_watcher *> iow;
-  simplevec<time_watcher *> tw; // actually a heap
+#if IOM_IO
+  io_manager_vec<io_watcher>    iow;
+#endif
+#if IOM_CHECK
+  io_manager_vec<check_watcher> cw;
+#endif
+#if IOM_TIME
+  io_manager_vec<time_watcher>  tw;
+#endif
+#if IOM_IDLE
+  io_manager_vec<idle_watcher>  iw;
+#endif
+
+  template<class watcher>
+  void reg (watcher *w, io_manager_vec<watcher> &queue);
+
+  template<class watcher>
+  void unreg (watcher *w, io_manager_vec<watcher> &queue);
 
-  void idle_cb (time_watcher &w); time_watcher *idle;
 public:
   // 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
+  void reg (io_watcher    *w); void unreg (io_watcher    *w);
+#endif
+#if IOM_TIME
+  void reg (time_watcher  *w); void unreg (time_watcher  *w);
+#endif
+#if IOM_CHECK
+  void reg (check_watcher *w); void unreg (check_watcher *w);
+#endif
+#if IOM_IDLE
+  void reg (idle_watcher  *w); void unreg (idle_watcher  *w);
+#endif
   
   void loop ();
 
@@ -52,37 +120,37 @@
 
 extern io_manager iom; // a singleton, together with it's construction/destruction problems.
 
+struct watcher {
+  int active; /* 0 == inactive, else index into respective vector */
+
+  watcher() : active(0) { }
+};
+
+#if IOM_IO
 enum { EVENT_READ = 1, EVENT_WRITE = 2 };
 
-struct io_watcher : callback2<void, io_watcher &, short> {
+struct io_watcher : watcher, callback2<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)
-    { }
-
-  ~io_watcher ();
+  void set (int fd_, short events_) { fd = fd_; events = events_; }
 
-  void set(int fd_, short events_) { fd = fd_; events = events_; }
-
-  void set(short events_) { set (fd, events_); }
+  void set (short events_) { set (fd, events_); }
+  void start () { iom.reg (this); }
   void start (int fd_, short events_) { set (fd_, events_); iom.reg (this); }
   void stop () { iom.unreg (this); }
-};
-
-#define TSTAMP_CANCEL -1.
-
-struct time_watcher : callback1<void, time_watcher &> {
-  tstamp at;
 
   template<class O1, class O2>
-  time_watcher (O1 *object, void (O2::*method)(time_watcher &))
-    : callback1<void, time_watcher &>(object,method)
-    { }
+  io_watcher (O1 *object, void (O2::*method)(io_watcher &, short))
+  : callback2<void, io_watcher &, short>(object,method)
+  { }
+  ~io_watcher () { stop (); }
+};
+#endif
 
-  ~time_watcher ();
+#if IOM_TIME
+struct time_watcher : watcher, callback1<void, time_watcher &> {
+  tstamp at;
 
   void trigger ();
 
@@ -92,12 +160,41 @@
   void start (tstamp when) { set (when); iom.reg (this); }
   void stop () { iom.unreg (this); }
 
-  void reset (tstamp when = TSTAMP_CANCEL)
-    {
-      stop ();
-      at = when;
-    }
+  template<class O1, class O2>
+  time_watcher (O1 *object, void (O2::*method)(time_watcher &))
+  : callback1<void, time_watcher &>(object,method), at(0)
+  { }
+  ~time_watcher () { stop (); }
+};
+#endif
+
+#if IOM_CHECK
+// run before checking for new events
+struct check_watcher : watcher, callback1<void, check_watcher &> {
+  void start () { iom.reg (this); }
+  void stop () { iom.unreg (this); }
+
+  template<class O1, class O2>
+  check_watcher (O1 *object, void (O2::*method)(check_watcher &))
+  : callback1<void, check_watcher &>(object,method)
+  { }
+  ~check_watcher () { stop (); }
 };
+#endif
+
+#if IOM_IDLE
+// run after checking for any i/o, but before waiting
+struct idle_watcher : watcher, callback1<void, idle_watcher &> {
+  void start () { iom.reg (this); }
+  void stop () { iom.unreg (this); }
+
+  template<class O1, class O2>
+  idle_watcher (O1 *object, void (O2::*method)(idle_watcher &))
+    : callback1<void, idle_watcher &>(object,method)
+    { }
+  ~idle_watcher () { stop (); }
+};
+#endif
 
 #endif