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.227 by root, Sun Jan 15 05:14:12 2006 UTC vs.
Revision 1.243 by ayin, Thu Jan 19 23:15:21 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
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0; 239 rvideo = 0;
241 } 240 }
242 else 241 else
243 { 242 {
244 /* 243 /*
… …
276 275
277 line_t *old_buf = row_buf; 276 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 278
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 280 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 281 int q = total_rows; // rewrapped row
283 282
284 if (nsaved) 283 if (top_row)
285 { 284 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 286 // to come up with a lean and mean algorithm.
288 287
289 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
… …
325 qline->l = ncol; 324 qline->l = ncol;
326 qline->is_longer (1); 325 qline->is_longer (1);
327 326
328 int qcol = 0; 327 int qcol = 0;
329 328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
330 // fill a single destination line 333 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
332 { 335 {
333 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
344 347
345 line_t &pline = old_buf [prow]; 348 line_t &pline = old_buf [prow];
346 349
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 351
352#if DEBUG_STRICT
349 assert (len); 353 assert (len);
350 assert (pline.t); 354 assert (pline.t);
355#endif
351 356
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 359
355 lofs += len; 360 lofs += len;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 368 }
364 while (p != pend && q > 0); 369 while (p != pend && q > 0);
365 370
366 term_start = total_rows - nrow; 371 term_start = total_rows - nrow;
367 nsaved = term_start - q; 372 top_row = q - term_start;
368 373
369 // make sure all terminal lines exist 374 // make sure all terminal lines exist
370 while (nsaved < 0) 375 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 377 }
373 else 378 else
374 { 379 {
375 // if no scrollback exists (yet), wing, instead of wrap 380 // if no scrollback exists (yet), wing, instead of wrap
376 381
… …
389 } 394 }
390 395
391 term_start = 0; 396 term_start = 0;
392 } 397 }
393 398
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 399 free (old_buf);
400 delete old_ta; 400 delete old_ta;
401 delete old_ra; 401 delete old_ra;
402 402
403 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
405 405
406 if (tabs) 406 if (tabs)
407 free (tabs); 407 free (tabs);
408 } 408 }
409
410 CLEAR_ALL_SELECTION ();
409 411
410 prev_nrow = nrow; 412 prev_nrow = nrow;
411 prev_ncol = ncol; 413 prev_ncol = ncol;
412 414
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
… …
448 scr_release (); 450 scr_release ();
449 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
450 scr_reset (); 452 scr_reset ();
451 453
452 scr_clear (true); 454 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
454} 456}
455 457
456/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 462 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 465 */
464void 466void
465rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode)
466{ 468{
467 screen_t *s; 469 screen_t *s;
468 470
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
615 617
616 if (count > 0 618 if (count > 0
617 && row1 == 0 619 && row1 == 0
618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
619 { 621 {
620 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
621 623
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
623
624 // scroll everything up 'count' lines 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 // sever bottommost line
627 { 628 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count); 629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
630 l.touch (); 631 l.touch ();
631 l.is_longer (0);
632 } 632 }
633 633
634 // erase newly scorlled-in lines 634 // erase newly scrolled-in lines
635 for (int i = count; i; --i ) 635 for (int i = count; i--; )
636 { 636 {
637 // basically this is a slightly optimized scr_blank_screen_mem 637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines 638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i); 639 line_t &l = ROW(nrow - 1 - i);
640 640
641 scr_blank_line (l, 0, l.l, rstyle); 641 scr_blank_line (l, 0, l.l, rstyle);
642 642
643 l.l = 0; 643 l.l = 0;
644 l.f = 0; 644 l.f = 0;
… …
661 { 661 {
662 selection.beg.row -= count; 662 selection.beg.row -= count;
663 selection.end.row -= count; 663 selection.end.row -= count;
664 selection.mark.row -= count; 664 selection.mark.row -= count;
665 665
666 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
667 || selection.end.row < -nsaved 667 || selection.end.row < top_row
668 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
669 { 669 {
670 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
672 } 672 }
673 } 673 }
674 674
675 // finally move the view window, if desired 675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0 677 && view_start != 0
678 && view_start != saveLines) 678 && view_start != -saveLines)
679 scr_page (UP, count); 679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
680 } 683 }
681 else 684 else
682 { 685 {
683 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen)
684 { 687 {
… …
760 } 763 }
761 764
762#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
763 assert (screen.cur.col < ncol); 766 assert (screen.cur.col < ncol);
764 assert (screen.cur.row < nrow 767 assert (screen.cur.row < nrow
765 && screen.cur.row >= -nsaved); 768 && screen.cur.row >= top_row);
766#endif 769#endif
767 int row = screen.cur.row; 770 int row = screen.cur.row;
768 771
769 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
770 773
… …
816 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
817 } 820 }
818 821
819 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
820 { 823 {
821 max_it (line->l, ncol);
822 line->is_longer (1);
823
824 scr_do_wrap (); 824 scr_do_wrap ();
825 825
826 line->l = ncol;
827 line->is_longer (1);
828
826 row = screen.cur.row; 829 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
828 } 831 }
829 832
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
1345rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines ()
1346{ 1349{
1347 want_refresh = 1; 1350 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1349 1352
1350 nsaved = 0; 1353 top_row = 0;
1351} 1354}
1352#endif 1355#endif
1353 1356
1354/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1355/* 1358/*
… …
1789 } 1792 }
1790 1793
1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793 1796
1797 num_scr_allow = 0;
1798
1794 if (refresh) 1799 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1800 scr_refresh ();
1796} 1801}
1797 1802
1798/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
1799/* 1804/*
1800 * Refresh the entire screen 1805 * Refresh the entire screen
… …
1808/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1809/* 1814/*
1810 * Move the display so that the line represented by scrollbar value Y is at 1815 * Move the display so that the line represented by scrollbar value Y is at
1811 * the top of the screen 1816 * the top of the screen
1812 */ 1817 */
1813int 1818void
1814rxvt_term::scr_move_to (int y, int len) 1819rxvt_term::scr_move_to (int y, int len)
1815{ 1820{
1816 long p = 0; 1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1817 unsigned int oldviewstart;
1818
1819 oldviewstart = view_start;
1820
1821 if (y < len)
1822 {
1823 p = (nrow + nsaved) * (len - y) / len;
1824 p -= (long) (nrow - 1);
1825 p = max (p, 0);
1826 }
1827
1828 view_start = (unsigned int)min (p, nsaved);
1829
1830 return scr_changeview (oldviewstart);
1831} 1822}
1832 1823
1833/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1834/* 1825/*
1835 * Page the screen up/down nlines 1826 * Page the screen up/down nlines
1836 * direction should be UP or DN 1827 * direction should be UP or DN
1837 */ 1828 */
1838int 1829bool
1839rxvt_term::scr_page (enum page_dirn direction, int nlines) 1830rxvt_term::scr_page (enum page_dirn direction, int nlines)
1840{ 1831{
1841 int n; 1832 int new_view_start =
1842 unsigned int oldviewstart;
1843
1844 oldviewstart = view_start;
1845
1846 if (direction == UP)
1847 {
1848 n = view_start + nlines;
1849 view_start = min (n, nsaved);
1850 }
1851 else
1852 {
1853 n = view_start - nlines; 1833 direction == UP ? view_start - nlines
1854 view_start = max (n, 0); 1834 : view_start + nlines;
1855 }
1856 1835
1857 return scr_changeview (oldviewstart); 1836 return scr_changeview (new_view_start);
1858} 1837}
1859 1838
1860int 1839bool
1861rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (int new_view_start)
1862{ 1841{
1842 clamp_it (new_view_start, top_row, 0);
1843
1863 if (view_start != oldviewstart) 1844 if (new_view_start == view_start)
1864 { 1845 return false;
1846
1847 num_scr += new_view_start - view_start;
1848 view_start = new_view_start;
1849 want_refresh = 1;
1850
1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1866 1852
1867 want_refresh = 1; 1853 return true;
1868 num_scr -= (view_start - oldviewstart);
1869 }
1870
1871 return (int)view_start - (int)oldviewstart;
1872} 1854}
1873 1855
1874/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1875void 1857void
1876rxvt_term::scr_bell () 1858rxvt_term::scr_bell ()
… …
1909 if ((fd = popen_printer ()) == NULL) 1891 if ((fd = popen_printer ()) == NULL)
1910 return; 1892 return;
1911 1893
1912 if (fullhist) 1894 if (fullhist)
1913 { 1895 {
1914 nrows = nrow + nsaved; 1896 nrows = nrow - top_row;
1915 row_start = -nsaved; 1897 row_start = top_row;
1916 } 1898 }
1917 else 1899 else
1918 { 1900 {
1919 nrows = nrow; 1901 nrows = nrow;
1920 row_start = -view_start; 1902 row_start = view_start;
1921 } 1903 }
1922 1904
1923 wctomb (0, 0); 1905 wctomb (0, 0);
1924 1906
1925 for (int r1 = 0; r1 < nrows; r1++) 1907 for (int r1 = 0; r1 < nrows; r1++)
… …
1957 * Refresh the screen 1939 * Refresh the screen
1958 * drawn_text/drawn_rend contain the screen information before the update. 1940 * drawn_text/drawn_rend contain the screen information before the update.
1959 * screen.text/screen.rend contain what the screen will change to. 1941 * screen.text/screen.rend contain what the screen will change to.
1960 */ 1942 */
1961void 1943void
1962rxvt_term::scr_refresh (unsigned char refresh_type) 1944rxvt_term::scr_refresh ()
1963{ 1945{
1964 unsigned char must_clear, /* use draw_string not draw_image_string */ 1946 unsigned char must_clear, /* use draw_string not draw_image_string */
1965 showcursor; /* show the cursor */ 1947 showcursor; /* show the cursor */
1966 int16_t col, row, /* column/row we're processing */ 1948 int16_t col, row, /* column/row we're processing */
1967 ocrow; /* old cursor row */ 1949 ocrow; /* old cursor row */
… …
2053 2035
2054 /* make sure no outline cursor is left around */ 2036 /* make sure no outline cursor is left around */
2055 setoldcursor = 0; 2037 setoldcursor = 0;
2056 if (ocrow != -1) 2038 if (ocrow != -1)
2057 { 2039 {
2058 if (screen.cur.row + view_start != ocrow 2040 if (screen.cur.row - view_start != ocrow
2059 || screen.cur.col != oldcursor.col) 2041 || screen.cur.col != oldcursor.col)
2060 { 2042 {
2061 if (ocrow < nrow 2043 if (ocrow < nrow
2062 && oldcursor.col < ncol) 2044 && oldcursor.col < ncol)
2063 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2045 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2071 else if (!focus) 2053 else if (!focus)
2072 setoldcursor = 1; 2054 setoldcursor = 1;
2073 2055
2074 if (setoldcursor) 2056 if (setoldcursor)
2075 { 2057 {
2076 if (screen.cur.row + view_start >= nrow) 2058 if (screen.cur.row - view_start >= nrow)
2077 oldcursor.row = -1; 2059 oldcursor.row = -1;
2078 else 2060 else
2079 { 2061 {
2080 oldcursor.row = screen.cur.row + view_start; 2062 oldcursor.row = screen.cur.row - view_start;
2081 oldcursor.col = screen.cur.col; 2063 oldcursor.col = screen.cur.col;
2082 } 2064 }
2083 } 2065 }
2084 } 2066 }
2085 2067
… …
2091#ifndef NO_SLOW_LINK_SUPPORT 2073#ifndef NO_SLOW_LINK_SUPPORT
2092 /* 2074 /*
2093 * D: CopyArea pass - very useful for slower links 2075 * D: CopyArea pass - very useful for slower links
2094 * This has been deliberately kept simple. 2076 * This has been deliberately kept simple.
2095 */ 2077 */
2096 i = num_scr;
2097 if (!display->is_local 2078 if (!display->is_local
2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2099 && abs (num_scr) < nrow && !must_clear) 2080 && abs (num_scr) < nrow && !must_clear)
2100 { 2081 {
2101 int16_t nits; 2082 int16_t nits;
2102 int j; 2083 int j;
2103 int len, wlen; 2084 int len, wlen;
2085 dLocal (int, num_scr);
2104 2086
2105 j = nrow; 2087 j = nrow;
2106 wlen = len = -1; 2088 wlen = len = -1;
2107 row = i > 0 ? 0 : j - 1; 2089 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2091 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2093 {
2112 line_t s = ROW(row - view_start); 2094 line_t s = ROW(view_start + row);
2113 line_t d = drawn_buf[row]; 2095 line_t d = drawn_buf[row];
2114 line_t d2 = drawn_buf[row + i]; 2096 line_t d2 = drawn_buf[row + i];
2115 2097
2116 for (nits = 0, col = ncol; col--; ) 2098 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2099 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2155 /* 2137 /*
2156 * E: main pass across every character 2138 * E: main pass across every character
2157 */ 2139 */
2158 for (row = 0; row < nrow; row++) 2140 for (row = 0; row < nrow; row++)
2159 { 2141 {
2160 text_t *stp = ROW(row - view_start).t; 2142 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = ROW(row - view_start).r; 2143 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn_buf[row].t; 2144 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn_buf[row].r; 2145 rend_t *drp = drawn_buf[row].r;
2164 2146
2165 /* 2147 /*
2166 * E2: OK, now the real pass 2148 * E2: OK, now the real pass
… …
2479} 2461}
2480 2462
2481void 2463void
2482rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2483{ 2465{
2484 int view_end = -view_start + nrow; 2466 int view_end = view_start + nrow;
2485 int row, col; 2467 int row, col;
2486 2468
2487 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2488 { 2470 {
2489 text_t *stp = ROW(row).t; 2471 text_t *stp = ROW(row).t;
2490 rend_t *srp = ROW(row).r; 2472 rend_t *srp = ROW(row).r;
2491 2473
2492 for (col = beg_col; col < end_col; col++) 2474 for (col = beg_col; col < end_col; col++)
… …
2501} 2483}
2502 2484
2503void 2485void
2504rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2505{ 2487{
2506 int view_end = -view_start + nrow; 2488 int view_end = view_start + nrow;
2507 int row, col; 2489 int row, col;
2508 2490
2509 if (beg_row >= -view_start) 2491 if (beg_row >= view_start)
2510 { 2492 {
2511 col = beg_col; 2493 col = beg_col;
2512 row = beg_row; 2494 row = beg_row;
2513 } 2495 }
2514 else 2496 else
2515 { 2497 {
2516 col = 0; 2498 col = 0;
2517 row = -view_start; 2499 row = view_start;
2518 } 2500 }
2519 2501
2520 for (; row < min (end_row, view_end); row++, col = 0) 2502 for (; row < min (end_row, view_end); row++, col = 0)
2521 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2503 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2522 srp[col] ^= rstyle; 2504 srp[col] ^= rstyle;
… …
2530void 2512void
2531rxvt_term::scr_reverse_selection () 2513rxvt_term::scr_reverse_selection ()
2532{ 2514{
2533 if (selection.op 2515 if (selection.op
2534 && current_screen == selection.screen 2516 && current_screen == selection.screen
2535 && selection.end.row >= -view_start) 2517 && selection.end.row >= view_start)
2536 { 2518 {
2537#if ENABLE_FRILLS 2519#if ENABLE_FRILLS
2538 if (selection.rect) 2520 if (selection.rect)
2539 scr_xor_rect (selection.beg.row, selection.beg.col, 2521 scr_xor_rect (selection.beg.row, selection.beg.col,
2540 selection.end.row, selection.end.col, 2522 selection.end.row, selection.end.col,
… …
2589 2571
2590 if (!selection.op) 2572 if (!selection.op)
2591 return; 2573 return;
2592 2574
2593 pos.row = pos.col = 0; 2575 pos.row = pos.col = 0;
2594 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2595 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2596 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2597 || (check_more == 1 2579 || (check_more == 1
2598 && current_screen == selection.screen 2580 && current_screen == selection.screen
2599 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2600 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2601 || (check_more == 2 2583 || (check_more == 2
… …
2820 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2821 * will auto fallback to CUT_BUFFER0 2803 * will auto fallback to CUT_BUFFER0
2822 * EXT: button 2 release 2804 * EXT: button 2 release
2823 */ 2805 */
2824void 2806void
2825rxvt_term::selection_request (Time tm, int x, int y) 2807rxvt_term::selection_request (Time tm, int selnum)
2826{ 2808{
2827 if (x < 0 || x >= width || y < 0 || y >= height) 2809/* After making a selection with selection_make this function will always
2828 return; /* outside window */ 2810 * return the internal selection, which is not correct IMO, now much more since
2829 2811 * I added the selnum parameter.
2812 */
2813#if 0
2830 if (selection.text) 2814 if (selection.text)
2831 { /* internal selection */ 2815 { /* internal selection */
2832 char *str = rxvt_wcstombs (selection.text, selection.len); 2816 char *str = rxvt_wcstombs (selection.text, selection.len);
2833 paste (str, strlen (str)); 2817 paste (str, strlen (str));
2834 free (str); 2818 free (str);
2835 return; 2819 return;
2836 } 2820 }
2837 else 2821 else
2822#endif
2838 { 2823 {
2839 int i;
2840
2841 selection_request_time = tm; 2824 selection_request_time = tm;
2842 selection_wait = Sel_normal; 2825 selection_wait = Sel_normal;
2843 2826
2844 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2845 {
2846#if X_HAVE_UTF8_STRING 2827#if X_HAVE_UTF8_STRING
2847 selection_type = Sel_UTF8String; 2828 selection_type = Sel_UTF8String;
2848 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2829 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2849 return; 2830 return;
2850#else 2831#else
2851 selection_type = Sel_CompoundText; 2832 selection_type = Sel_CompoundText;
2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2853 return; 2834 return;
2854#endif 2835#endif
2855 }
2856 } 2836 }
2857 2837
2858 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2838 selection_wait = Sel_none; /* don't loop in selection_paste () */
2859 selection_paste (display->root, XA_CUT_BUFFER0, false); 2839 selection_paste (display->root, XA_CUT_BUFFER0, false);
2860} 2840}
… …
3083 3063
3084 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3085 3065
3086 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
3087 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
3088 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
3089 0, /* button 3 */ 3069 0, /* button 3 */
3090 1, /* button press */ 3070 1, /* button press */
3091 0); /* click change */ 3071 0); /* click change */
3092} 3072}
3093 3073
… …
3098void 3078void
3099rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
3100{ 3080{
3101 want_refresh = 1; 3081 want_refresh = 1;
3102 3082
3103 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
3104 selection.mark.col = col; 3084 selection.mark.col = col;
3105 3085
3106 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3107 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3108 3088
3109 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
3110 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3111 --selection.mark.col; 3091 --selection.mark.col;
… …
3139 text_t *stp; 3119 text_t *stp;
3140 rend_t *srp; 3120 rend_t *srp;
3141 3121
3142 if (dirn == UP) 3122 if (dirn == UP)
3143 { 3123 {
3144 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
3145 bound.col = 0; 3125 bound.col = 0;
3146 dirnadd = -1; 3126 dirnadd = -1;
3147 } 3127 }
3148 else 3128 else
3149 { 3129 {
… …
3227 * 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
3228 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3229 */ 3209 */
3230 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3231 && (col == selection.mark.col 3211 && (col == selection.mark.col
3232 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3233 { 3213 {
3234 /* select nothing */ 3214 /* select nothing */
3235 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3236 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3237 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3292 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3293 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3294 } 3274 }
3295 3275
3296 pos.col = col; 3276 pos.col = col;
3297 pos.row = row - view_start; 3277 pos.row = view_start + row;
3298 3278
3299 /* 3279 /*
3300 * 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
3301 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3302 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3787 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3788 { 3768 {
3789 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3790 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3791 3771
3792 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;
3793 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;
3794 3774
3795 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3796 { 3776 {
3797 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3798 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