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.214 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.239 by root, Thu Jan 19 17:14:46 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
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
176 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
177 { 180 {
178 //TODO//FIXME 181 //TODO//FIXME
179 saveLines++; 182 saveLines++;
180 prev_nrow--; 183 prev_nrow--;
181 nsaved++; 184 top_row--;
182 } 185 }
183 186
184 want_refresh = 1; 187 want_refresh = 1;
185 188
186 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
191 194
192 if (!row_buf) 195 if (!row_buf)
193 { 196 {
194 /* 197 /*
195 * 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
196 * Note: this is still needed so that all the scrollback lines are NULL
197 */ 199 */
198 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
199 term_start = 0; 201 term_start = 0;
200 202
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 205
204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 209
209 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
210 { 211 {
211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
257 } 258 }
258 } 259 }
259#endif 260#endif
260 261
261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 264
265 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
266 { 266 {
267 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
272 { 272 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 275 }
276 276
277 line_t *old_buf = row_buf;
277 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 279
279 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
280 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
282 283
283 if (nsaved) 284 if (top_row)
284 { 285 {
285 // 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
286 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
287 288
288 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
… …
324 qline->l = ncol; 325 qline->l = ncol;
325 qline->is_longer (1); 326 qline->is_longer (1);
326 327
327 int qcol = 0; 328 int qcol = 0;
328 329
330 // see below for cursor adjustment rationale
331 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow);
333
329 // fill a single destination line 334 // fill a single destination line
330 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
331 { 336 {
332 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
333 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 366 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
362 } 367 }
363 while (p != pend && q > 0); 368 while (p != pend && q > 0);
364 369
365 term_start = total_rows - nrow; 370 term_start = total_rows - nrow;
366 nsaved = term_start - q; 371 top_row = q - term_start;
367 372
368 // make sure all terminal lines exist 373 // make sure all terminal lines exist
369 while (nsaved < 0) 374 while (top_row > 0)
370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 375 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
371 } 376 }
372 else 377 else
373 { 378 {
374 // if no scrollback exists (yet), wing, instead of wrap 379 // if no scrollback exists (yet), wing, instead of wrap
375 380
… …
388 } 393 }
389 394
390 term_start = 0; 395 term_start = 0;
391 } 396 }
392 397
393#ifdef DEBUG_STRICT //TODO: remove
394 for (int i = -nsaved; i < nrow; i++)
395 assert (ROW (i).t);
396#endif
397
398 free (old_buf); 398 free (old_buf);
399 delete old_ta; 399 delete old_ta;
400 delete old_ra; 400 delete old_ra;
401 401
402 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
… …
430 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
431 431
432 free (row_buf); 432 free (row_buf);
433 free (swap_buf); 433 free (swap_buf);
434 free (drawn_buf); 434 free (drawn_buf);
435 free (temp_buf);
436 free (tabs); 435 free (tabs);
437 436
438 row_buf = 0; // signal that we freed all the arrays 437 row_buf = 0; // signal that we freed all the arrays
439} 438}
440 439
… …
448 scr_release (); 447 scr_release ();
449 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
450 scr_reset (); 449 scr_reset ();
451 450
452 scr_clear (true); 451 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 452 scr_refresh ();
454} 453}
455 454
456/* ------------------------------------------------------------------------- * 455/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 456 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 457 * ------------------------------------------------------------------------- */
… …
572 * Change the colour for following text 571 * Change the colour for following text
573 */ 572 */
574void 573void
575rxvt_term::scr_color (unsigned int color, int fgbg) 574rxvt_term::scr_color (unsigned int color, int fgbg)
576{ 575{
577 if (color > maxTermCOLOR) 576 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 577 color = fgbg;
579 578
580 if (fgbg == Color_fg) 579 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 580 rstyle = SET_FGCOLOR (rstyle, color);
582 else 581 else
… …
613 want_refresh = 1; 612 want_refresh = 1;
614 num_scr += count; 613 num_scr += count;
615 614
616 if (count > 0 615 if (count > 0
617 && row1 == 0 616 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 617 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 618 {
621 nsaved = min (nsaved + count, saveLines); 619 top_row = max (top_row - count, -saveLines);
622 620
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 621 // scroll everything up 'count' lines
622 term_start = (term_start + count) % total_rows;
623
624 // sever bottommost line
625 {
626 line_t &l = ROW(row2 - count);
627 l.is_longer (0);
628 l.touch ();
629 }
630
631 // erase newly scrolled-in lines
632 for (int i = count; i--; )
633 {
634 // basically this is a slightly optimized scr_blank_screen_mem
635 // it is worth the effort on slower machines
636 line_t &l = ROW(nrow - 1 - i);
637
638 scr_blank_line (l, 0, l.l, rstyle);
639
640 l.l = 0;
641 l.f = 0;
642 }
643
644 // now copy lines below the scroll region bottom to the
645 // bottom of the screen again, so they look as if they
646 // hadn't moved.
647 for (int i = nrow; --i > row2; )
648 {
649 line_t &l1 = ROW(i - count);
650 line_t &l2 = ROW(i);
651
652 ::swap (l1, l2);
653 l2.touch ();
654 }
624 655
625 term_start = (term_start + count) % total_rows; 656 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 657 if (selection.op && current_screen == selection.screen)
628 { 658 {
629 selection.beg.row -= count; 659 selection.beg.row -= count;
630 selection.end.row -= count; 660 selection.end.row -= count;
631 selection.mark.row -= count; 661 selection.mark.row -= count;
632 662
633 if (selection.beg.row < -nsaved 663 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 664 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 665 || selection.mark.row < top_row)
636 { 666 {
637 CLEAR_ALL_SELECTION (); 667 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 668 selection.op = SELECTION_CLEAR;
639 } 669 }
640 } 670 }
641 671
642 for (int i = count; i--; ) 672 // finally move the view window, if desired
643 {
644 ROW(row2 - i).l = 0;
645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
646 }
647
648 if (OPTION (Opt_scrollWithBuffer) 673 if (OPTION (Opt_scrollWithBuffer)
649 && view_start != 0 674 && view_start != 0
650 && view_start != saveLines) 675 && view_start != -saveLines)
651 scr_page (UP, count); 676 scr_page (UP, count);
677
678 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
679 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
652 } 680 }
653 else 681 else
654 { 682 {
655 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
656 { 684 {
… …
680 708
681 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
682 710
683 min_it (count, rows); 711 min_it (count, rows);
684 712
713 line_t *temp_buf = row_buf + total_rows;
714
685 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
686 { 716 {
687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688 718
689 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
730 } 760 }
731 761
732#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 763 assert (screen.cur.col < ncol);
734 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
735 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
736#endif 766#endif
737 int row = screen.cur.row; 767 int row = screen.cur.row;
738 768
739 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
740 770
… …
786 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
787 } 817 }
788 818
789 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
790 { 820 {
791 max_it (line->l, ncol);
792 line->is_longer (1);
793
794 scr_do_wrap (); 821 scr_do_wrap ();
795 822
823 line->l = ncol;
824 line->is_longer (1);
825
796 row = screen.cur.row; 826 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
798 } 828 }
799 829
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 830 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1304 } 1334 }
1305 1335
1306 for (; num--; row++) 1336 for (; num--; row++)
1307 { 1337 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 } 1340 }
1314} 1341}
1315 1342
1316#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1318rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1319{ 1346{
1320 want_refresh = 1; 1347 want_refresh = 1;
1321 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1322 1349
1323 nsaved = 0; 1350 top_row = 0;
1324} 1351}
1325#endif 1352#endif
1326 1353
1327/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1328/* 1355/*
… …
1762 } 1789 }
1763 1790
1764 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1765 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1766 1793
1794 num_scr_allow = 0;
1795
1767 if (refresh) 1796 if (refresh)
1768 scr_refresh (SLOW_REFRESH); 1797 scr_refresh ();
1769} 1798}
1770 1799
1771/* ------------------------------------------------------------------------- */ 1800/* ------------------------------------------------------------------------- */
1772/* 1801/*
1773 * Refresh the entire screen 1802 * Refresh the entire screen
… …
1781/* ------------------------------------------------------------------------- */ 1810/* ------------------------------------------------------------------------- */
1782/* 1811/*
1783 * Move the display so that the line represented by scrollbar value Y is at 1812 * Move the display so that the line represented by scrollbar value Y is at
1784 * the top of the screen 1813 * the top of the screen
1785 */ 1814 */
1786int 1815void
1787rxvt_term::scr_move_to (int y, int len) 1816rxvt_term::scr_move_to (int y, int len)
1788{ 1817{
1789 long p = 0; 1818 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1790 unsigned int oldviewstart;
1791
1792 oldviewstart = view_start;
1793
1794 if (y < len)
1795 {
1796 p = (nrow + nsaved) * (len - y) / len;
1797 p -= (long) (nrow - 1);
1798 p = max (p, 0);
1799 }
1800
1801 view_start = (unsigned int)min (p, nsaved);
1802
1803 return scr_changeview (oldviewstart);
1804} 1819}
1805 1820
1806/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1807/* 1822/*
1808 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1809 * direction should be UP or DN 1824 * direction should be UP or DN
1810 */ 1825 */
1811int 1826bool
1812rxvt_term::scr_page (enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1813{ 1828{
1814 int n; 1829 int new_view_start =
1815 unsigned int oldviewstart;
1816
1817 oldviewstart = view_start;
1818
1819 if (direction == UP)
1820 {
1821 n = view_start + nlines;
1822 view_start = min (n, nsaved);
1823 }
1824 else
1825 {
1826 n = view_start - nlines; 1830 direction == UP ? view_start - nlines
1827 view_start = max (n, 0); 1831 : view_start + nlines;
1828 }
1829 1832
1830 return scr_changeview (oldviewstart); 1833 return scr_changeview (new_view_start);
1831} 1834}
1832 1835
1833int 1836bool
1834rxvt_term::scr_changeview (unsigned int oldviewstart) 1837rxvt_term::scr_changeview (int new_view_start)
1835{ 1838{
1839 clamp_it (new_view_start, top_row, 0);
1840
1836 if (view_start != oldviewstart) 1841 if (new_view_start == view_start)
1837 { 1842 return false;
1843
1844 num_scr += new_view_start - view_start;
1845 view_start = new_view_start;
1846 want_refresh = 1;
1847
1838 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1848 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839 1849
1840 want_refresh = 1; 1850 return true;
1841 num_scr -= (view_start - oldviewstart);
1842 }
1843
1844 return (int)view_start - (int)oldviewstart;
1845} 1851}
1846 1852
1847/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1848void 1854void
1849rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
… …
1858# endif 1864# endif
1859 1865
1860 if (OPTION (Opt_visualBell)) 1866 if (OPTION (Opt_visualBell))
1861 { 1867 {
1862 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1869 display->flush ();
1863 rxvt_usleep (VISUAL_BELL_DURATION); 1870 rxvt_usleep (VISUAL_BELL_DURATION);
1864 scr_rvideo_mode (!rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1865 } 1872 }
1866 else 1873 else
1867 XBell (display->display, 0); 1874 XBell (display->display, 0);
… …
1881 if ((fd = popen_printer ()) == NULL) 1888 if ((fd = popen_printer ()) == NULL)
1882 return; 1889 return;
1883 1890
1884 if (fullhist) 1891 if (fullhist)
1885 { 1892 {
1886 nrows = nrow + nsaved; 1893 nrows = nrow - top_row;
1887 row_start = -nsaved; 1894 row_start = top_row;
1888 } 1895 }
1889 else 1896 else
1890 { 1897 {
1891 nrows = nrow; 1898 nrows = nrow;
1892 row_start = -view_start; 1899 row_start = view_start;
1893 } 1900 }
1894 1901
1895 wctomb (0, 0); 1902 wctomb (0, 0);
1896 1903
1897 for (int r1 = 0; r1 < nrows; r1++) 1904 for (int r1 = 0; r1 < nrows; r1++)
… …
1929 * Refresh the screen 1936 * Refresh the screen
1930 * drawn_text/drawn_rend contain the screen information before the update. 1937 * drawn_text/drawn_rend contain the screen information before the update.
1931 * screen.text/screen.rend contain what the screen will change to. 1938 * screen.text/screen.rend contain what the screen will change to.
1932 */ 1939 */
1933void 1940void
1934rxvt_term::scr_refresh (unsigned char refresh_type) 1941rxvt_term::scr_refresh ()
1935{ 1942{
1936 unsigned char must_clear, /* use draw_string not draw_image_string */ 1943 unsigned char must_clear, /* use draw_string not draw_image_string */
1937 showcursor; /* show the cursor */ 1944 showcursor; /* show the cursor */
1938 int16_t col, row, /* column/row we're processing */ 1945 int16_t col, row, /* column/row we're processing */
1939 ocrow; /* old cursor row */ 1946 ocrow; /* old cursor row */
… …
2025 2032
2026 /* make sure no outline cursor is left around */ 2033 /* make sure no outline cursor is left around */
2027 setoldcursor = 0; 2034 setoldcursor = 0;
2028 if (ocrow != -1) 2035 if (ocrow != -1)
2029 { 2036 {
2030 if (screen.cur.row + view_start != ocrow 2037 if (screen.cur.row - view_start != ocrow
2031 || screen.cur.col != oldcursor.col) 2038 || screen.cur.col != oldcursor.col)
2032 { 2039 {
2033 if (ocrow < nrow 2040 if (ocrow < nrow
2034 && oldcursor.col < ncol) 2041 && oldcursor.col < ncol)
2035 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2042 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2043 else if (!focus) 2050 else if (!focus)
2044 setoldcursor = 1; 2051 setoldcursor = 1;
2045 2052
2046 if (setoldcursor) 2053 if (setoldcursor)
2047 { 2054 {
2048 if (screen.cur.row + view_start >= nrow) 2055 if (screen.cur.row - view_start >= nrow)
2049 oldcursor.row = -1; 2056 oldcursor.row = -1;
2050 else 2057 else
2051 { 2058 {
2052 oldcursor.row = screen.cur.row + view_start; 2059 oldcursor.row = screen.cur.row - view_start;
2053 oldcursor.col = screen.cur.col; 2060 oldcursor.col = screen.cur.col;
2054 } 2061 }
2055 } 2062 }
2056 } 2063 }
2057 2064
… …
2063#ifndef NO_SLOW_LINK_SUPPORT 2070#ifndef NO_SLOW_LINK_SUPPORT
2064 /* 2071 /*
2065 * D: CopyArea pass - very useful for slower links 2072 * D: CopyArea pass - very useful for slower links
2066 * This has been deliberately kept simple. 2073 * This has been deliberately kept simple.
2067 */ 2074 */
2068 i = num_scr;
2069 if (!display->is_local 2075 if (!display->is_local
2070 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2071 && abs (num_scr) < nrow && !must_clear) 2077 && abs (num_scr) < nrow && !must_clear)
2072 { 2078 {
2073 int16_t nits; 2079 int16_t nits;
2074 int j; 2080 int j;
2075 int len, wlen; 2081 int len, wlen;
2082 dLocal (int, num_scr);
2076 2083
2077 j = nrow; 2084 j = nrow;
2078 wlen = len = -1; 2085 wlen = len = -1;
2079 row = i > 0 ? 0 : j - 1; 2086 row = i > 0 ? 0 : j - 1;
2080 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2087 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2081 { 2088 {
2082 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2089 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2083 { 2090 {
2084 line_t s = ROW(row - view_start); 2091 line_t s = ROW(view_start + row);
2085 line_t d = drawn_buf[row]; 2092 line_t d = drawn_buf[row];
2086 line_t d2 = drawn_buf[row + i]; 2093 line_t d2 = drawn_buf[row + i];
2087 2094
2088 for (nits = 0, col = ncol; col--; ) 2095 for (nits = 0, col = ncol; col--; )
2089 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2096 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2127 /* 2134 /*
2128 * E: main pass across every character 2135 * E: main pass across every character
2129 */ 2136 */
2130 for (row = 0; row < nrow; row++) 2137 for (row = 0; row < nrow; row++)
2131 { 2138 {
2132 text_t *stp = ROW(row - view_start).t; 2139 text_t *stp = ROW(view_start + row).t;
2133 rend_t *srp = ROW(row - view_start).r; 2140 rend_t *srp = ROW(view_start + row).r;
2134 text_t *dtp = drawn_buf[row].t; 2141 text_t *dtp = drawn_buf[row].t;
2135 rend_t *drp = drawn_buf[row].r; 2142 rend_t *drp = drawn_buf[row].r;
2136 2143
2137 /* 2144 /*
2138 * E2: OK, now the real pass 2145 * E2: OK, now the real pass
… …
2375 /* 2382 /*
2376 * H: cleanup selection 2383 * H: cleanup selection
2377 */ 2384 */
2378 scr_reverse_selection (); 2385 scr_reverse_selection ();
2379 2386
2380 if (refresh_type & SMOOTH_REFRESH)
2381 XFlush (display->display);
2382
2383 num_scr = 0; 2387 num_scr = 0;
2384 num_scr_allow = 1; 2388 num_scr_allow = 1;
2385} 2389}
2386 2390
2387void 2391void
… …
2451 2455
2452 if (really) 2456 if (really)
2453 XClearWindow (display->display, vt); 2457 XClearWindow (display->display, vt);
2454} 2458}
2455 2459
2460void
2461rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2462{
2463 int view_end = view_start + nrow;
2464 int row, col;
2465
2466 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2467 {
2468 text_t *stp = ROW(row).t;
2469 rend_t *srp = ROW(row).r;
2470
2471 for (col = beg_col; col < end_col; col++)
2472 srp[col] ^= rstyle1;
2473
2474 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2475 srp[col] ^= rstyle2;
2476
2477 if (++col < end_col)
2478 srp[col] ^= rstyle2;
2479 }
2480}
2481
2482void
2483rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2484{
2485 int view_end = view_start + nrow;
2486 int row, col;
2487
2488 if (beg_row >= view_start)
2489 {
2490 col = beg_col;
2491 row = beg_row;
2492 }
2493 else
2494 {
2495 col = 0;
2496 row = view_start;
2497 }
2498
2499 for (; row < min (end_row, view_end); row++, col = 0)
2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2501 srp[col] ^= rstyle;
2502
2503 if (row == end_row)
2504 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2505 srp[col] ^= rstyle;
2506}
2507
2456/* ------------------------------------------------------------------------- */ 2508/* ------------------------------------------------------------------------- */
2457void 2509void
2458rxvt_term::scr_reverse_selection () 2510rxvt_term::scr_reverse_selection ()
2459{ 2511{
2460 if (selection.op 2512 if (selection.op
2461 && current_screen == selection.screen 2513 && current_screen == selection.screen
2462 && selection.end.row >= -view_start) 2514 && selection.end.row >= view_start)
2463 { 2515 {
2464 int view_end = -view_start + nrow;
2465 int row, col;
2466
2467#if ENABLE_FRILLS 2516#if ENABLE_FRILLS
2468 if (selection.rect) 2517 if (selection.rect)
2469 { 2518 scr_xor_rect (selection.beg.row, selection.beg.col,
2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2519 selection.end.row, selection.end.col,
2471 { 2520 RS_RVid, RS_RVid | RS_Uline);
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2474
2475 for (col = selection.beg.col; col < selection.end.col; col++)
2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2484 }
2485 else 2521 else
2486#endif 2522#endif
2487 { 2523 scr_xor_span (selection.beg.row, selection.beg.col,
2488 if (selection.beg.row >= -view_start) 2524 selection.end.row, selection.end.col,
2489 { 2525 RS_RVid);
2490 col = selection.beg.col;
2491 row = selection.beg.row;
2492 }
2493 else
2494 {
2495 col = 0;
2496 row = -view_start;
2497 }
2498
2499 for (; row < min (selection.end.row, view_end); row++, col = 0)
2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2501 srp[col] ^= RS_RVid;
2502
2503 if (row == selection.end.row)
2504 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2505 srp[col] ^= RS_RVid;
2506 }
2507 } 2526 }
2508} 2527}
2509 2528
2510/* ------------------------------------------------------------------------- */ 2529/* ------------------------------------------------------------------------- */
2511/* 2530/*
… …
2549 2568
2550 if (!selection.op) 2569 if (!selection.op)
2551 return; 2570 return;
2552 2571
2553 pos.row = pos.col = 0; 2572 pos.row = pos.col = 0;
2554 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2573 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2555 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2574 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2556 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2557 || (check_more == 1 2576 || (check_more == 1
2558 && current_screen == selection.screen 2577 && current_screen == selection.screen
2559 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2578 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2560 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2579 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2561 || (check_more == 2 2580 || (check_more == 2
… …
2780 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2799 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2781 * will auto fallback to CUT_BUFFER0 2800 * will auto fallback to CUT_BUFFER0
2782 * EXT: button 2 release 2801 * EXT: button 2 release
2783 */ 2802 */
2784void 2803void
2785rxvt_term::selection_request (Time tm, int x, int y) 2804rxvt_term::selection_request (Time tm)
2786{ 2805{
2787 if (x < 0 || x >= width || y < 0 || y >= height)
2788 return; /* outside window */
2789
2790 if (selection.text) 2806 if (selection.text)
2791 { /* internal selection */ 2807 { /* internal selection */
2792 char *str = rxvt_wcstombs (selection.text, selection.len); 2808 char *str = rxvt_wcstombs (selection.text, selection.len);
2793 paste (str, strlen (str)); 2809 paste (str, strlen (str));
2794 free (str); 2810 free (str);
… …
3003 { 3019 {
3004 display->set_selection_owner (this); 3020 display->set_selection_owner (this);
3005 return true; 3021 return true;
3006 } 3022 }
3007 else 3023 else
3024 {
3025 selection_clear ();
3008 return false; 3026 return false;
3027 }
3009 3028
3010#if 0 3029#if 0
3011 XTextProperty ct; 3030 XTextProperty ct;
3012 3031
3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3032 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3027rxvt_term::selection_click (int clicks, int x, int y) 3046rxvt_term::selection_click (int clicks, int x, int y)
3028{ 3047{
3029 clicks = ((clicks - 1) % 3) + 1; 3048 clicks = ((clicks - 1) % 3) + 1;
3030 selection.clicks = clicks; /* save clicks so extend will work */ 3049 selection.clicks = clicks; /* save clicks so extend will work */
3031 3050
3051 if (clicks == 2 && !selection.rect
3052 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3053 {
3054 MEvent.clicks = 1; // what a mess
3055 selection.screen = current_screen;
3056 selection.op = SELECTION_CONT;
3057 return;
3058 }
3059
3032 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3060 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3033 3061
3034 if (clicks == 2 || clicks == 3) 3062 if (clicks == 2 || clicks == 3)
3035 selection_extend_colrow (selection.mark.col, 3063 selection_extend_colrow (selection.mark.col,
3036 selection.mark.row + view_start, 3064 selection.mark.row - view_start,
3037 0, /* button 3 */ 3065 0, /* button 3 */
3038 1, /* button press */ 3066 1, /* button press */
3039 0); /* click change */ 3067 0); /* click change */
3040} 3068}
3041 3069
… …
3046void 3074void
3047rxvt_term::selection_start_colrow (int col, int row) 3075rxvt_term::selection_start_colrow (int col, int row)
3048{ 3076{
3049 want_refresh = 1; 3077 want_refresh = 1;
3050 3078
3051 selection.mark.row = row - view_start; 3079 selection.mark.row = row + view_start;
3052 selection.mark.col = col; 3080 selection.mark.col = col;
3053 3081
3054 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3082 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3055 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3056 3084
3057 while (selection.mark.col > 0 3085 while (selection.mark.col > 0
3058 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3059 --selection.mark.col; 3087 --selection.mark.col;
… …
3087 text_t *stp; 3115 text_t *stp;
3088 rend_t *srp; 3116 rend_t *srp;
3089 3117
3090 if (dirn == UP) 3118 if (dirn == UP)
3091 { 3119 {
3092 bound.row = - nsaved - 1; 3120 bound.row = top_row - 1;
3093 bound.col = 0; 3121 bound.col = 0;
3094 dirnadd = -1; 3122 dirnadd = -1;
3095 } 3123 }
3096 else 3124 else
3097 { 3125 {
… …
3175 * select nothing. Otherwise, if we're to the right of the mark, you have to 3203 * select nothing. Otherwise, if we're to the right of the mark, you have to
3176 * be _past_ a character for it to be selected. 3204 * be _past_ a character for it to be selected.
3177 */ 3205 */
3178 if (((selection.clicks % 3) == 1) && !flag 3206 if (((selection.clicks % 3) == 1) && !flag
3179 && (col == selection.mark.col 3207 && (col == selection.mark.col
3180 && (row == selection.mark.row + view_start))) 3208 && (row == selection.mark.row - view_start)))
3181 { 3209 {
3182 /* select nothing */ 3210 /* select nothing */
3183 selection.beg.row = selection.end.row = 0; 3211 selection.beg.row = selection.end.row = 0;
3184 selection.beg.col = selection.end.col = 0; 3212 selection.beg.col = selection.end.col = 0;
3185 selection.clicks = 4; 3213 selection.clicks = 4;
… …
3240 selection.beg.col = selection.end.col = selection.mark.col; 3268 selection.beg.col = selection.end.col = selection.mark.col;
3241 selection.beg.row = selection.end.row = selection.mark.row; 3269 selection.beg.row = selection.end.row = selection.mark.row;
3242 } 3270 }
3243 3271
3244 pos.col = col; 3272 pos.col = col;
3245 pos.row = row - view_start; 3273 pos.row = view_start + row;
3246 3274
3247 /* 3275 /*
3248 * This is mainly xterm style selection with a couple of differences, mainly 3276 * This is mainly xterm style selection with a couple of differences, mainly
3249 * in the way button3 drag extension works. 3277 * in the way button3 drag extension works.
3250 * We're either doing: button1 drag; button3 press; or button3 drag 3278 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3331 else if (selection.clicks == 2) 3359 else if (selection.clicks == 2)
3332 { 3360 {
3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3361 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334 selection.end.col--; 3362 selection.end.col--;
3335 3363
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3338 selection_delimit_word (UP, &selection.beg, &selection.beg); 3364 selection_delimit_word (UP, &selection.beg, &selection.beg);
3339 selection_delimit_word (DN, &selection.end, &selection.end); 3365 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3341 } 3366 }
3342 else if (selection.clicks == 3) 3367 else if (selection.clicks == 3)
3343 { 3368 {
3344#if ENABLE_FRILLS 3369#if ENABLE_FRILLS
3345 if (OPTION (Opt_tripleclickwords)) 3370 if (OPTION (Opt_tripleclickwords))
… …
3738 for (int y = ov_h; y--; ) 3763 for (int y = ov_h; y--; )
3739 { 3764 {
3740 text_t *t1 = ov_text[y]; 3765 text_t *t1 = ov_text[y];
3741 rend_t *r1 = ov_rend[y]; 3766 rend_t *r1 = ov_rend[y];
3742 3767
3743 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3768 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3744 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3769 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3745 3770
3746 for (int x = ov_w; x--; ) 3771 for (int x = ov_w; x--; )
3747 { 3772 {
3748 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3773 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3749 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3774 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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