--- rxvt-unicode/src/screen.C	2005/02/21 19:30:58	1.160
+++ rxvt-unicode/src/screen.C	2005/06/22 14:33:23	1.164
@@ -1399,12 +1399,7 @@
   want_refresh = 1;
   ZERO_SCROLLBACK ();
 
-  for (int i = 0; i < TermWin.saveLines; ++i)
-    if (screen.text [i])
-      {
-        screen.tlen[i] = 0;
-        scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
-      }
+  TermWin.nscrolled = 0;
 }
 #endif
 
@@ -2020,16 +2015,6 @@
  * drawn_text/drawn_rend contain the screen information before the update.
  * screen.text/screen.rend contain what the screen will change to.
  */
-
-#define FONT_WIDTH(X, Y)                                                \
-    (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
-#define FONT_RBEAR(X, Y)                                                \
-    (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
-#define FONT_LBEAR(X, Y)                                                \
-    (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
-#define IS_FONT_CHAR(X, Y)                                              \
-    ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
-
 void
 rxvt_term::scr_refresh (unsigned char refresh_type)
 {
@@ -2058,10 +2043,10 @@
   row_offset = TermWin.saveLines - TermWin.view_start;
 
 #if XPM_BACKGROUND
-  must_clear |= (bgPixmap.pixmap != None);
+  must_clear |= bgPixmap.pixmap != None;
 #endif
 #if TRANSPARENT
-  must_clear |= ((options & Opt_transparent) && am_transparent);
+  must_clear |= (options & Opt_transparent) && am_transparent;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
 
@@ -2095,28 +2080,34 @@
 
         if (showcursor && TermWin.focus)
           {
-            *crp ^= RS_RVid;
-#ifndef NO_CURSORCOLOR
-            cc1 = *crp & (RS_fgMask | RS_bgMask);
-            if (ISSET_PIXCOLOR (Color_cursor))
-              ccol1 = Color_cursor;
+            if (options & Opt_cursorUnderline)
+              *crp ^= RS_Uline;
             else
+              {
+                *crp ^= RS_RVid;
+
+#ifndef NO_CURSORCOLOR
+                cc1 = *crp & (RS_fgMask | RS_bgMask);
+                if (ISSET_PIXCOLOR (Color_cursor))
+                  ccol1 = Color_cursor;
+                else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-              ccol1 = GET_FGCOLOR (rstyle);
+                  ccol1 = GET_FGCOLOR (rstyle);
 #else
-              ccol1 = Color_fg;
+                  ccol1 = Color_fg;
 #endif
-            if (ISSET_PIXCOLOR (Color_cursor2))
-              ccol2 = Color_cursor2;
-            else
+                if (ISSET_PIXCOLOR (Color_cursor2))
+                  ccol2 = Color_cursor2;
+                else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-              ccol2 = GET_BGCOLOR (rstyle);
+                  ccol2 = GET_BGCOLOR (rstyle);
 #else
-              ccol2 = Color_bg;
+                  ccol2 = Color_bg;
 #endif
-            *crp = SET_FGCOLOR (*crp, ccol1);
-            *crp = SET_BGCOLOR (*crp, ccol2);
+                *crp = SET_FGCOLOR (*crp, ccol1);
+                *crp = SET_BGCOLOR (*crp, ccol2);
 #endif
+              }
           }
       }
 
@@ -2432,24 +2423,35 @@
     {
       if (TermWin.focus)
         {
-          *crp ^= RS_RVid;
+          if (options & Opt_cursorUnderline)
+            *crp ^= RS_Uline;
+          else
+            {
+              *crp ^= RS_RVid;
 #ifndef NO_CURSORCOLOR
-          *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
+              *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
 #endif
+            }
         }
       else if (oldcursor.row >= 0)
         {
+          int cursorwidth = 1;
+          int col = oldcursor.col;
+
+          while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
+            col--;
+
+          while (col + cursorwidth < TermWin.ncol
+                 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
+            cursorwidth++;
+
 #ifndef NO_CURSORCOLOR
           if (ISSET_PIXCOLOR (Color_cursor))
             XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
 #endif
-          int cursorwidth = 1;
-          while (oldcursor.col + cursorwidth < TermWin.ncol
-                 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
-            cursorwidth++;
 
           XDrawRectangle (display->display, drawBuffer, TermWin.gc,
-                          Col2Pixel (oldcursor.col),
+                          Col2Pixel (col),
                           Row2Pixel (oldcursor.row),
                           (unsigned int) (Width2Pixel (cursorwidth) - 1),
                           (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
@@ -2918,9 +2920,6 @@
 rxvt_term::selection_request_other (Atom target, int selnum)
 {
   Atom sel;
-#ifdef DEBUG_SELECT
-  char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
-#endif
 
   selection_type |= selnum;
 
@@ -3805,6 +3804,22 @@
 }
 
 void
+rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
+{
+  while (*s)
+    {
+      text_t t = *s++;
+      int width = wcwidth (t);
+
+      while (width--)
+        {
+          scr_overlay_set (x++, y, t);
+          t = NOCHAR;
+        }
+    }
+}
+
+void
 rxvt_term::scr_swap_overlay ()
 {
   if (!ov_text)