--- rxvt-unicode/src/main.C	2007/12/11 11:39:06	1.273
+++ rxvt-unicode/src/main.C	2007/12/14 06:32:38	1.285
@@ -13,7 +13,7 @@
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 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
@@ -40,7 +40,7 @@
 #include <csignal>
 #include <cstring>
 
-# include <termios.h>
+#include <termios.h>
 
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
@@ -157,10 +157,10 @@
   update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
 #endif
 #ifdef CURSOR_BLINK
-  cursor_blink_ev.set     <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
+  cursor_blink_ev.set     <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
 #endif
 #ifdef TEXT_BLINK
-  text_blink_ev.set       <rxvt_term, &rxvt_term::text_blink_cb>   (this);
+  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.set      <rxvt_term, &rxvt_term::cont_scroll_cb>  (this);
@@ -187,7 +187,6 @@
   bell_ev.set             <rxvt_term, &rxvt_term::bell_cb>    (this);
 #endif
   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);
@@ -329,7 +328,7 @@
 void
 rxvt_term::destroy ()
 {
-  if (ev_is_active (&destroy_ev))
+  if (destroy_ev.is_active ())
     return;
 
   HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
@@ -354,7 +353,7 @@
       vt_ev.stop (display);
     }
 
-  prepare_ev.stop ();
+  flush_ev.stop ();
   pty_ev.stop ();
 #ifdef CURSOR_BLINK
   cursor_blink_ev.stop ();
@@ -475,7 +474,7 @@
 }
 
 /*----------------------------------------------------------------------*/
-bool
+void
 rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 {
   this->envv = envv;
@@ -484,8 +483,7 @@
   set_locale ("");
   set_environ (envv); // few things in X do not call setlocale :(
 
-  if (!init_vars ())
-    return false;
+  init_vars ();
 
   init_secondary ();
 
@@ -573,8 +571,6 @@
   if (pty->pty >= 0)
     pty_ev.start (pty->pty, ev::READ);
 
-  prepare_ev.start ();
-
   HOOK_INVOKE ((this, HOOK_START, DT_END));
 
 #if ENABLE_XEMBED
@@ -589,8 +585,6 @@
 
   XMapWindow (dpy, vt);
   XMapWindow (dpy, parent[0]);
-
-  return true;
 }
 
 static struct sig_handlers
@@ -829,7 +823,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
@@ -1766,7 +1760,7 @@
     {
       update_background_ev.stop ();
 
-      if (!bgPixmap.need_client_side_rendering())
+      if (!bgPixmap.need_client_side_rendering ())
         update_background_ev.start (.05);
       else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
         update_background_ev.start (.20); /* very slow !!! */
@@ -1780,7 +1774,9 @@
 void
 rxvt_term::update_background_cb (ev::timer &w, int revents)
 {
+  make_current ();
   bgPixmap.render ();
+  refresh_check ();
 }
 
 #endif /* HAVE_BG_PIXMAP */