--- rxvt-unicode/src/screen.C	2013/04/02 21:03:35	1.444
+++ rxvt-unicode/src/screen.C	2015/10/13 08:10:43	1.456
@@ -4,10 +4,11 @@
  *
  * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
  * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2015      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -1013,8 +1014,8 @@
                        && ROW(screen.cur.row - 1).is_longer ())
                 {
                   linep = &ROW(screen.cur.row - 1);
-                  tp = line->t + ncol - 1;
-                  rp = line->r + ncol - 1;
+                  tp = linep->t + ncol - 1;
+                  rp = linep->r + ncol - 1;
                 }
               else
                 continue;
@@ -1899,7 +1900,8 @@
 void
 rxvt_term::scr_move_to (int y, int len) NOTHROW
 {
-  scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
+  // lerp (y, 0, len, top_row, nrow - 1)
+  scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2119,39 +2121,27 @@
           ccol2 = Color_bg;
 #endif
 
-        if (focus)
+        if (focus && cursor_type == 0)
           {
             rend_t rend = cur_rend;
 
-            if (option (Opt_cursorUnderline))
-              rend ^= RS_Uline;
-            else
-              {
-                rend ^= RS_RVid;
-                rend = SET_FGCOLOR (rend, ccol1);
-                rend = SET_BGCOLOR (rend, ccol2);
-              }
+            rend ^= RS_RVid;
+            rend = SET_FGCOLOR (rend, ccol1);
+            rend = SET_BGCOLOR (rend, ccol2);
 
             scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
           }
       }
 
     /* make sure no outline cursor is left around */
-    if (ocrow != -1)
-      {
-        if (screen.cur.row - view_start != ocrow
-            || screen.cur.col != oldcursor.col)
-          {
-            if (ocrow < nrow
-                && oldcursor.col < ncol)
-              drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
-          }
-      }
+    if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
+      drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
 
     // save the current cursor coordinates if the cursor is visible
-    // and the window is unfocused, so as to clear the outline cursor
-    // in the next refresh if the cursor moves
-    if (showcursor && !focus && screen.cur.row - view_start < nrow)
+    // and either the window is unfocused or the cursor style is
+    // underline or vertical bar, so as to clear the outline cursor in
+    // the next refresh if the cursor moves or becomes invisible
+    if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
       {
         oldcursor.row = screen.cur.row - view_start;
         oldcursor.col = screen.cur.col;
@@ -2248,10 +2238,7 @@
       for (col = 0; col < ncol; col++)
         {
           /* compare new text with old - if exactly the same then continue */
-          if (stp[col] == dtp[col]    /* Must match characters to skip. */
-              && (RS_SAME (srp[col], drp[col])    /* Either rendition the same or   */
-                  || (stp[col] == ' ' /* space w/ no background change  */
-                      && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
+          if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
             continue;
 
           // redraw one or more characters
@@ -2457,7 +2444,26 @@
   if (showcursor)
     {
       if (focus)
-        scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
+        {
+          if (cursor_type == 0)
+            scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
+          else if (oldcursor.row >= 0)
+            {
+              XSetForeground (dpy, gc, pix_colors[ccol1]);
+              if (cursor_type == 1)
+                XFillRectangle (dpy, vt, gc,
+                                Col2Pixel (cur_col),
+                                Row2Pixel (oldcursor.row + 1) - 2,
+                                Width2Pixel (1),
+                                2);
+              else
+                XFillRectangle (dpy, vt, gc,
+                                Col2Pixel (cur_col),
+                                Row2Pixel (oldcursor.row),
+                                2,
+                                Height2Pixel (1));
+            }
+        }
       else if (oldcursor.row >= 0)
         {
           XSetForeground (dpy, gc, pix_colors[ccol1]);
@@ -2511,7 +2517,7 @@
 }
 
 void ecb_cold
-rxvt_term::scr_recolour (bool refresh) NOTHROW
+rxvt_term::scr_recolor (bool refresh) NOTHROW
 {
   bool transparent = false;
 
@@ -2542,7 +2548,7 @@
 
   XClearWindow (dpy, parent);
 
-  if (scrollBar.win)
+  if (scrollBar.state && scrollBar.win)
     {
       if (transparent)
         XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);