--- rxvt-unicode/src/main.C	2007/11/26 10:18:28	1.266
+++ rxvt-unicode/src/main.C	2007/12/11 18:00:07	1.276
@@ -40,9 +40,7 @@
 #include <csignal>
 #include <cstring>
 
-#ifdef HAVE_TERMIOS_H
 # include <termios.h>
-#endif
 
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
@@ -154,49 +152,49 @@
 #endif
 
 rxvt_term::rxvt_term ()
-    :
-#if ENABLE_TRANSPARENCY || ENABLE_PERL
-    rootwin_ev (this, &rxvt_term::rootwin_cb),
-#endif
+{
 #if HAVE_BG_PIXMAP
-    update_background_ev(this, &rxvt_term::update_background_cb),
-#endif
-#ifdef HAVE_SCROLLBARS
-    scrollbar_ev (this, &rxvt_term::x_cb),
+  update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
 #endif
 #ifdef CURSOR_BLINK
-    cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
+  cursor_blink_ev.set     <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
 #endif
 #ifdef TEXT_BLINK
-    text_blink_ev (this, &rxvt_term::text_blink_cb),
+  text_blink_ev.set       <rxvt_term, &rxvt_term::text_blink_cb>   (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
 #endif
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
-    cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
+  cont_scroll_ev.set      <rxvt_term, &rxvt_term::cont_scroll_cb>  (this);
 #endif
 #ifdef SELECTION_SCROLLING
-    sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
+  sel_scroll_ev.set       <rxvt_term, &rxvt_term::sel_scroll_cb>   (this);
 #endif
 #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
-    slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
+  slip_wheel_ev.set       <rxvt_term, &rxvt_term::slip_wheel_cb>   (this);
 #endif
-#ifdef POINTER_BLANK
-    pointer_ev (this, &rxvt_term::pointer_cb),
+#if ENABLE_TRANSPARENCY || ENABLE_PERL
+  rootwin_ev.set          <rxvt_term, &rxvt_term::x_cb>       (this),
+#endif
+#ifdef HAVE_SCROLLBARS
+  scrollbar_ev.set        <rxvt_term, &rxvt_term::x_cb>       (this),
 #endif
 #ifdef USE_XIM
-    im_ev      (this, &rxvt_term::im_cb),
+  im_ev.set               <rxvt_term, &rxvt_term::im_cb>      (this),
+#endif
+#ifdef POINTER_BLANK
+  pointer_ev.set          <rxvt_term, &rxvt_term::pointer_cb> (this);
 #endif
 #ifndef NO_BELL
-    bell_ev    (this, &rxvt_term::bell_cb),
+  bell_ev.set             <rxvt_term, &rxvt_term::bell_cb>    (this);
 #endif
-    termwin_ev (this, &rxvt_term::x_cb),
-    vt_ev      (this, &rxvt_term::x_cb),
-    child_ev   (this, &rxvt_term::child_cb),
-    prepare_ev (this, &rxvt_term::prepare_cb),
-    flush_ev   (this, &rxvt_term::flush_cb),
-    destroy_ev (this, &rxvt_term::destroy_cb),
-    pty_ev     (this, &rxvt_term::pty_cb),
-    incr_ev    (this, &rxvt_term::incr_cb)
-{
+  child_ev.set            <rxvt_term, &rxvt_term::child_cb>   (this);
+  prepare_ev.set          <rxvt_term, &rxvt_term::prepare_cb> (this);
+  flush_ev.set            <rxvt_term, &rxvt_term::flush_cb>   (this);
+  destroy_ev.set          <rxvt_term, &rxvt_term::destroy_cb> (this);
+  pty_ev.set              <rxvt_term, &rxvt_term::pty_cb>     (this);
+  incr_ev.set             <rxvt_term, &rxvt_term::incr_cb>    (this);
+  termwin_ev.set          <rxvt_term, &rxvt_term::x_cb>       (this);
+  vt_ev.set               <rxvt_term, &rxvt_term::x_cb>       (this);
+
   cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
 
   termlist.push_back (this);
@@ -331,7 +329,7 @@
 void
 rxvt_term::destroy ()
 {
-  if (destroy_ev.active)
+  if (ev_is_active (&destroy_ev))
     return;
 
   HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
@@ -602,21 +600,23 @@
   /*
    * Catch a fatal signal and tidy up before quitting
    */
-  void
-  sig_term (ev::sig &w, int revents)
-  {
-    rxvt_emergency_cleanup ();
-    w.stop ();
-    kill (getpid (), w.signum);
-  }
+  void sig_term (ev::sig &w, int revents);
 
   sig_handlers ()
-  : sw_term (this, &sig_handlers::sig_term),
-    sw_int  (this, &sig_handlers::sig_term)
   {
+    sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
+    sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
   }
 } sig_handlers;
 
+void
+sig_handlers::sig_term (ev::sig &w, int revents)
+{
+  rxvt_emergency_cleanup ();
+  w.stop ();
+  kill (getpid (), w.signum);
+}
+
 char **rxvt_environ; // startup environment
 
 void
@@ -829,7 +829,7 @@
   (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
 
 #if 0
-  // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
+  // TIOCSWINSZ is supposed to do this automatically and correctly
   if (cmd_pid)               /* force through to the command */
     kill (-cmd_pid, SIGWINCH);
 #endif
@@ -1037,7 +1037,7 @@
 rxvt_term::set_colorfgbg ()
 {
   unsigned int i;
-  const char *xpmb = "\0";
+  const char *xpmb = "";
   char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
 
   strcpy (fstr, "default");
@@ -1747,12 +1747,13 @@
 #ifdef HAVE_BG_PIXMAP
 # if TRACE_PIXMAPS
 #  undef update_background
-int rxvt_term::trace_update_background (const char* file, int line)
+int rxvt_term::trace_update_background (const char *file, int line)
 {
   fprintf (stderr, "%s:%d:update_background()\n", file, line);
   update_background ();
 }
 # endif
+
 int
 rxvt_term::update_background ()
 {