--- rxvt-unicode/src/iom.h	2004/01/17 14:10:40	1.8
+++ rxvt-unicode/src/iom.h	2004/02/13 12:16:21	1.11
@@ -59,9 +59,11 @@
 #endif
 
 template<class watcher>
-struct io_manager_vec : protected vector<watcher *> {
-  friend class io_manager;
-protected:
+struct io_manager_vec : vector<watcher *> {
+#if IOM_CHECK
+  bool activity;
+#endif
+
   void erase_unordered (unsigned int pos)
   {
     watcher *w = (*this)[size () - 1];
@@ -119,7 +121,7 @@
 struct watcher {
   int active; /* 0 == inactive, else index into respective vector */
 
-  watcher() : active(0) { }
+  watcher () : active (0) { }
 };
 
 #if IOM_IO
@@ -137,8 +139,8 @@
   void stop () { iom.unreg (this); }
 
   template<class O1, class O2>
-  io_watcher (O1 *object, void (O2::*method)(io_watcher &, short))
-  : callback2<void, io_watcher &, short>(object,method)
+  io_watcher (O1 *object, void (O2::*method) (io_watcher &, short))
+  : callback2<void, io_watcher &, short> (object,method)
   { }
   ~io_watcher () { stop (); }
 };
@@ -151,14 +153,14 @@
   void trigger ();
 
   void set (tstamp when) { at = when; }
-  void operator ()() { trigger (); }
+  void operator () () { trigger (); }
   void start () { iom.reg (this); }
   void start (tstamp when) { set (when); iom.reg (this); }
   void stop () { iom.unreg (this); }
 
   template<class O1, class O2>
-  time_watcher (O1 *object, void (O2::*method)(time_watcher &))
-  : callback1<void, time_watcher &>(object,method), at(0)
+  time_watcher (O1 *object, void (O2::*method) (time_watcher &))
+  : callback1<void, time_watcher &> (object,method), at (0)
   { }
   ~time_watcher () { stop (); }
 };
@@ -171,8 +173,8 @@
   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 (O1 *object, void (O2::*method) (check_watcher &))
+  : callback1<void, check_watcher &> (object,method)
   { }
   ~check_watcher () { stop (); }
 };
@@ -185,8 +187,8 @@
   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 (O1 *object, void (O2::*method) (idle_watcher &))
+    : callback1<void, idle_watcher &> (object,method)
     { }
   ~idle_watcher () { stop (); }
 };