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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.219 by root, Mon Jan 9 23:00:07 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
       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] ^= RS_RVid;
+      srp[col] ^= rstyle;
   if (row == end_row)
     for (rend_t *srp = ROW(row).r; col < end_col; col++)
-      srp[col] ^= RS_RVid;
+      srp[col] ^= rstyle;
 }
 /* ------------------------------------------------------------------------- */
 void
 rxvt_term::scr_reverse_selection ()
     {
       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.219 by root, Mon Jan 9 23:00:07 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.219 by root, Mon Jan 9 23:00:07 2006 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC