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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.224 by root, Thu Jan 12 03:32:56 2006 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC

   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);
     }
     {
       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)
   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));

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.224 by root, Thu Jan 12 03:32:56 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.224 by root, Thu Jan 12 03:32:56 2006 UTC vs.
Revision 1.227 by root, Sun Jan 15 05:14:12 2006 UTC