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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.384 by sf-exg, Mon May 30 18:39:04 2011 UTC vs.
Revision 1.400 by sf-exg, Tue Nov 15 02:24:25 2011 UTC

       term_start = 0;
       talloc = new rxvt_salloc (ncol * sizeof (text_t));
       ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
-      row_buf   = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
+      row_buf   = (line_t *)rxvt_calloc (total_rows       , sizeof (line_t));
       drawn_buf = (line_t *)rxvt_calloc (nrow             , sizeof (line_t));
       swap_buf  = (line_t *)rxvt_calloc (nrow             , sizeof (line_t));
       for (int row = nrow; row--; )
         {
           swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
           drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
         }
       line_t *old_buf = row_buf;
-      row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
+      row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
       int pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
   if (count > 0
       && row1 == 0
       && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
     {
+      min_it (count, total_rows - (nrow - (row2 + 1)));
       top_row = max (top_row - count, -saveLines);
-      // scroll everything up 'count' lines
-      term_start = (term_start + count) % total_rows;
       // sever bottommost line
       {
-        line_t &l = ROW(row2 - count);
+        line_t &l = ROW(row2);
         l.is_longer (0);
         l.touch ();
       }
+      // scroll everything up 'count' lines
+      term_start = (term_start + count) % total_rows;
+      // 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 ();
+        }
       // erase newly scrolled-in lines
       for (int i = count; i--; )
         {
-          line_t &l = ROW(nrow - 1 - i);
+          line_t &l = ROW(row2 - i);
-          // optimize if already cleared, can be significant on slow machines
+          // optimise if already cleared, can be significant on slow machines
           // could be rolled into scr_blank_screen_mem
           if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
             {
               scr_blank_line (l, 0, l.l, rstyle);
               l.l = 0;
             }
           else
             scr_blank_screen_mem (l, rstyle);
         }
-      // 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;
-          if (selection.beg.row < top_row
+          selection_check (0);
-              || selection.end.row < top_row
-              || selection.mark.row < top_row)
-            {
-              CLEAR_ALL_SELECTION ();
-              selection.op = SELECTION_CLEAR;
-            }
         }
       // finally move the view window, if desired
       if (option (Opt_scrollWithBuffer)
           && view_start != 0
         }
       // use a simple and robust scrolling algorithm, this
       // part of scr_scroll_text is not time-critical.
+      // sever line above scroll region
+      if (row1)
+        {
+          line_t &l = ROW(row1 - 1);
+          l.is_longer (0);
+          l.touch ();
+        }
       int rows = row2 - row1 + 1;
       min_it (count, rows);
-      line_t *temp_buf = row_buf + total_rows;
+      line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
       for (int row = 0; row < rows; row++)
         {
           temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
             scr_blank_screen_mem (temp_buf [row], rstyle);
         }
       for (int row = 0; row < rows; row++)
         ROW(row1 + row) = temp_buf [row];
+      // sever bottommost line
+      {
+        line_t &l = ROW(row2);
+        l.is_longer (0);
+        l.touch ();
+      }
     }
   return count;
 }
     {
       if (transparent)
         XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
       else
         XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
-      scrollBar.state = STATE_IDLE;
+      scrollBar.state = SB_STATE_IDLE;
       scrollBar.show (0);
     }
   if (refresh)
     {
  *                           CHARACTER SELECTION                             *
  * ------------------------------------------------------------------------- */
 void
 rxvt_term::selection_check (int check_more) NOTHROW
 {
-  row_col_t pos;
   if (!selection.op)
     return;
+  row_col_t pos;
   pos.row = pos.col = 0;
   if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
       || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
       || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
       || (check_more == 1
           && current_screen == selection.screen
           && ROWCOL_IS_BEFORE (screen.cur, selection.end))
       || (check_more == 2
           && ROWCOL_IS_BEFORE (selection.beg, pos)
           && ROWCOL_IS_AFTER (selection.end, pos))
       || (check_more == 3
-          && ROWCOL_IS_AFTER (selection.end, pos))
+          && ROWCOL_IS_AFTER (selection.end, pos)))
-      || (check_more == 4     /* screen width change */
-          && (selection.beg.row != selection.end.row
-              || selection.end.col > ncol)))
-    CLEAR_SELECTION ();
+    CLEAR_ALL_SELECTION ();
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Paste a selection direct to the command fd

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.384 by sf-exg, Mon May 30 18:39:04 2011 UTC vs. Revision 1.400 by sf-exg, Tue Nov 15 02:24:25 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.384 by sf-exg, Mon May 30 18:39:04 2011 UTC vs.
Revision 1.400 by sf-exg, Tue Nov 15 02:24:25 2011 UTC