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.217 by root, Mon Jan 9 19:01:56 2006 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 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
… …
239 CLEAR_ALL_SELECTION (); 239 CLEAR_ALL_SELECTION ();
240 rvideo = 0; 240 rvideo = 0;
241 } 241 }
242 else 242 else
243 { 243 {
244 CLEAR_ALL_SELECTION ();
245
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
246 */ 248 */
247 249
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
… …
276 278
277 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 281
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
283 285
284 if (nsaved) 286 if (top_row)
285 { 287 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
288 290
289 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
… …
325 qline->l = ncol; 327 qline->l = ncol;
326 qline->is_longer (1); 328 qline->is_longer (1);
327 329
328 int qcol = 0; 330 int qcol = 0;
329 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
330 // fill a single destination line 336 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
332 { 338 {
333 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 368 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 369 }
364 while (p != pend && q > 0); 370 while (p != pend && q > 0);
365 371
366 term_start = total_rows - nrow; 372 term_start = total_rows - nrow;
367 nsaved = term_start - q; 373 top_row = q - term_start;
368 374
369 // make sure all terminal lines exist 375 // make sure all terminal lines exist
370 while (nsaved < 0) 376 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 377 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 378 }
373 else 379 else
374 { 380 {
375 // if no scrollback exists (yet), wing, instead of wrap 381 // if no scrollback exists (yet), wing, instead of wrap
376 382
… …
389 } 395 }
390 396
391 term_start = 0; 397 term_start = 0;
392 } 398 }
393 399
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); 400 free (old_buf);
400 delete old_ta; 401 delete old_ta;
401 delete old_ra; 402 delete old_ra;
402 403
403 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
… …
448 scr_release (); 449 scr_release ();
449 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
450 scr_reset (); 451 scr_reset ();
451 452
452 scr_clear (true); 453 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
454} 455}
455 456
456/* ------------------------------------------------------------------------- * 457/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 458 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 459 * ------------------------------------------------------------------------- */
… …
572 * Change the colour for following text 573 * Change the colour for following text
573 */ 574 */
574void 575void
575rxvt_term::scr_color (unsigned int color, int fgbg) 576rxvt_term::scr_color (unsigned int color, int fgbg)
576{ 577{
577 if (color > maxTermCOLOR) 578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 579 color = fgbg;
579 580
580 if (fgbg == Color_fg) 581 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 582 rstyle = SET_FGCOLOR (rstyle, color);
582 else 583 else
… …
613 want_refresh = 1; 614 want_refresh = 1;
614 num_scr += count; 615 num_scr += count;
615 616
616 if (count > 0 617 if (count > 0
617 && row1 == 0 618 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 620 {
621 nsaved = min (nsaved + count, saveLines); 621 top_row = max (top_row - count, -saveLines);
622 622
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 623 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows;
625
626 // sever bottommost line
627 {
628 line_t &l = ROW(row2 - count);
629 l.is_longer (0);
630 l.touch ();
631 }
632
633 // erase newly scrolled-in lines
634 for (int i = count; i--; )
635 {
636 // basically this is a slightly optimized scr_blank_screen_mem
637 // it is worth the effort on slower machines
638 line_t &l = ROW(nrow - 1 - i);
639
640 scr_blank_line (l, 0, l.l, rstyle);
641
642 l.l = 0;
643 l.f = 0;
644 }
645
646 // now copy lines below the scroll region bottom to the
647 // bottom of the screen again, so they look as if they
648 // hadn't moved.
649 for (int i = nrow; --i > row2; )
650 {
651 line_t &l1 = ROW(i - count);
652 line_t &l2 = ROW(i);
653
654 ::swap (l1, l2);
655 l2.touch ();
656 }
624 657
625 term_start = (term_start + count) % total_rows; 658 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 659 if (selection.op && current_screen == selection.screen)
628 { 660 {
629 selection.beg.row -= count; 661 selection.beg.row -= count;
630 selection.end.row -= count; 662 selection.end.row -= count;
631 selection.mark.row -= count; 663 selection.mark.row -= count;
632 664
633 if (selection.beg.row < -nsaved 665 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 666 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 667 || selection.mark.row < top_row)
636 { 668 {
637 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 670 selection.op = SELECTION_CLEAR;
639 } 671 }
640 } 672 }
641 673
642 for (int i = count; i--; ) 674 // 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) 675 if (OPTION (Opt_scrollWithBuffer)
655 && view_start != 0 676 && view_start != 0
656 && view_start != saveLines) 677 && view_start != -saveLines)
657 scr_page (UP, count); 678 scr_page (UP, count);
679
680 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
681 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 682 }
659 else 683 else
660 { 684 {
661 if (selection.op && current_screen == selection.screen) 685 if (selection.op && current_screen == selection.screen)
662 { 686 {
… …
738 } 762 }
739 763
740#ifdef DEBUG_STRICT 764#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 765 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 766 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 767 && screen.cur.row >= top_row);
744#endif 768#endif
745 int row = screen.cur.row; 769 int row = screen.cur.row;
746 770
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 771 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 772
… …
794 CLEAR_SELECTION (); 818 CLEAR_SELECTION ();
795 } 819 }
796 820
797 if (screen.flags & Screen_WrapNext) 821 if (screen.flags & Screen_WrapNext)
798 { 822 {
799 max_it (line->l, ncol);
800 line->is_longer (1);
801
802 scr_do_wrap (); 823 scr_do_wrap ();
803 824
825 line->l = ncol;
826 line->is_longer (1);
827
804 row = screen.cur.row; 828 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 829 line = &ROW(row); /* _must_ refresh */
806 } 830 }
807 831
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 832 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
1323rxvt_term::scr_erase_savelines () 1347rxvt_term::scr_erase_savelines ()
1324{ 1348{
1325 want_refresh = 1; 1349 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1350 ZERO_SCROLLBACK ();
1327 1351
1328 nsaved = 0; 1352 top_row = 0;
1329} 1353}
1330#endif 1354#endif
1331 1355
1332/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1333/* 1357/*
… …
1767 } 1791 }
1768 1792
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1793 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); 1794 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1795
1796 num_scr_allow = 0;
1797
1772 if (refresh) 1798 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1799 scr_refresh ();
1774} 1800}
1775 1801
1776/* ------------------------------------------------------------------------- */ 1802/* ------------------------------------------------------------------------- */
1777/* 1803/*
1778 * Refresh the entire screen 1804 * Refresh the entire screen
… …
1786/* ------------------------------------------------------------------------- */ 1812/* ------------------------------------------------------------------------- */
1787/* 1813/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1814 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1815 * the top of the screen
1790 */ 1816 */
1791int 1817void
1792rxvt_term::scr_move_to (int y, int len) 1818rxvt_term::scr_move_to (int y, int len)
1793{ 1819{
1794 long p = 0; 1820 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} 1821}
1810 1822
1811/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1812/* 1824/*
1813 * Page the screen up/down nlines 1825 * Page the screen up/down nlines
1814 * direction should be UP or DN 1826 * direction should be UP or DN
1815 */ 1827 */
1816int 1828bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1829rxvt_term::scr_page (enum page_dirn direction, int nlines)
1818{ 1830{
1819 int n; 1831 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; 1832 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1833 : view_start + nlines;
1833 }
1834 1834
1835 return scr_changeview (oldviewstart); 1835 return scr_changeview (new_view_start);
1836} 1836}
1837 1837
1838int 1838bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (int new_view_start)
1840{ 1840{
1841 clamp_it (new_view_start, top_row, 0);
1842
1841 if (view_start != oldviewstart) 1843 if (new_view_start == view_start)
1842 { 1844 return false;
1845
1846 num_scr += new_view_start - view_start;
1847 view_start = new_view_start;
1848 want_refresh = 1;
1849
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1851
1845 want_refresh = 1; 1852 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1853}
1851 1854
1852/* ------------------------------------------------------------------------- */ 1855/* ------------------------------------------------------------------------- */
1853void 1856void
1854rxvt_term::scr_bell () 1857rxvt_term::scr_bell ()
… …
1863# endif 1866# endif
1864 1867
1865 if (OPTION (Opt_visualBell)) 1868 if (OPTION (Opt_visualBell))
1866 { 1869 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 display->flush ();
1868 rxvt_usleep (VISUAL_BELL_DURATION); 1872 rxvt_usleep (VISUAL_BELL_DURATION);
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1873 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 } 1874 }
1871 else 1875 else
1872 XBell (display->display, 0); 1876 XBell (display->display, 0);
… …
1886 if ((fd = popen_printer ()) == NULL) 1890 if ((fd = popen_printer ()) == NULL)
1887 return; 1891 return;
1888 1892
1889 if (fullhist) 1893 if (fullhist)
1890 { 1894 {
1891 nrows = nrow + nsaved; 1895 nrows = nrow - top_row;
1892 row_start = -nsaved; 1896 row_start = top_row;
1893 } 1897 }
1894 else 1898 else
1895 { 1899 {
1896 nrows = nrow; 1900 nrows = nrow;
1897 row_start = -view_start; 1901 row_start = view_start;
1898 } 1902 }
1899 1903
1900 wctomb (0, 0); 1904 wctomb (0, 0);
1901 1905
1902 for (int r1 = 0; r1 < nrows; r1++) 1906 for (int r1 = 0; r1 < nrows; r1++)
… …
1934 * Refresh the screen 1938 * Refresh the screen
1935 * drawn_text/drawn_rend contain the screen information before the update. 1939 * drawn_text/drawn_rend contain the screen information before the update.
1936 * screen.text/screen.rend contain what the screen will change to. 1940 * screen.text/screen.rend contain what the screen will change to.
1937 */ 1941 */
1938void 1942void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 1943rxvt_term::scr_refresh ()
1940{ 1944{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 1945 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 showcursor; /* show the cursor */ 1946 showcursor; /* show the cursor */
1943 int16_t col, row, /* column/row we're processing */ 1947 int16_t col, row, /* column/row we're processing */
1944 ocrow; /* old cursor row */ 1948 ocrow; /* old cursor row */
… …
2030 2034
2031 /* make sure no outline cursor is left around */ 2035 /* make sure no outline cursor is left around */
2032 setoldcursor = 0; 2036 setoldcursor = 0;
2033 if (ocrow != -1) 2037 if (ocrow != -1)
2034 { 2038 {
2035 if (screen.cur.row + view_start != ocrow 2039 if (screen.cur.row - view_start != ocrow
2036 || screen.cur.col != oldcursor.col) 2040 || screen.cur.col != oldcursor.col)
2037 { 2041 {
2038 if (ocrow < nrow 2042 if (ocrow < nrow
2039 && oldcursor.col < ncol) 2043 && oldcursor.col < ncol)
2040 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2044 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2048 else if (!focus) 2052 else if (!focus)
2049 setoldcursor = 1; 2053 setoldcursor = 1;
2050 2054
2051 if (setoldcursor) 2055 if (setoldcursor)
2052 { 2056 {
2053 if (screen.cur.row + view_start >= nrow) 2057 if (screen.cur.row - view_start >= nrow)
2054 oldcursor.row = -1; 2058 oldcursor.row = -1;
2055 else 2059 else
2056 { 2060 {
2057 oldcursor.row = screen.cur.row + view_start; 2061 oldcursor.row = screen.cur.row - view_start;
2058 oldcursor.col = screen.cur.col; 2062 oldcursor.col = screen.cur.col;
2059 } 2063 }
2060 } 2064 }
2061 } 2065 }
2062 2066
… …
2068#ifndef NO_SLOW_LINK_SUPPORT 2072#ifndef NO_SLOW_LINK_SUPPORT
2069 /* 2073 /*
2070 * D: CopyArea pass - very useful for slower links 2074 * D: CopyArea pass - very useful for slower links
2071 * This has been deliberately kept simple. 2075 * This has been deliberately kept simple.
2072 */ 2076 */
2073 i = num_scr;
2074 if (!display->is_local 2077 if (!display->is_local
2075 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2076 && abs (num_scr) < nrow && !must_clear) 2079 && abs (num_scr) < nrow && !must_clear)
2077 { 2080 {
2078 int16_t nits; 2081 int16_t nits;
2079 int j; 2082 int j;
2080 int len, wlen; 2083 int len, wlen;
2084 dLocal (int, num_scr);
2081 2085
2082 j = nrow; 2086 j = nrow;
2083 wlen = len = -1; 2087 wlen = len = -1;
2084 row = i > 0 ? 0 : j - 1; 2088 row = i > 0 ? 0 : j - 1;
2085 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2089 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2086 { 2090 {
2087 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2091 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2088 { 2092 {
2089 line_t s = ROW(row - view_start); 2093 line_t s = ROW(view_start + row);
2090 line_t d = drawn_buf[row]; 2094 line_t d = drawn_buf[row];
2091 line_t d2 = drawn_buf[row + i]; 2095 line_t d2 = drawn_buf[row + i];
2092 2096
2093 for (nits = 0, col = ncol; col--; ) 2097 for (nits = 0, col = ncol; col--; )
2094 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2098 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2132 /* 2136 /*
2133 * E: main pass across every character 2137 * E: main pass across every character
2134 */ 2138 */
2135 for (row = 0; row < nrow; row++) 2139 for (row = 0; row < nrow; row++)
2136 { 2140 {
2137 text_t *stp = ROW(row - view_start).t; 2141 text_t *stp = ROW(view_start + row).t;
2138 rend_t *srp = ROW(row - view_start).r; 2142 rend_t *srp = ROW(view_start + row).r;
2139 text_t *dtp = drawn_buf[row].t; 2143 text_t *dtp = drawn_buf[row].t;
2140 rend_t *drp = drawn_buf[row].r; 2144 rend_t *drp = drawn_buf[row].r;
2141 2145
2142 /* 2146 /*
2143 * E2: OK, now the real pass 2147 * E2: OK, now the real pass
… …
2380 /* 2384 /*
2381 * H: cleanup selection 2385 * H: cleanup selection
2382 */ 2386 */
2383 scr_reverse_selection (); 2387 scr_reverse_selection ();
2384 2388
2385 if (refresh_type & SMOOTH_REFRESH)
2386 XFlush (display->display);
2387
2388 num_scr = 0; 2389 num_scr = 0;
2389 num_scr_allow = 1; 2390 num_scr_allow = 1;
2390} 2391}
2391 2392
2392void 2393void
… …
2456 2457
2457 if (really) 2458 if (really)
2458 XClearWindow (display->display, vt); 2459 XClearWindow (display->display, vt);
2459} 2460}
2460 2461
2462void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2464{
2465 int view_end = view_start + nrow;
2466 int row, col;
2467
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2469 {
2470 text_t *stp = ROW(row).t;
2471 rend_t *srp = ROW(row).r;
2472
2473 for (col = beg_col; col < end_col; col++)
2474 srp[col] ^= rstyle1;
2475
2476 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2477 srp[col] ^= rstyle2;
2478
2479 if (++col < end_col)
2480 srp[col] ^= rstyle2;
2481 }
2482}
2483
2484void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2486{
2487 int view_end = view_start + nrow;
2488 int row, col;
2489
2490 if (beg_row >= view_start)
2491 {
2492 col = beg_col;
2493 row = beg_row;
2494 }
2495 else
2496 {
2497 col = 0;
2498 row = view_start;
2499 }
2500
2501 for (; row < min (end_row, view_end); row++, col = 0)
2502 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2503 srp[col] ^= rstyle;
2504
2505 if (row == end_row)
2506 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2507 srp[col] ^= rstyle;
2508}
2509
2461/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2462void 2511void
2463rxvt_term::scr_reverse_selection () 2512rxvt_term::scr_reverse_selection ()
2464{ 2513{
2465 if (selection.op 2514 if (selection.op
2466 && current_screen == selection.screen 2515 && current_screen == selection.screen
2467 && selection.end.row >= -view_start) 2516 && selection.end.row >= view_start)
2468 { 2517 {
2469 int view_end = -view_start + nrow;
2470 int row, col;
2471
2472#if ENABLE_FRILLS 2518#if ENABLE_FRILLS
2473 if (selection.rect) 2519 if (selection.rect)
2474 { 2520 scr_xor_rect (selection.beg.row, selection.beg.col,
2475 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2521 selection.end.row, selection.end.col,
2476 { 2522 RS_RVid, RS_RVid | RS_Uline);
2477 text_t *stp = ROW(row).t;
2478 rend_t *srp = ROW(row).r;
2479
2480 for (col = selection.beg.col; col < selection.end.col; col++)
2481 srp[col] ^= RS_RVid;
2482
2483 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2484 srp[col] ^= RS_RVid | RS_Uline;
2485
2486 if (++col < selection.end.col)
2487 srp[col] ^= RS_RVid | RS_Uline;
2488 }
2489 }
2490 else 2523 else
2491#endif 2524#endif
2492 { 2525 scr_xor_span (selection.beg.row, selection.beg.col,
2493 if (selection.beg.row >= -view_start) 2526 selection.end.row, selection.end.col,
2494 { 2527 RS_RVid);
2495 col = selection.beg.col;
2496 row = selection.beg.row;
2497 }
2498 else
2499 {
2500 col = 0;
2501 row = -view_start;
2502 }
2503
2504 for (; row < min (selection.end.row, view_end); row++, col = 0)
2505 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2506 srp[col] ^= RS_RVid;
2507
2508 if (row == selection.end.row)
2509 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2510 srp[col] ^= RS_RVid;
2511 }
2512 } 2528 }
2513} 2529}
2514 2530
2515/* ------------------------------------------------------------------------- */ 2531/* ------------------------------------------------------------------------- */
2516/* 2532/*
… …
2554 2570
2555 if (!selection.op) 2571 if (!selection.op)
2556 return; 2572 return;
2557 2573
2558 pos.row = pos.col = 0; 2574 pos.row = pos.col = 0;
2559 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2575 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2560 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2561 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2562 || (check_more == 1 2578 || (check_more == 1
2563 && current_screen == selection.screen 2579 && current_screen == selection.screen
2564 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2580 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2565 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2581 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2566 || (check_more == 2 2582 || (check_more == 2
… …
2785 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2786 * will auto fallback to CUT_BUFFER0 2802 * will auto fallback to CUT_BUFFER0
2787 * EXT: button 2 release 2803 * EXT: button 2 release
2788 */ 2804 */
2789void 2805void
2790rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm)
2791{ 2807{
2792 if (x < 0 || x >= width || y < 0 || y >= height)
2793 return; /* outside window */
2794
2795 if (selection.text) 2808 if (selection.text)
2796 { /* internal selection */ 2809 { /* internal selection */
2797 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2798 paste (str, strlen (str)); 2811 paste (str, strlen (str));
2799 free (str); 2812 free (str);
… …
3008 { 3021 {
3009 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3010 return true; 3023 return true;
3011 } 3024 }
3012 else 3025 else
3026 {
3027 selection_clear ();
3013 return false; 3028 return false;
3029 }
3014 3030
3015#if 0 3031#if 0
3016 XTextProperty ct; 3032 XTextProperty ct;
3017 3033
3018 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3032rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
3033{ 3049{
3034 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
3035 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
3036 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3061
3037 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3038 3063
3039 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
3040 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
3041 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
3042 0, /* button 3 */ 3067 0, /* button 3 */
3043 1, /* button press */ 3068 1, /* button press */
3044 0); /* click change */ 3069 0); /* click change */
3045} 3070}
3046 3071
… …
3051void 3076void
3052rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
3053{ 3078{
3054 want_refresh = 1; 3079 want_refresh = 1;
3055 3080
3056 selection.mark.row = row - view_start; 3081 selection.mark.row = row + view_start;
3057 selection.mark.col = col; 3082 selection.mark.col = col;
3058 3083
3059 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3060 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3061 3086
3062 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
3063 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3064 --selection.mark.col; 3089 --selection.mark.col;
… …
3092 text_t *stp; 3117 text_t *stp;
3093 rend_t *srp; 3118 rend_t *srp;
3094 3119
3095 if (dirn == UP) 3120 if (dirn == UP)
3096 { 3121 {
3097 bound.row = - nsaved - 1; 3122 bound.row = top_row - 1;
3098 bound.col = 0; 3123 bound.col = 0;
3099 dirnadd = -1; 3124 dirnadd = -1;
3100 } 3125 }
3101 else 3126 else
3102 { 3127 {
… …
3180 * select nothing. Otherwise, if we're to the right of the mark, you have to 3205 * select nothing. Otherwise, if we're to the right of the mark, you have to
3181 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3182 */ 3207 */
3183 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3184 && (col == selection.mark.col 3209 && (col == selection.mark.col
3185 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3186 { 3211 {
3187 /* select nothing */ 3212 /* select nothing */
3188 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3189 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3190 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3245 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3246 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3247 } 3272 }
3248 3273
3249 pos.col = col; 3274 pos.col = col;
3250 pos.row = row - view_start; 3275 pos.row = view_start + row;
3251 3276
3252 /* 3277 /*
3253 * This is mainly xterm style selection with a couple of differences, mainly 3278 * This is mainly xterm style selection with a couple of differences, mainly
3254 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3255 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3336 else if (selection.clicks == 2) 3361 else if (selection.clicks == 2)
3337 { 3362 {
3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3363 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3339 selection.end.col--; 3364 selection.end.col--;
3340 3365
3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3342 {
3343 selection_delimit_word (UP, &selection.beg, &selection.beg); 3366 selection_delimit_word (UP, &selection.beg, &selection.beg);
3344 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3345 }
3346 } 3368 }
3347 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3348 { 3370 {
3349#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3350 if (OPTION (Opt_tripleclickwords)) 3372 if (OPTION (Opt_tripleclickwords))
… …
3743 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3744 { 3766 {
3745 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3746 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3747 3769
3748 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3749 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3750 3772
3751 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3752 { 3774 {
3753 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3754 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 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