--- rxvt-unicode/src/screen.C	2005/12/26 21:30:04	1.194
+++ rxvt-unicode/src/screen.C	2005/12/27 01:54:08	1.200
@@ -353,7 +353,14 @@
                     }
                 }
 
-              qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
+              qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
+#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
+              if (qline->l < 0)
+                {
+                  fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
+                  qline->l = 0;
+                }
+#endif
               scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
             }
           while (p != pend && q > 0);
@@ -632,7 +639,10 @@
         }
 
       for (int i = count; i--; )
-        scr_blank_screen_mem (ROW(row2 - i), rstyle);
+        {
+          ROW(row2 - i).l = 0;
+          scr_blank_screen_mem (ROW(row2 - i), rstyle);
+        }
       
       if ((options & Opt_scrollWithBuffer)
           && view_start != 0
@@ -735,7 +745,7 @@
 
       if (c < 0x20)
         if (c == C0_LF)
-          {          
+          {
             if (!line->is_longer ())      /* XXX: think about this */
               max_it (line->l, screen.cur.col);
 
@@ -1285,8 +1295,8 @@
 
   for (; num--; row++)
     {
-      scr_blank_screen_mem (ROW (row), rstyle);
       ROW (row).l = 0;
+      scr_blank_screen_mem (ROW (row), rstyle);
       scr_blank_line (drawn_buf [row], 0, ncol, ren);
     }
 }
@@ -2182,7 +2192,7 @@
           int fore = GET_FGCOLOR (rend); // desired foreground
           int back = GET_BGCOLOR (rend); // desired background
 
-          // only do special processing if any attributes are set, which is rare
+          // only do special processing if any attributes are set, which is unlikely
           if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
             {
 #if ENABLE_STYLES
@@ -2440,8 +2450,16 @@
       if (selection.rect)
         {
           for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
-            for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
-              srp[col] ^= RS_RVid;
+            {
+              text_t *stp = ROW(row).t;
+              rend_t *srp = ROW(row).r;
+
+              for (col = selection.beg.col; col < selection.end.col; col++)
+                srp[col] ^= RS_RVid;
+
+              while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
+                srp[col] ^= RS_RVid | RS_Uline;
+            }
         }
       else
 #endif
@@ -2454,7 +2472,7 @@
           else
             {
               col = 0;
-              row = view_start;
+              row = -view_start;
             }
 
           for (; row < min (selection.end.row, view_end); row++, col = 0)
@@ -2878,8 +2896,12 @@
 
       col = max (col, 0);
 
-      if (row == selection.end.row || selection.rect)
-        end_col = min (end_col, selection.end.col);
+      if (row == selection.end.row
+#if ENABLE_FRILLS
+          || selection.rect
+#endif
+          )
+        min_it (end_col, selection.end.col);
 
       t = ROW(row).t + col;
       for (; col < end_col; col++)
@@ -2907,8 +2929,20 @@
             new_selection_text[ofs++] = *t++;
         }
 
-      if (!ROW(row).is_longer () && row != selection.end.row)
-        new_selection_text[ofs++] = C0_LF;
+#if ENABLE_FRILLS
+      if (selection.rect)
+        {
+          while (ofs
+                 && new_selection_text[ofs - 1] != C0_LF
+                 && unicode::is_space (new_selection_text[ofs - 1]))
+            --ofs;
+
+          new_selection_text[ofs++] = C0_LF;
+        }
+      else
+#endif
+        if (!ROW(row).is_longer () && row != selection.end.row)
+          new_selection_text[ofs++] = C0_LF;
     }
 
   if (end_col != selection.end.col)
@@ -3340,9 +3374,8 @@
 
       while (--end_col >= 0)
         {
-          if (stp[end_col] != ' '
-              && stp[end_col] != '\t'
-              && stp[end_col] != NOCHAR)
+          if (stp[end_col] != NOCHAR
+              && !unicode::is_space (stp[end_col]))
             break;
         }
 
@@ -3668,8 +3701,8 @@
       text_t *t1 = ov_text[y];
       rend_t *r1 = ov_rend[y];
 
-      text_t *t2 = ROW(y - view_start).t + ov_x;
-      rend_t *r2 = ROW(y - view_start).r + ov_x;
+      text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
+      rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
 
       for (int x = ov_w; x--; )
         {