ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.442 by sf-exg, Sat Mar 30 08:47:06 2013 UTC vs.
Revision 1.445 by sf-exg, Fri Apr 12 07:54:15 2013 UTC

1897 * the top of the screen 1897 * the top of the screen
1898 */ 1898 */
1899void 1899void
1900rxvt_term::scr_move_to (int y, int len) NOTHROW 1900rxvt_term::scr_move_to (int y, int len) NOTHROW
1901{ 1901{
1902 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1902 // lerp (y, 0, len, top_row, nrow - 1)
1903 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1903} 1904}
1904 1905
1905/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1906/* 1907/*
1907 * Page the screen up/down nlines 1908 * Page the screen up/down nlines
2678 2679
2679void 2680void
2680rxvt_term::selection_changed () NOTHROW 2681rxvt_term::selection_changed () NOTHROW
2681{ 2682{
2682 line_t &r1 = ROW (selection.beg.row); 2683 line_t &r1 = ROW (selection.beg.row);
2683 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) 2684 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2684 --selection.beg.col; 2685 ++selection.beg.col;
2685 2686
2686 line_t &r2 = ROW (selection.end.row); 2687 line_t &r2 = ROW (selection.end.row);
2687 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) 2688 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2688 ++selection.end.col; 2689 ++selection.end.col;
2689 2690
3072 break; 3073 break;
3073 } 3074 }
3074 3075
3075 if (dirn == DN) 3076 if (dirn == DN)
3076 col++; /* put us on one past the end */ 3077 col++; /* put us on one past the end */
3077 else
3078 {
3079 // if the delimiter on the left has width > 1 col points to the
3080 // first NOCHAR in the delimiter cell and so we must move it to the
3081 // beginning of the next cell.
3082 while (ROW(row).t[col] == NOCHAR)
3083 col++;
3084 }
3085 3078
3086 /* Poke the values back in */ 3079 /* Poke the values back in */
3087 ret->row = row; 3080 ret->row = row;
3088 ret->col = col; 3081 ret->col = col;
3089} 3082}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines