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.220 by root, Mon Jan 9 23:18:49 2006 UTC vs.
Revision 1.237 by root, Wed Jan 18 11:07:30 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;
… …
448 scr_release (); 448 scr_release ();
449 prev_nrow = prev_ncol = 0; 449 prev_nrow = prev_ncol = 0;
450 scr_reset (); 450 scr_reset ();
451 451
452 scr_clear (true); 452 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 453 scr_refresh ();
454} 454}
455 455
456/* ------------------------------------------------------------------------- * 456/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 457 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 458 * ------------------------------------------------------------------------- */
… …
572 * Change the colour for following text 572 * Change the colour for following text
573 */ 573 */
574void 574void
575rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
576{ 576{
577 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 578 color = fgbg;
579 579
580 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
582 else 582 else
… …
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 // scroll everything up 'count' lines
623 term_start = (term_start + count) % total_rows;
624
625 // sever bottommost line
626 {
627 line_t &l = ROW(row2 - count);
628 l.is_longer (0);
629 l.touch ();
630 }
631
632 // erase newly scrolled-in lines
633 for (int i = count; i--; )
634 {
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - 1 - i);
638
639 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0;
642 l.f = 0;
643 }
644
645 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they
647 // hadn't moved.
648 for (int i = nrow; --i > row2; )
649 {
650 line_t &l1 = ROW(i - count);
651 line_t &l2 = ROW(i);
652
653 ::swap (l1, l2);
654 l2.touch ();
655 }
624 656
625 term_start = (term_start + count) % total_rows; 657 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 658 if (selection.op && current_screen == selection.screen)
628 { 659 {
629 selection.beg.row -= count; 660 selection.beg.row -= count;
630 selection.end.row -= count; 661 selection.end.row -= count;
631 selection.mark.row -= count; 662 selection.mark.row -= count;
632 663
633 if (selection.beg.row < -nsaved 664 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 665 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 666 || selection.mark.row < top_row)
636 { 667 {
637 CLEAR_ALL_SELECTION (); 668 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 669 selection.op = SELECTION_CLEAR;
639 } 670 }
640 } 671 }
641 672
642 for (int i = count; i--; ) 673 // 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) 674 if (OPTION (Opt_scrollWithBuffer)
655 && view_start != 0 675 && view_start != 0
656 && view_start != saveLines) 676 && view_start != -saveLines)
657 scr_page (UP, count); 677 scr_page (UP, count);
678
679 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
680 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 681 }
659 else 682 else
660 { 683 {
661 if (selection.op && current_screen == selection.screen) 684 if (selection.op && current_screen == selection.screen)
662 { 685 {
… …
738 } 761 }
739 762
740#ifdef DEBUG_STRICT 763#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 764 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 765 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 766 && screen.cur.row >= top_row);
744#endif 767#endif
745 int row = screen.cur.row; 768 int row = screen.cur.row;
746 769
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 770 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 771
… …
794 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
795 } 818 }
796 819
797 if (screen.flags & Screen_WrapNext) 820 if (screen.flags & Screen_WrapNext)
798 { 821 {
799 max_it (line->l, ncol);
800 line->is_longer (1);
801
802 scr_do_wrap (); 822 scr_do_wrap ();
803 823
824 line->l = ncol;
825 line->is_longer (1);
826
804 row = screen.cur.row; 827 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
806 } 829 }
807 830
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 831 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
1323rxvt_term::scr_erase_savelines () 1346rxvt_term::scr_erase_savelines ()
1324{ 1347{
1325 want_refresh = 1; 1348 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1349 ZERO_SCROLLBACK ();
1327 1350
1328 nsaved = 0; 1351 top_row = 0;
1329} 1352}
1330#endif 1353#endif
1331 1354
1332/* ------------------------------------------------------------------------- */ 1355/* ------------------------------------------------------------------------- */
1333/* 1356/*
… …
1767 } 1790 }
1768 1791
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1792 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1793 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1794
1795 num_scr_allow = 0;
1796
1772 if (refresh) 1797 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1798 scr_refresh ();
1774} 1799}
1775 1800
1776/* ------------------------------------------------------------------------- */ 1801/* ------------------------------------------------------------------------- */
1777/* 1802/*
1778 * Refresh the entire screen 1803 * Refresh the entire screen
… …
1786/* ------------------------------------------------------------------------- */ 1811/* ------------------------------------------------------------------------- */
1787/* 1812/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1813 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1814 * the top of the screen
1790 */ 1815 */
1791int 1816void
1792rxvt_term::scr_move_to (int y, int len) 1817rxvt_term::scr_move_to (int y, int len)
1793{ 1818{
1794 long p = 0; 1819 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} 1820}
1810 1821
1811/* ------------------------------------------------------------------------- */ 1822/* ------------------------------------------------------------------------- */
1812/* 1823/*
1813 * Page the screen up/down nlines 1824 * Page the screen up/down nlines
1814 * direction should be UP or DN 1825 * direction should be UP or DN
1815 */ 1826 */
1816int 1827bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1828rxvt_term::scr_page (enum page_dirn direction, int nlines)
1818{ 1829{
1819 int n; 1830 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; 1831 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1832 : view_start + nlines;
1833 }
1834 1833
1835 return scr_changeview (oldviewstart); 1834 return scr_changeview (new_view_start);
1836} 1835}
1837 1836
1838int 1837bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1838rxvt_term::scr_changeview (int new_view_start)
1840{ 1839{
1840 clamp_it (new_view_start, top_row, 0);
1841
1841 if (view_start != oldviewstart) 1842 if (new_view_start == view_start)
1842 { 1843 return false;
1844
1845 num_scr += new_view_start - view_start;
1846 view_start = new_view_start;
1847 want_refresh = 1;
1848
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1849 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1850
1845 want_refresh = 1; 1851 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1852}
1851 1853
1852/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1853void 1855void
1854rxvt_term::scr_bell () 1856rxvt_term::scr_bell ()
… …
1887 if ((fd = popen_printer ()) == NULL) 1889 if ((fd = popen_printer ()) == NULL)
1888 return; 1890 return;
1889 1891
1890 if (fullhist) 1892 if (fullhist)
1891 { 1893 {
1892 nrows = nrow + nsaved; 1894 nrows = nrow - top_row;
1893 row_start = -nsaved; 1895 row_start = top_row;
1894 } 1896 }
1895 else 1897 else
1896 { 1898 {
1897 nrows = nrow; 1899 nrows = nrow;
1898 row_start = -view_start; 1900 row_start = view_start;
1899 } 1901 }
1900 1902
1901 wctomb (0, 0); 1903 wctomb (0, 0);
1902 1904
1903 for (int r1 = 0; r1 < nrows; r1++) 1905 for (int r1 = 0; r1 < nrows; r1++)
… …
1935 * Refresh the screen 1937 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 1938 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 1939 * screen.text/screen.rend contain what the screen will change to.
1938 */ 1940 */
1939void 1941void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1942rxvt_term::scr_refresh ()
1941{ 1943{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 1944 unsigned char must_clear, /* use draw_string not draw_image_string */
1943 showcursor; /* show the cursor */ 1945 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 1946 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 1947 ocrow; /* old cursor row */
… …
2031 2033
2032 /* make sure no outline cursor is left around */ 2034 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2035 setoldcursor = 0;
2034 if (ocrow != -1) 2036 if (ocrow != -1)
2035 { 2037 {
2036 if (screen.cur.row + view_start != ocrow 2038 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2039 || screen.cur.col != oldcursor.col)
2038 { 2040 {
2039 if (ocrow < nrow 2041 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2042 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2051 else if (!focus)
2050 setoldcursor = 1; 2052 setoldcursor = 1;
2051 2053
2052 if (setoldcursor) 2054 if (setoldcursor)
2053 { 2055 {
2054 if (screen.cur.row + view_start >= nrow) 2056 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2057 oldcursor.row = -1;
2056 else 2058 else
2057 { 2059 {
2058 oldcursor.row = screen.cur.row + view_start; 2060 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2061 oldcursor.col = screen.cur.col;
2060 } 2062 }
2061 } 2063 }
2062 } 2064 }
2063 2065
… …
2069#ifndef NO_SLOW_LINK_SUPPORT 2071#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2072 /*
2071 * D: CopyArea pass - very useful for slower links 2073 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2074 * This has been deliberately kept simple.
2073 */ 2075 */
2074 i = num_scr;
2075 if (!display->is_local 2076 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2077 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2078 && abs (num_scr) < nrow && !must_clear)
2078 { 2079 {
2079 int16_t nits; 2080 int16_t nits;
2080 int j; 2081 int j;
2081 int len, wlen; 2082 int len, wlen;
2083 dLocal (int, num_scr);
2082 2084
2083 j = nrow; 2085 j = nrow;
2084 wlen = len = -1; 2086 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2087 row = i > 0 ? 0 : j - 1;
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2089 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2091 {
2090 line_t s = ROW(row - view_start); 2092 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2093 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2094 line_t d2 = drawn_buf[row + i];
2093 2095
2094 for (nits = 0, col = ncol; col--; ) 2096 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2097 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2133 /* 2135 /*
2134 * E: main pass across every character 2136 * E: main pass across every character
2135 */ 2137 */
2136 for (row = 0; row < nrow; row++) 2138 for (row = 0; row < nrow; row++)
2137 { 2139 {
2138 text_t *stp = ROW(row - view_start).t; 2140 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2141 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2142 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2143 rend_t *drp = drawn_buf[row].r;
2142 2144
2143 /* 2145 /*
2144 * E2: OK, now the real pass 2146 * E2: OK, now the real pass
… …
2381 /* 2383 /*
2382 * H: cleanup selection 2384 * H: cleanup selection
2383 */ 2385 */
2384 scr_reverse_selection (); 2386 scr_reverse_selection ();
2385 2387
2386 if (refresh_type & SMOOTH_REFRESH)
2387 XFlush (display->display);
2388
2389 num_scr = 0; 2388 num_scr = 0;
2390 num_scr_allow = 1; 2389 num_scr_allow = 1;
2391} 2390}
2392 2391
2393void 2392void
… …
2460} 2459}
2461 2460
2462void 2461void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2464{ 2463{
2465 int view_end = -view_start + nrow; 2464 int view_end = view_start + nrow;
2466 int row, col; 2465 int row, col;
2467 2466
2468 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2469 { 2468 {
2470 text_t *stp = ROW(row).t; 2469 text_t *stp = ROW(row).t;
2471 rend_t *srp = ROW(row).r; 2470 rend_t *srp = ROW(row).r;
2472 2471
2473 for (col = beg_col; col < end_col; col++) 2472 for (col = beg_col; col < end_col; col++)
… …
2482} 2481}
2483 2482
2484void 2483void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2486{ 2485{
2487 int view_end = -view_start + nrow; 2486 int view_end = view_start + nrow;
2488 int row, col; 2487 int row, col;
2489 2488
2490 if (beg_row >= -view_start) 2489 if (beg_row >= view_start)
2491 { 2490 {
2492 col = beg_col; 2491 col = beg_col;
2493 row = beg_row; 2492 row = beg_row;
2494 } 2493 }
2495 else 2494 else
2496 { 2495 {
2497 col = 0; 2496 col = 0;
2498 row = -view_start; 2497 row = view_start;
2499 } 2498 }
2500 2499
2501 for (; row < min (end_row, view_end); row++, col = 0) 2500 for (; row < min (end_row, view_end); row++, col = 0)
2502 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2501 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2503 srp[col] ^= rstyle; 2502 srp[col] ^= rstyle;
… …
2511void 2510void
2512rxvt_term::scr_reverse_selection () 2511rxvt_term::scr_reverse_selection ()
2513{ 2512{
2514 if (selection.op 2513 if (selection.op
2515 && current_screen == selection.screen 2514 && current_screen == selection.screen
2516 && selection.end.row >= -view_start) 2515 && selection.end.row >= view_start)
2517 { 2516 {
2518#if ENABLE_FRILLS 2517#if ENABLE_FRILLS
2519 if (selection.rect) 2518 if (selection.rect)
2520 scr_xor_rect (selection.beg.row, selection.beg.col, 2519 scr_xor_rect (selection.beg.row, selection.beg.col,
2521 selection.end.row, selection.end.col, 2520 selection.end.row, selection.end.col,
… …
2570 2569
2571 if (!selection.op) 2570 if (!selection.op)
2572 return; 2571 return;
2573 2572
2574 pos.row = pos.col = 0; 2573 pos.row = pos.col = 0;
2575 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2576 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2577 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2578 || (check_more == 1 2577 || (check_more == 1
2579 && current_screen == selection.screen 2578 && current_screen == selection.screen
2580 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2581 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2582 || (check_more == 2 2581 || (check_more == 2
… …
3024 { 3023 {
3025 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3026 return true; 3025 return true;
3027 } 3026 }
3028 else 3027 else
3028 {
3029 selection_clear ();
3029 return false; 3030 return false;
3031 }
3030 3032
3031#if 0 3033#if 0
3032 XTextProperty ct; 3034 XTextProperty ct;
3033 3035
3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3048rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
3049{ 3051{
3050 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
3052 3054
3055 if (clicks == 2 && !selection.rect
3056 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3057 {
3058 MEvent.clicks = 1; // what a mess
3059 selection.screen = current_screen;
3060 selection.op = SELECTION_CONT;
3061 return;
3062 }
3063
3053 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3054 3065
3055 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
3056 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
3057 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
3058 0, /* button 3 */ 3069 0, /* button 3 */
3059 1, /* button press */ 3070 1, /* button press */
3060 0); /* click change */ 3071 0); /* click change */
3061} 3072}
3062 3073
… …
3067void 3078void
3068rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
3069{ 3080{
3070 want_refresh = 1; 3081 want_refresh = 1;
3071 3082
3072 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
3073 selection.mark.col = col; 3084 selection.mark.col = col;
3074 3085
3075 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3076 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3077 3088
3078 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
3079 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3080 --selection.mark.col; 3091 --selection.mark.col;
… …
3108 text_t *stp; 3119 text_t *stp;
3109 rend_t *srp; 3120 rend_t *srp;
3110 3121
3111 if (dirn == UP) 3122 if (dirn == UP)
3112 { 3123 {
3113 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
3114 bound.col = 0; 3125 bound.col = 0;
3115 dirnadd = -1; 3126 dirnadd = -1;
3116 } 3127 }
3117 else 3128 else
3118 { 3129 {
… …
3196 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * select nothing. Otherwise, if we're to the right of the mark, you have to
3197 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3198 */ 3209 */
3199 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3200 && (col == selection.mark.col 3211 && (col == selection.mark.col
3201 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3202 { 3213 {
3203 /* select nothing */ 3214 /* select nothing */
3204 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3205 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3206 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3261 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3262 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3263 } 3274 }
3264 3275
3265 pos.col = col; 3276 pos.col = col;
3266 pos.row = row - view_start; 3277 pos.row = view_start + row;
3267 3278
3268 /* 3279 /*
3269 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3270 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3271 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3352 else if (selection.clicks == 2) 3363 else if (selection.clicks == 2)
3353 { 3364 {
3354 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3365 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3355 selection.end.col--; 3366 selection.end.col--;
3356 3367
3357 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3358 {
3359 selection_delimit_word (UP, &selection.beg, &selection.beg); 3368 selection_delimit_word (UP, &selection.beg, &selection.beg);
3360 selection_delimit_word (DN, &selection.end, &selection.end); 3369 selection_delimit_word (DN, &selection.end, &selection.end);
3361 }
3362 } 3370 }
3363 else if (selection.clicks == 3) 3371 else if (selection.clicks == 3)
3364 { 3372 {
3365#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3366 if (OPTION (Opt_tripleclickwords)) 3374 if (OPTION (Opt_tripleclickwords))
… …
3759 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3760 { 3768 {
3761 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3762 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3763 3771
3764 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3765 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3766 3774
3767 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3768 { 3776 {
3769 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3770 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3778 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