--- rxvt-unicode/src/command.C	2012/12/29 15:59:51	1.528
+++ rxvt-unicode/src/command.C	2013/03/26 14:16:46	1.534
@@ -1474,7 +1474,7 @@
             if (bg_window_position_sensitive ())
               {
                 want_position_change = true;
-                if (!(bg_flags & BG_IS_VALID))
+                if (bg_img == 0)
                   moved = true;
               }
 #endif
@@ -1531,19 +1531,14 @@
 
       case MapNotify:
 #ifdef HAVE_BG_PIXMAP
-        /* This is needed specifically to fix the case of no window manager or a
-         * non-reparenting window manager. In those cases we never get first
-         * ConfigureNotify. Also that speeds startup under normal WM, by taking
-         * care of multiplicity of ConfigureNotify events arriving while WM does
-         * reparenting.
-         * We should not render background immediately, as there could be several
-         * ConfigureNotify's to follow. Lets take care of all of them in one scoop
-         * by scheduling background redraw as soon as we can, but giving a short
-         * bit of time for ConfigureNotifies to arrive.
-         * We should render background PRIOR to drawing any text, but AFTER all
-         * of ConfigureNotifys for the best results.
-         */
-        if (!(bg_flags & BG_IS_VALID))
+        // This is needed at startup for the case of no window manager
+        // or a non-reparenting window manager and also because we
+        // defer bg image updates if the window is not mapped. The
+        // short delay is to optimize for multiple ConfigureNotify
+        // events at startup when the window manager reparents the
+        // window, so as to perform the computation after we have
+        // received all of them.
+        if (bg_img == 0)
           update_background_ev.start (0.025);
 #endif
         mapped = 1;
@@ -1861,12 +1856,13 @@
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
 #if BG_IMAGE_FROM_ROOT
-            bg_set_root_pixmap ();
-            update_background ();
+            if (option (Opt_transparent))
+              {
+                rxvt_img::new_from_root (this)->replace (root_img);
+                update_background ();
+              }
 #endif
-#if ENABLE_PERL
             HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
-#endif
           }
 
         break;
@@ -2805,7 +2801,7 @@
 void ecb_hot
 rxvt_term::process_csi_seq ()
 {
-  unicode_t ch, priv, i;
+  unicode_t ch, priv, prev_ch, i;
   unsigned int nargs, p;
   int n, ndef;
   int arg[ESC_ARGS] = { };
@@ -2821,6 +2817,7 @@
       ch = cmd_getc ();
     }
 
+  prev_ch = 0;
   /* read any numerical arguments */
   for (n = -1; ch < CSI_ICH; )
     {
@@ -2840,6 +2837,7 @@
       else if (IS_CONTROL (ch))
         process_nonprinting (ch);
 
+      prev_ch = ch;
       ch = cmd_getc ();
     }
 
@@ -3083,6 +3081,11 @@
           priv_modes |= PrivMode_LFNL;
         break;
 
+      case CSI_71:		// DESCUSR: set cursor style
+        if (prev_ch == ' ')
+          set_cursor_style (arg[0]);
+        break;
+
         /*
          * PRIVATE USE beyond this point.  All CSI_7? sequences here
          */
@@ -3997,6 +4000,22 @@
         }
     }
 }
+
+void
+rxvt_term::set_cursor_style (int style)
+{
+  if (!IN_RANGE_INC (style, 0, 4))
+    return;
+
+  set_option (Opt_cursorUnderline, style >= 3);
+
+#ifdef CURSOR_BLINK
+  set_option (Opt_cursorBlink, !style || (style & 1));
+  cursor_blink_reset ();
+#endif
+
+  want_refresh = 1;
+}
 /*}}} */
 
 /* ------------------------------------------------------------------------- */