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.224 by root, Thu Jan 12 03:32:56 2006 UTC vs.
Revision 1.233 by root, Mon Jan 16 06:37:52 2006 UTC

… …
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
… …
179 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
180 { 180 {
181 //TODO//FIXME 181 //TODO//FIXME
182 saveLines++; 182 saveLines++;
183 prev_nrow--; 183 prev_nrow--;
184 nsaved++; 184 top_row--;
185 } 185 }
186 186
187 want_refresh = 1; 187 want_refresh = 1;
188 188
189 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
195 if (!row_buf) 195 if (!row_buf)
196 { 196 {
197 /* 197 /*
198 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
199 */ 199 */
200 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
201 term_start = 0; 201 term_start = 0;
202 202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 205
… …
276 276
277 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
283 283
284 if (nsaved) 284 if (top_row)
285 { 285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 288
289 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 363 }
364 while (p != pend && q > 0); 364 while (p != pend && q > 0);
365 365
366 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
367 nsaved = term_start - q; 367 top_row = q - term_start;
368 368
369 // make sure all terminal lines exist 369 // make sure all terminal lines exist
370 while (nsaved < 0) 370 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 372 }
373 else 373 else
374 { 374 {
375 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
376 376
… …
390 390
391 term_start = 0; 391 term_start = 0;
392 } 392 }
393 393
394#ifdef DEBUG_STRICT //TODO: remove 394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++) 395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t); 396 assert (ROW (i).t);
397#endif 397#endif
398 398
399 free (old_buf); 399 free (old_buf);
400 delete old_ta; 400 delete old_ta;
… …
613 want_refresh = 1; 613 want_refresh = 1;
614 num_scr += count; 614 num_scr += count;
615 615
616 if (count > 0 616 if (count > 0
617 && row1 == 0 617 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 619 {
621 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
622 621
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
624 623
624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
626 626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
627 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
628 { 661 {
629 selection.beg.row -= count; 662 selection.beg.row -= count;
630 selection.end.row -= count; 663 selection.end.row -= count;
631 selection.mark.row -= count; 664 selection.mark.row -= count;
632 665
633 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 667 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
636 { 669 {
637 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
639 } 672 }
640 } 673 }
641 674
642 for (int i = count; i--; ) 675 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
655 && view_start != 0 677 && view_start != 0
656 && view_start != saveLines) 678 && view_start != -saveLines)
657 scr_page (UP, count); 679 scr_page (UP, count);
658 } 680 }
659 else 681 else
660 { 682 {
661 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
… …
738 } 760 }
739 761
740#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 763 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
744#endif 766#endif
745 int row = screen.cur.row; 767 int row = screen.cur.row;
746 768
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 770
… …
1323rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1324{ 1346{
1325 want_refresh = 1; 1347 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1327 1349
1328 nsaved = 0; 1350 top_row = 0;
1329} 1351}
1330#endif 1352#endif
1331 1353
1332/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1333/* 1355/*
… …
1786/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1787/* 1809/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1811 * the top of the screen
1790 */ 1812 */
1791int 1813void
1792rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1793{ 1815{
1794 long p = 0; 1816 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1817}
1810 1818
1811/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1812/* 1820/*
1813 * Page the screen up/down nlines 1821 * Page the screen up/down nlines
1814 * direction should be UP or DN 1822 * direction should be UP or DN
1815 */ 1823 */
1816int 1824bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1825rxvt_term::scr_page (enum page_dirn direction, int nlines)
1818{ 1826{
1819 int n; 1827 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1828 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1829 : view_start + nlines;
1833 }
1834 1830
1835 return scr_changeview (oldviewstart); 1831 return scr_changeview (new_view_start);
1836} 1832}
1837 1833
1838int 1834bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1835rxvt_term::scr_changeview (int new_view_start)
1840{ 1836{
1837 clamp_it (new_view_start, top_row, 0);
1838
1841 if (view_start != oldviewstart) 1839 if (new_view_start == view_start)
1842 { 1840 return false;
1841
1842 num_scr += new_view_start - view_start;
1843 view_start = new_view_start;
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1845 want_refresh = 1; 1845 want_refresh = 1;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848 1846
1849 return (int)view_start - (int)oldviewstart; 1847 return true;
1850} 1848}
1851 1849
1852/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1853void 1851void
1854rxvt_term::scr_bell () 1852rxvt_term::scr_bell ()
… …
1887 if ((fd = popen_printer ()) == NULL) 1885 if ((fd = popen_printer ()) == NULL)
1888 return; 1886 return;
1889 1887
1890 if (fullhist) 1888 if (fullhist)
1891 { 1889 {
1892 nrows = nrow + nsaved; 1890 nrows = nrow - top_row;
1893 row_start = -nsaved; 1891 row_start = top_row;
1894 } 1892 }
1895 else 1893 else
1896 { 1894 {
1897 nrows = nrow; 1895 nrows = nrow;
1898 row_start = -view_start; 1896 row_start = view_start;
1899 } 1897 }
1900 1898
1901 wctomb (0, 0); 1899 wctomb (0, 0);
1902 1900
1903 for (int r1 = 0; r1 < nrows; r1++) 1901 for (int r1 = 0; r1 < nrows; r1++)
… …
2031 2029
2032 /* make sure no outline cursor is left around */ 2030 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2031 setoldcursor = 0;
2034 if (ocrow != -1) 2032 if (ocrow != -1)
2035 { 2033 {
2036 if (screen.cur.row + view_start != ocrow 2034 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2035 || screen.cur.col != oldcursor.col)
2038 { 2036 {
2039 if (ocrow < nrow 2037 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2038 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2039 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2047 else if (!focus)
2050 setoldcursor = 1; 2048 setoldcursor = 1;
2051 2049
2052 if (setoldcursor) 2050 if (setoldcursor)
2053 { 2051 {
2054 if (screen.cur.row + view_start >= nrow) 2052 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2053 oldcursor.row = -1;
2056 else 2054 else
2057 { 2055 {
2058 oldcursor.row = screen.cur.row + view_start; 2056 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2057 oldcursor.col = screen.cur.col;
2060 } 2058 }
2061 } 2059 }
2062 } 2060 }
2063 2061
… …
2085 row = i > 0 ? 0 : j - 1; 2083 row = i > 0 ? 0 : j - 1;
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2085 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2086 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2087 {
2090 line_t s = ROW(row - view_start); 2088 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2089 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2090 line_t d2 = drawn_buf[row + i];
2093 2091
2094 for (nits = 0, col = ncol; col--; ) 2092 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2093 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2133 /* 2131 /*
2134 * E: main pass across every character 2132 * E: main pass across every character
2135 */ 2133 */
2136 for (row = 0; row < nrow; row++) 2134 for (row = 0; row < nrow; row++)
2137 { 2135 {
2138 text_t *stp = ROW(row - view_start).t; 2136 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2137 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2138 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2139 rend_t *drp = drawn_buf[row].r;
2142 2140
2143 /* 2141 /*
2144 * E2: OK, now the real pass 2142 * E2: OK, now the real pass
… …
2457} 2455}
2458 2456
2459void 2457void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2458rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{ 2459{
2462 int view_end = -view_start + nrow; 2460 int view_end = view_start + nrow;
2463 int row, col; 2461 int row, col;
2464 2462
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2463 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 { 2464 {
2467 text_t *stp = ROW(row).t; 2465 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r; 2466 rend_t *srp = ROW(row).r;
2469 2467
2470 for (col = beg_col; col < end_col; col++) 2468 for (col = beg_col; col < end_col; col++)
… …
2479} 2477}
2480 2478
2481void 2479void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2480rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{ 2481{
2484 int view_end = -view_start + nrow; 2482 int view_end = view_start + nrow;
2485 int row, col; 2483 int row, col;
2486 2484
2487 if (beg_row >= -view_start) 2485 if (beg_row >= view_start)
2488 { 2486 {
2489 col = beg_col; 2487 col = beg_col;
2490 row = beg_row; 2488 row = beg_row;
2491 } 2489 }
2492 else 2490 else
2493 { 2491 {
2494 col = 0; 2492 col = 0;
2495 row = -view_start; 2493 row = view_start;
2496 } 2494 }
2497 2495
2498 for (; row < min (end_row, view_end); row++, col = 0) 2496 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle; 2498 srp[col] ^= rstyle;
… …
2508void 2506void
2509rxvt_term::scr_reverse_selection () 2507rxvt_term::scr_reverse_selection ()
2510{ 2508{
2511 if (selection.op 2509 if (selection.op
2512 && current_screen == selection.screen 2510 && current_screen == selection.screen
2513 && selection.end.row >= -view_start) 2511 && selection.end.row >= view_start)
2514 { 2512 {
2515#if ENABLE_FRILLS 2513#if ENABLE_FRILLS
2516 if (selection.rect) 2514 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2515 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2516 selection.end.row, selection.end.col,
… …
2567 2565
2568 if (!selection.op) 2566 if (!selection.op)
2569 return; 2567 return;
2570 2568
2571 pos.row = pos.col = 0; 2569 pos.row = pos.col = 0;
2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2570 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2571 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2572 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575 || (check_more == 1 2573 || (check_more == 1
2576 && current_screen == selection.screen 2574 && current_screen == selection.screen
2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2575 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2576 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2579 || (check_more == 2 2577 || (check_more == 2
… …
3021 { 3019 {
3022 display->set_selection_owner (this); 3020 display->set_selection_owner (this);
3023 return true; 3021 return true;
3024 } 3022 }
3025 else 3023 else
3024 {
3025 selection_clear ();
3026 return false; 3026 return false;
3027 }
3027 3028
3028#if 0 3029#if 0
3029 XTextProperty ct; 3030 XTextProperty ct;
3030 3031
3031 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3032 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3049 3050
3050 if (clicks == 2 && !selection.rect 3051 if (clicks == 2 && !selection.rect
3051 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) 3052 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3052 { 3053 {
3053 MEvent.clicks = 1; // what a mess 3054 MEvent.clicks = 1; // what a mess
3055 selection.screen = current_screen;
3056 selection.op = SELECTION_CONT;
3054 return; 3057 return;
3055 } 3058 }
3056 3059
3057 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3060 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3058 3061
3059 if (clicks == 2 || clicks == 3) 3062 if (clicks == 2 || clicks == 3)
3060 selection_extend_colrow (selection.mark.col, 3063 selection_extend_colrow (selection.mark.col,
3061 selection.mark.row + view_start, 3064 selection.mark.row - view_start,
3062 0, /* button 3 */ 3065 0, /* button 3 */
3063 1, /* button press */ 3066 1, /* button press */
3064 0); /* click change */ 3067 0); /* click change */
3065} 3068}
3066 3069
… …
3071void 3074void
3072rxvt_term::selection_start_colrow (int col, int row) 3075rxvt_term::selection_start_colrow (int col, int row)
3073{ 3076{
3074 want_refresh = 1; 3077 want_refresh = 1;
3075 3078
3076 selection.mark.row = row - view_start; 3079 selection.mark.row = row + view_start;
3077 selection.mark.col = col; 3080 selection.mark.col = col;
3078 3081
3079 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3082 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3080 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3081 3084
3082 while (selection.mark.col > 0 3085 while (selection.mark.col > 0
3083 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3084 --selection.mark.col; 3087 --selection.mark.col;
… …
3112 text_t *stp; 3115 text_t *stp;
3113 rend_t *srp; 3116 rend_t *srp;
3114 3117
3115 if (dirn == UP) 3118 if (dirn == UP)
3116 { 3119 {
3117 bound.row = - nsaved - 1; 3120 bound.row = top_row - 1;
3118 bound.col = 0; 3121 bound.col = 0;
3119 dirnadd = -1; 3122 dirnadd = -1;
3120 } 3123 }
3121 else 3124 else
3122 { 3125 {
… …
3200 * select nothing. Otherwise, if we're to the right of the mark, you have to 3203 * select nothing. Otherwise, if we're to the right of the mark, you have to
3201 * be _past_ a character for it to be selected. 3204 * be _past_ a character for it to be selected.
3202 */ 3205 */
3203 if (((selection.clicks % 3) == 1) && !flag 3206 if (((selection.clicks % 3) == 1) && !flag
3204 && (col == selection.mark.col 3207 && (col == selection.mark.col
3205 && (row == selection.mark.row + view_start))) 3208 && (row == selection.mark.row - view_start)))
3206 { 3209 {
3207 /* select nothing */ 3210 /* select nothing */
3208 selection.beg.row = selection.end.row = 0; 3211 selection.beg.row = selection.end.row = 0;
3209 selection.beg.col = selection.end.col = 0; 3212 selection.beg.col = selection.end.col = 0;
3210 selection.clicks = 4; 3213 selection.clicks = 4;
… …
3265 selection.beg.col = selection.end.col = selection.mark.col; 3268 selection.beg.col = selection.end.col = selection.mark.col;
3266 selection.beg.row = selection.end.row = selection.mark.row; 3269 selection.beg.row = selection.end.row = selection.mark.row;
3267 } 3270 }
3268 3271
3269 pos.col = col; 3272 pos.col = col;
3270 pos.row = row - view_start; 3273 pos.row = view_start + row;
3271 3274
3272 /* 3275 /*
3273 * This is mainly xterm style selection with a couple of differences, mainly 3276 * This is mainly xterm style selection with a couple of differences, mainly
3274 * in the way button3 drag extension works. 3277 * in the way button3 drag extension works.
3275 * We're either doing: button1 drag; button3 press; or button3 drag 3278 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3760 for (int y = ov_h; y--; ) 3763 for (int y = ov_h; y--; )
3761 { 3764 {
3762 text_t *t1 = ov_text[y]; 3765 text_t *t1 = ov_text[y];
3763 rend_t *r1 = ov_rend[y]; 3766 rend_t *r1 = ov_rend[y];
3764 3767
3765 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3768 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3766 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3769 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3767 3770
3768 for (int x = ov_w; x--; ) 3771 for (int x = ov_w; x--; )
3769 { 3772 {
3770 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3773 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3771 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3774 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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