--- rxvt-unicode/src/screen.C	2005/12/26 23:02:34	1.195
+++ rxvt-unicode/src/screen.C	2005/12/31 17:16:17	1.202
@@ -48,7 +48,7 @@
  *             GENERAL SCREEN AND SELECTION UPDATE ROUTINES                  *
  * ------------------------------------------------------------------------- */
 #define ZERO_SCROLLBACK()                                              \
-    if (options & Opt_scrollTtyOutput)                                 \
+    if (OPTION (Opt_scrollTtyOutput))                                  \
         view_start = 0
 #define CLEAR_SELECTION()                                              \
     selection.beg.row = selection.beg.col                              \
@@ -353,8 +353,14 @@
                     }
                 }
 
-              qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
-              printf ("qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
+              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);
@@ -526,7 +532,7 @@
   screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
 
 #if NSCREENS
-  if (options & Opt_secondaryScreen)
+  if (OPTION (Opt_secondaryScreen))
     {
       num_scr = 0;
 
@@ -540,7 +546,7 @@
     }
   else
 #endif
-    if (options & Opt_secondaryScroll)
+    if (OPTION (Opt_secondaryScroll))
       scr_scroll_text (0, prev_nrow - 1, prev_nrow);
 
   return scrn;
@@ -612,7 +618,7 @@
   if (count > 0
       && row1 == 0
       && row2 == nrow - 1
-      && (current_screen == PRIMARY || options & Opt_secondaryScroll))
+      && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
     {
       nsaved = min (nsaved + count, saveLines);
       term_start = (term_start + count) % total_rows;
@@ -638,7 +644,7 @@
           scr_blank_screen_mem (ROW(row2 - i), rstyle);
         }
       
-      if ((options & Opt_scrollWithBuffer)
+      if (OPTION (Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != saveLines)
         scr_page (UP, count);
@@ -1014,7 +1020,7 @@
 
       // store horizontal tab commands as characters inside the text
       // buffer so they can be selected and pasted.
-      if (ht && options & Opt_pastableTabs)
+      if (ht && OPTION (Opt_pastableTabs))
         {
           base_rend = SET_FONT (base_rend, 0);
 
@@ -1280,7 +1286,7 @@
   else
     {
       ren = rstyle & (RS_fgMask | RS_bgMask);
-      gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
+      gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
       XChangeGC (display->display, gc, GCForeground, &gcvalue);
       ERASE_ROWS (row, num);
       gcvalue.foreground = pix_colors[Color_fg];
@@ -1589,7 +1595,7 @@
       if (bgPixmap.pixmap == None)
 #endif
 #if TRANSPARENT
-        if (! (options & Opt_transparent) || am_transparent == 0)
+        if (! OPTION (Opt_transparent) || am_transparent == 0)
 #endif
           XSetWindowBackground (display->display, vt,
                                pix_colors[Color_bg]);
@@ -1832,12 +1838,12 @@
 
 # ifndef NO_MAPALERT
 #  ifdef MAPALERT_OPTION
-  if (options & Opt_mapAlert)
+  if (OPTION (Opt_mapAlert))
 #  endif
     XMapWindow (display->display, parent[0]);
 # endif
 
-  if (options & Opt_visualBell)
+  if (OPTION (Opt_visualBell))
     {
       scr_rvideo_mode (!rvideo); /* refresh also done */
       rxvt_usleep (VISUAL_BELL_DURATION);
@@ -1938,7 +1944,7 @@
   must_clear |= bgPixmap.pixmap != None;
 #endif
 #if TRANSPARENT
-  must_clear |= (options & Opt_transparent) && am_transparent;
+  must_clear |= OPTION (Opt_transparent) && am_transparent;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
 
@@ -1972,7 +1978,7 @@
 
         if (showcursor && focus)
           {
-            if (options & Opt_cursorUnderline)
+            if (OPTION (Opt_cursorUnderline))
               *crp ^= RS_Uline;
             else
               {
@@ -1984,7 +1990,7 @@
                   ccol1 = Color_cursor;
                 else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-                  ccol1 = GET_FGCOLOR (rstyle);
+                  ccol1 = fgcolor_of (rstyle);
 #else
                   ccol1 = Color_fg;
 #endif
@@ -1992,7 +1998,7 @@
                   ccol2 = Color_cursor2;
                 else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-                  ccol2 = GET_BGCOLOR (rstyle);
+                  ccol2 = bgcolor_of (rstyle);
 #else
                   ccol2 = Color_bg;
 #endif
@@ -2183,10 +2189,10 @@
           /*
            * Determine the attributes for the string
            */
-          int fore = GET_FGCOLOR (rend); // desired foreground
-          int back = GET_BGCOLOR (rend); // desired background
+          int fore = fgcolor_of (rend); // desired foreground
+          int back = bgcolor_of (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
@@ -2315,7 +2321,7 @@
     {
       if (focus)
         {
-          if (options & Opt_cursorUnderline)
+          if (OPTION (Opt_cursorUnderline))
             *crp ^= RS_Uline;
           else
             {
@@ -2444,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
@@ -2882,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++)
@@ -2911,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)
@@ -3273,7 +3303,7 @@
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
-      if (options & Opt_tripleclickwords)
+      if (OPTION (Opt_tripleclickwords))
         {
           selection_delimit_word (UP, &selection.beg, &selection.beg);
 
@@ -3344,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;
         }
 
@@ -3672,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--; )
         {