--- rxvt-unicode/src/command.C	2014/08/18 07:20:05	1.556
+++ rxvt-unicode/src/command.C	2015/09/12 19:48:26	1.567
@@ -212,7 +212,7 @@
 
   if (y >= 0)
     {
-      y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
+      y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
       x = 0;
     }
 
@@ -1036,13 +1036,16 @@
 void
 rxvt_term::cursor_blink_reset ()
 {
+  if (!focus)
+    return;
+
   if (hidden_cursor)
     {
       hidden_cursor = 0;
       want_refresh = 1;
     }
 
-  if (option (Opt_cursorBlink))
+  if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
     cursor_blink_ev.again ();
   else
     cursor_blink_ev.stop ();
@@ -1241,7 +1244,7 @@
 rxvt_term::pointer_unblank ()
 {
   XDefineCursor (dpy, vt, TermWin_cursor);
-  recolour_cursor ();
+  recolor_cursor ();
 
 #ifdef POINTER_BLANK
   hidden_pointer = 0;
@@ -1611,8 +1614,9 @@
         if (hidden_pointer)
           pointer_unblank ();
 #endif
-        if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
-            || priv_modes & PrivMode_MouseAnyEvent)
+        if (!bypass_keystate
+            && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
+                || priv_modes & PrivMode_MouseAnyEvent))
           mouse_report (ev.xbutton);
         if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
           break;
@@ -1634,9 +1638,9 @@
                                &ev.xbutton.state);
 #ifdef MOUSE_THRESHOLD
                 /* deal with a `jumpy' mouse */
-                if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
-                  {
+                if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
 #endif
+                  {
 #if ISO_14755
                     // 5.4
                     if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
@@ -1695,9 +1699,7 @@
                         sel_scroll_ev.stop();
                       }
 #endif
-#ifdef MOUSE_THRESHOLD
                   }
-#endif
               }
           }
         else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
@@ -1781,7 +1783,7 @@
       if (rs[Rs_fade])
         {
           pix_colors = pix_colors_focused;
-          scr_recolour ();
+          scr_recolor ();
         }
 #endif
 #if ENABLE_FRILLS
@@ -1828,7 +1830,7 @@
       if (rs[Rs_fade])
         {
           pix_colors = pix_colors_unfocused;
-          scr_recolour ();
+          scr_recolor ();
         }
 #endif
 
@@ -1837,11 +1839,14 @@
 }
 
 void ecb_cold
-rxvt_term::update_fade_color (unsigned int idx)
+rxvt_term::update_fade_color (unsigned int idx, bool first_time)
 {
 #if OFF_FOCUS_FADING
   if (rs[Rs_fade])
     {
+      if (!first_time)
+        pix_colors_focused [idx].free (this);
+
       rgba c;
       pix_colors [Color_fade].get (c);
       pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
@@ -2573,13 +2578,13 @@
 
 #ifdef EIGHT_BIT_CONTROLS
       // 8-bit controls
-      case 0x90: 	/* DCS */
+      case 0x90:		/* DCS */
         process_dcs_seq ();
         break;
-      case 0x9b: 	/* CSI */
+      case 0x9b:		/* CSI */
         process_csi_seq ();
         break;
-      case 0x9d: 	/* OSC */
+      case 0x9d:		/* OSC */
         process_osc_seq ();
         break;
 #endif
@@ -3335,7 +3340,7 @@
 
 #if XFT
       if (c.a != rgba::MAX_CC)
-        tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
+        tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
       else
 #endif
         tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
@@ -3682,6 +3687,7 @@
                   { 7, PrivMode_Autowrap },     // DECAWM
                  // 8, auto-repeat keys         // DECARM
                   { 9, PrivMode_MouseX10 },
+                  { 12, PrivMode_BlinkingCursor },
                  // 18 end FF to printer after print screen
                  // 19 Print screen prints full screen/scroll region
                   { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
@@ -3800,6 +3806,11 @@
               scr_touch (true);
               break;
 #endif
+#ifdef CURSOR_BLINK
+            case 12:
+              cursor_blink_reset ();
+              break;
+#endif
             case 25:		/* visible/invisible cursor */
               scr_cursor_visible (state);
               break;
@@ -3914,22 +3925,22 @@
           case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
             rendset = 0, rendstyle = RS_Bold;
             break;
-          case 22: // normal intensity
+          case 22: // bold off (vt220)
             rendset = 0, rendstyle = RS_Bold;
             break;
           case 23: // disable italic
             rendset = 0, rendstyle = RS_Italic;
             break;
-          case 24:
+          case 24: // underline off (vt220)
             rendset = 0, rendstyle = RS_Uline;
             break;
-          case 25:
+          case 25: // blink off (vt220)
             rendset = 0, rendstyle = RS_Blink;
             break;
           case 26: // variable spacing (iso 8613)
             rendset = 0, rendstyle = RS_Blink;
             break;
-          case 27:
+          case 27: // reverse off (vt220)
             rendset = 0, rendstyle = RS_RVid;
             break;
           //case 28: // visible. NYI
@@ -4017,13 +4028,17 @@
 void
 rxvt_term::set_cursor_style (int style)
 {
-  if (!IN_RANGE_INC (style, 0, 4))
+  if (!IN_RANGE_INC (style, 0, 6))
     return;
 
-  set_option (Opt_cursorUnderline, style >= 3);
+  if (style == 0)
+    style = 1;
+
+  cursor_type = (style - 1) / 2;
+  set_option (Opt_cursorUnderline, cursor_type == 1);
 
 #ifdef CURSOR_BLINK
-  set_option (Opt_cursorBlink, !style || (style & 1));
+  set_option (Opt_cursorBlink, style & 1);
   cursor_blink_reset ();
 #endif