--- rxvt-unicode/src/rxvtperl.xs	2007/11/11 04:08:00	1.116
+++ rxvt-unicode/src/rxvtperl.xs	2008/01/25 16:04:57	1.120
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2005-2008 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
@@ -42,7 +42,7 @@
 #include "perlxsi.c"
 
 #ifdef HAVE_SCROLLBARS
-# define GRAB_CURSOR THIS->leftptr_cursor
+# define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
 #else
 # define GRAB_CURSOR None
 #endif
@@ -216,6 +216,7 @@
   av_push (overlay_av, newSViv ((long)this));
 
   THIS->want_refresh = 1;
+  THIS->refresh_check ();
 }
 
 void
@@ -239,6 +240,7 @@
   overlay_av = 0;
 
   THIS->want_refresh = 1;
+  THIS->refresh_check ();
 }
 
 void overlay::swap ()
@@ -293,13 +295,14 @@
     }
 
   THIS->want_refresh = 1;
+  THIS->refresh_check ();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 #define IOM_CLASS "urxvt"
 #define IOM_WARN rxvt_warn
-#include <iom_perl.h>
+#include "iom_perl.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -859,19 +862,12 @@
 
         envv->push_back (0);
 
-        bool success;
-
         try
           {
-            success = term->init (argv, envv);
+            term->init (argv, envv);
           }
         catch (const class rxvt_failure_exception &e)
           {
-            success = false;
-          }
-
-        if (!success)
-          {
             term->destroy ();
             croak ("error while initializing new terminal instance");
           }
@@ -1233,6 +1229,7 @@
 rxvt_term::want_refresh ()
 	CODE:
         THIS->want_refresh = 1;
+	THIS->refresh_check ();
 
 void
 rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
@@ -1478,7 +1475,7 @@
           {
             THIS->set_option (optval, set);
 
-            if (THIS->prepare_ev.is_active ()) // avoid doing this before START
+            if (THIS->env_colorfgbg [0]) // avoid doing this before START
               switch (optval)
                 {
                   case Opt_skipBuiltinGlyphs:
@@ -1486,10 +1483,12 @@
                     THIS->scr_remap_chars ();
                     THIS->scr_touch (true);
                     THIS->want_refresh = 1;
+                    THIS->refresh_check ();
                     break;
 
                   case Opt_cursorUnderline:
                     THIS->want_refresh = 1;
+                    THIS->refresh_check ();
                     break;
 
 #                  case Opt_scrollBar_floating:
@@ -1557,7 +1556,10 @@
             clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
 
             if (ix)
-              THIS->want_refresh = 1;
+              {
+                THIS->want_refresh = 1;
+                THIS->refresh_check ();
+              }
           }
 }