[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC vs.
Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC

             bool moved = false;
 #ifdef HAVE_BG_PIXMAP
             if (bg_window_position_sensitive ())
               {
                 want_position_change = true;
-                if (!(bg_flags & BG_IS_VALID))
+                if (bg_img == 0)
                   moved = true;
               }
 #endif
             if (want_position_change)
         // 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_flags & BG_IS_VALID))
+        if (bg_img == 0)
           update_background_ev.start (0.025);
 #endif
         mapped = 1;
 #ifdef TEXT_BLINK
         text_blink_ev.start ();
          */
         if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
             || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
           {
 #if BG_IMAGE_FROM_ROOT
-            bg_set_root_pixmap ();
+            if (option (Opt_transparent))
+              {
+                rxvt_img::new_from_root (this)->replace (root_img);
-            update_background ();
+                update_background ();
+              }
 #endif
-#if ENABLE_PERL
             HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
-#endif
           }
         break;
     }
   };
 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] = { };
   nargs = 0;
       /* '<' '=' '>' '?' '!' */
       priv = ch;
       ch = cmd_getc ();
     }
+  prev_ch = 0;
   /* read any numerical arguments */
   for (n = -1; ch < CSI_ICH; )
     {
       if (isdigit (ch))
         {
           n = -1;
         }
       else if (IS_CONTROL (ch))
         process_nonprinting (ch);
+      prev_ch = ch;
       ch = cmd_getc ();
     }
   if (ch > CSI_7F)
     return;
       case CSI_SM:		/* 8.3.126: SET MODE */
         if (arg[0] == 4)
           scr_insert_mode (1);
         else if (arg[0] == 20)
           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
          */
             break;
 #endif
         }
     }
 }
+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;
+}
 /*}}} */
 /* ------------------------------------------------------------------------- */
 /*

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC vs. Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC vs.
Revision 1.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC