[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.218 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC

  * Change the colour for following text
  */
 void
 rxvt_term::scr_color (unsigned int color, int fgbg)
 {
-  if (color > maxTermCOLOR)
+  if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
     color = fgbg;
   if (fgbg == Color_fg)
     rstyle = SET_FGCOLOR (rstyle, color);
   else
   want_refresh = 1;
   num_scr += count;
   if (count > 0
       && row1 == 0
-      && row2 == nrow - 1
       && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
     {
       nsaved = min (nsaved + count, saveLines);
       HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
+      // scroll everything up 'count' lines
       term_start = (term_start + count) % total_rows;
+      {
+        // severe bottommost scrolled line
+        line_t &l = ROW(row2 - count);
+        l.touch ();
+        l.is_longer (0);
+      }
+      // erase newly scorlled-in lines
+      for (int i = count; i; --i )
+        {
+          // basically this is a slightly optimized scr_blank_screen_mem
+          // it is worth the effort on slower machines
+          line_t &l = ROW(nrow - i);
+          scr_blank_line (l, 0, l.l, rstyle);
+          l.l = 0;
+          l.f = 0;
+        }
+      // now copy lines below the scroll region bottom to the
+      // bottom of the screen again, so they look as if they
+      // hadn't moved.
+      for (int i = nrow; --i > row2; )
+        {
+          line_t &l1 = ROW(i - count);
+          line_t &l2 = ROW(i);
+          ::swap (l1, l2);
+          l2.touch ();
+        }
+      // move and/or clear selection, if any
       if (selection.op && current_screen == selection.screen)
         {
           selection.beg.row  -= count;
           selection.end.row  -= count;
           selection.mark.row -= count;
               CLEAR_ALL_SELECTION ();
               selection.op = SELECTION_CLEAR;
             }
         }
-      for (int i = count; i--; )
+      // finally move the view window, if desired
-        {
-          // basically thi is a slightly optimized scr_blank_screen_mem
-          // it is worth the effort on slower machines
-          line_t &l = ROW(row2 - i);
-          scr_blank_line (l, 0, l.l, rstyle);
-          l.l = 0;
-          l.f = 0;
-        }
       if (OPTION (Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != saveLines)
         scr_page (UP, count);
     }
   /*
    * H: cleanup selection
    */
   scr_reverse_selection ();
-  if (refresh_type & SMOOTH_REFRESH)
-    XFlush (display->display);
   num_scr = 0;
   num_scr_allow = 1;
 }
 void
   if (really)
     XClearWindow (display->display, vt);
 }
+void
+rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
+{
+  int view_end = -view_start + nrow;
+  int row, col;
+  for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
+    {
+      text_t *stp = ROW(row).t;
+      rend_t *srp = ROW(row).r;
+      for (col = beg_col; col < end_col; col++)
+        srp[col] ^= rstyle1;
+      while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
+        srp[col] ^= rstyle2;
+      if (++col < end_col)
+        srp[col] ^= rstyle2;
+    }
+}
+void
+rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
+{
+  int view_end = -view_start + nrow;
+  int row, col;
+  if (beg_row >= -view_start)
+    {
+      col = beg_col;
+      row = beg_row;
+    }
+  else
+    {
+      col = 0;
+      row = -view_start;
+    }
+  for (; row < min (end_row, view_end); row++, col = 0)
+    for (rend_t *srp = ROW(row).r; col < ncol; col++)
+      srp[col] ^= rstyle;
+  if (row == end_row)
+    for (rend_t *srp = ROW(row).r; col < end_col; col++)
+      srp[col] ^= rstyle;
+}
 /* ------------------------------------------------------------------------- */
 void
 rxvt_term::scr_reverse_selection ()
 {
   if (selection.op
       && current_screen == selection.screen
       && selection.end.row >= -view_start)
     {
-      int view_end = -view_start + nrow;
-      int row, col;
 #if ENABLE_FRILLS
       if (selection.rect)
-        {
+        scr_xor_rect (selection.beg.row, selection.beg.col,
-          for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
+                      selection.end.row, selection.end.col,
-            {
+                      RS_RVid, RS_RVid | RS_Uline);
-              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;
-              if (++col < selection.end.col)
-                srp[col] ^= RS_RVid | RS_Uline;
-            }
-        }
       else
 #endif
-        {
+        scr_xor_span (selection.beg.row, selection.beg.col,
-          if (selection.beg.row >= -view_start)
+                      selection.end.row, selection.end.col,
-            {
+                      RS_RVid);
-              col = selection.beg.col;
-              row = selection.beg.row;
-            }
-          else
-            {
-              col = 0;
-              row = -view_start;
-            }
-          for (; row < min (selection.end.row, view_end); row++, col = 0)
-            for (rend_t *srp = ROW(row).r; col < ncol; col++)
-              srp[col] ^= RS_RVid;
-          if (row == selection.end.row)
-            for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
-              srp[col] ^= RS_RVid;
-        }
     }
 }
 /* ------------------------------------------------------------------------- */
 /*
     {
       display->set_selection_owner (this);
       return true;
     }
   else
+    {
+      selection_clear ();
-    return false;
+      return false;
+    }
 #if 0
   XTextProperty ct;
   if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
 void
 rxvt_term::selection_click (int clicks, int x, int y)
 {
   clicks = ((clicks - 1) % 3) + 1;
   selection.clicks = clicks;       /* save clicks so extend will work */
+  if (clicks == 2 && !selection.rect
+      && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
+    {
+      MEvent.clicks = 1; // what a mess
+      selection.screen = current_screen;
+      selection.op = SELECTION_CONT;
+      return;
+    }
   selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
   if (clicks == 2 || clicks == 3)
     selection_extend_colrow (selection.mark.col,
   else if (selection.clicks == 2)
     {
       if (ROWCOL_IS_AFTER (selection.end, selection.beg))
         selection.end.col--;
-      if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
-        {
-          selection_delimit_word (UP, &selection.beg, &selection.beg);
+      selection_delimit_word (UP, &selection.beg, &selection.beg);
-          selection_delimit_word (DN, &selection.end, &selection.end);
+      selection_delimit_word (DN, &selection.end, &selection.end);
-        }
     }
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
       if (OPTION (Opt_tripleclickwords))

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.218 by root, Mon Jan 9 22:41:41 2006 UTC vs. Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.218 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC