… | |
… | |
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 */ |
146 | void |
146 | void |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
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; |
… | |
… | |
361 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
362 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
362 | } |
363 | } |
363 | while (p != pend && q > 0); |
364 | while (p != pend && q > 0); |
364 | |
365 | |
365 | term_start = total_rows - nrow; |
366 | term_start = total_rows - nrow; |
366 | nsaved = term_start - q; |
367 | top_row = q - term_start; |
367 | |
368 | |
368 | // make sure all terminal lines exist |
369 | // make sure all terminal lines exist |
369 | while (nsaved < 0) |
370 | while (top_row > 0) |
370 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
371 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
371 | } |
372 | } |
372 | else |
373 | else |
373 | { |
374 | { |
374 | // if no scrollback exists (yet), wing, instead of wrap |
375 | // if no scrollback exists (yet), wing, instead of wrap |
375 | |
376 | |
… | |
… | |
389 | |
390 | |
390 | term_start = 0; |
391 | term_start = 0; |
391 | } |
392 | } |
392 | |
393 | |
393 | #ifdef DEBUG_STRICT //TODO: remove |
394 | #ifdef DEBUG_STRICT //TODO: remove |
394 | for (int i = -nsaved; i < nrow; i++) |
395 | for (int i = top_row; i < nrow; i++) |
395 | assert (ROW (i).t); |
396 | assert (ROW (i).t); |
396 | #endif |
397 | #endif |
397 | |
398 | |
398 | free (old_buf); |
399 | free (old_buf); |
399 | delete old_ta; |
400 | delete old_ta; |
… | |
… | |
430 | delete ralloc; ralloc = 0; |
431 | delete ralloc; ralloc = 0; |
431 | |
432 | |
432 | free (row_buf); |
433 | free (row_buf); |
433 | free (swap_buf); |
434 | free (swap_buf); |
434 | free (drawn_buf); |
435 | free (drawn_buf); |
435 | free (temp_buf); |
|
|
436 | free (tabs); |
436 | free (tabs); |
437 | |
437 | |
438 | row_buf = 0; // signal that we freed all the arrays |
438 | row_buf = 0; // signal that we freed all the arrays |
439 | } |
439 | } |
440 | |
440 | |
… | |
… | |
572 | * Change the colour for following text |
572 | * Change the colour for following text |
573 | */ |
573 | */ |
574 | void |
574 | void |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
576 | { |
576 | { |
577 | if (color > maxTermCOLOR) |
577 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
578 | color = fgbg; |
578 | color = fgbg; |
579 | |
579 | |
580 | if (fgbg == Color_fg) |
580 | if (fgbg == Color_fg) |
581 | rstyle = SET_FGCOLOR (rstyle, color); |
581 | rstyle = SET_FGCOLOR (rstyle, color); |
582 | else |
582 | else |
… | |
… | |
613 | want_refresh = 1; |
613 | want_refresh = 1; |
614 | num_scr += count; |
614 | num_scr += count; |
615 | |
615 | |
616 | if (count > 0 |
616 | if (count > 0 |
617 | && row1 == 0 |
617 | && row1 == 0 |
618 | && row2 == nrow - 1 |
|
|
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
618 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
620 | { |
619 | { |
621 | nsaved = min (nsaved + count, saveLines); |
620 | top_row = max (top_row - count, -saveLines); |
622 | |
621 | |
623 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
622 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
624 | |
623 | |
|
|
624 | // scroll everything up 'count' lines |
625 | term_start = (term_start + count) % total_rows; |
625 | term_start = (term_start + count) % total_rows; |
626 | |
626 | |
|
|
627 | { |
|
|
628 | // severe bottommost scrolled line |
|
|
629 | line_t &l = ROW(row2 - count); |
|
|
630 | l.touch (); |
|
|
631 | l.is_longer (0); |
|
|
632 | } |
|
|
633 | |
|
|
634 | // erase newly scorlled-in lines |
|
|
635 | for (int i = count; i; --i ) |
|
|
636 | { |
|
|
637 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
638 | // it is worth the effort on slower machines |
|
|
639 | line_t &l = ROW(nrow - i); |
|
|
640 | |
|
|
641 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
642 | |
|
|
643 | l.l = 0; |
|
|
644 | l.f = 0; |
|
|
645 | } |
|
|
646 | |
|
|
647 | // now copy lines below the scroll region bottom to the |
|
|
648 | // bottom of the screen again, so they look as if they |
|
|
649 | // hadn't moved. |
|
|
650 | for (int i = nrow; --i > row2; ) |
|
|
651 | { |
|
|
652 | line_t &l1 = ROW(i - count); |
|
|
653 | line_t &l2 = ROW(i); |
|
|
654 | |
|
|
655 | ::swap (l1, l2); |
|
|
656 | l2.touch (); |
|
|
657 | } |
|
|
658 | |
|
|
659 | // move and/or clear selection, if any |
627 | if (selection.op && current_screen == selection.screen) |
660 | if (selection.op && current_screen == selection.screen) |
628 | { |
661 | { |
629 | selection.beg.row -= count; |
662 | selection.beg.row -= count; |
630 | selection.end.row -= count; |
663 | selection.end.row -= count; |
631 | selection.mark.row -= count; |
664 | selection.mark.row -= count; |
632 | |
665 | |
633 | if (selection.beg.row < -nsaved |
666 | if (selection.beg.row < top_row |
634 | || selection.end.row < -nsaved |
667 | || selection.end.row < top_row |
635 | || selection.mark.row < -nsaved) |
668 | || selection.mark.row < top_row) |
636 | { |
669 | { |
637 | CLEAR_ALL_SELECTION (); |
670 | CLEAR_ALL_SELECTION (); |
638 | selection.op = SELECTION_CLEAR; |
671 | selection.op = SELECTION_CLEAR; |
639 | } |
672 | } |
640 | } |
673 | } |
641 | |
674 | |
642 | for (int i = count; i--; ) |
675 | // finally move the view window, if desired |
643 | { |
|
|
644 | ROW(row2 - i).l = 0; |
|
|
645 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
646 | } |
|
|
647 | |
|
|
648 | if (OPTION (Opt_scrollWithBuffer) |
676 | if (OPTION (Opt_scrollWithBuffer) |
649 | && view_start != 0 |
677 | && view_start != 0 |
650 | && view_start != saveLines) |
678 | && view_start != -saveLines) |
651 | scr_page (UP, count); |
679 | scr_page (UP, count); |
652 | } |
680 | } |
653 | else |
681 | else |
654 | { |
682 | { |
655 | if (selection.op && current_screen == selection.screen) |
683 | if (selection.op && current_screen == selection.screen) |
… | |
… | |
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 | |
… | |
… | |
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 |
… | |
… | |
1318 | rxvt_term::scr_erase_savelines () |
1345 | rxvt_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 | /* |
… | |
… | |
1781 | /* ------------------------------------------------------------------------- */ |
1808 | /* ------------------------------------------------------------------------- */ |
1782 | /* |
1809 | /* |
1783 | * Move the display so that the line represented by scrollbar value Y is at |
1810 | * Move the display so that the line represented by scrollbar value Y is at |
1784 | * the top of the screen |
1811 | * the top of the screen |
1785 | */ |
1812 | */ |
1786 | int |
1813 | void |
1787 | rxvt_term::scr_move_to (int y, int len) |
1814 | rxvt_term::scr_move_to (int y, int len) |
1788 | { |
1815 | { |
1789 | long p = 0; |
1816 | int p = (top_row - nrow) * (len - y) / len + (nrow - 1); |
1790 | unsigned int oldviewstart; |
|
|
1791 | |
1817 | |
1792 | oldviewstart = view_start; |
1818 | scr_changeview (p); |
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 | */ |
1811 | int |
1826 | bool |
1812 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1827 | rxvt_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 | |
1833 | int |
1836 | bool |
1834 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1837 | rxvt_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; |
1838 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1846 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1839 | |
|
|
1840 | want_refresh = 1; |
1847 | want_refresh = 1; |
1841 | num_scr -= (view_start - oldviewstart); |
|
|
1842 | } |
|
|
1843 | |
1848 | |
1844 | return (int)view_start - (int)oldviewstart; |
1849 | return true; |
1845 | } |
1850 | } |
1846 | |
1851 | |
1847 | /* ------------------------------------------------------------------------- */ |
1852 | /* ------------------------------------------------------------------------- */ |
1848 | void |
1853 | void |
1849 | rxvt_term::scr_bell () |
1854 | rxvt_term::scr_bell () |
… | |
… | |
1858 | # endif |
1863 | # endif |
1859 | |
1864 | |
1860 | if (OPTION (Opt_visualBell)) |
1865 | if (OPTION (Opt_visualBell)) |
1861 | { |
1866 | { |
1862 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1867 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1868 | display->flush (); |
1863 | rxvt_usleep (VISUAL_BELL_DURATION); |
1869 | rxvt_usleep (VISUAL_BELL_DURATION); |
1864 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1870 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1865 | } |
1871 | } |
1866 | else |
1872 | else |
1867 | XBell (display->display, 0); |
1873 | XBell (display->display, 0); |
… | |
… | |
1881 | if ((fd = popen_printer ()) == NULL) |
1887 | if ((fd = popen_printer ()) == NULL) |
1882 | return; |
1888 | return; |
1883 | |
1889 | |
1884 | if (fullhist) |
1890 | if (fullhist) |
1885 | { |
1891 | { |
1886 | nrows = nrow + nsaved; |
1892 | nrows = nrow - top_row; |
1887 | row_start = -nsaved; |
1893 | row_start = top_row; |
1888 | } |
1894 | } |
1889 | else |
1895 | else |
1890 | { |
1896 | { |
1891 | nrows = nrow; |
1897 | nrows = nrow; |
1892 | row_start = -view_start; |
1898 | row_start = view_start; |
1893 | } |
1899 | } |
1894 | |
1900 | |
1895 | wctomb (0, 0); |
1901 | wctomb (0, 0); |
1896 | |
1902 | |
1897 | for (int r1 = 0; r1 < nrows; r1++) |
1903 | for (int r1 = 0; r1 < nrows; r1++) |
… | |
… | |
2025 | |
2031 | |
2026 | /* make sure no outline cursor is left around */ |
2032 | /* make sure no outline cursor is left around */ |
2027 | setoldcursor = 0; |
2033 | setoldcursor = 0; |
2028 | if (ocrow != -1) |
2034 | if (ocrow != -1) |
2029 | { |
2035 | { |
2030 | if (screen.cur.row + view_start != ocrow |
2036 | if (screen.cur.row - view_start != ocrow |
2031 | || screen.cur.col != oldcursor.col) |
2037 | || screen.cur.col != oldcursor.col) |
2032 | { |
2038 | { |
2033 | if (ocrow < nrow |
2039 | if (ocrow < nrow |
2034 | && oldcursor.col < ncol) |
2040 | && oldcursor.col < ncol) |
2035 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2041 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
… | |
… | |
2043 | else if (!focus) |
2049 | else if (!focus) |
2044 | setoldcursor = 1; |
2050 | setoldcursor = 1; |
2045 | |
2051 | |
2046 | if (setoldcursor) |
2052 | if (setoldcursor) |
2047 | { |
2053 | { |
2048 | if (screen.cur.row + view_start >= nrow) |
2054 | if (screen.cur.row - view_start >= nrow) |
2049 | oldcursor.row = -1; |
2055 | oldcursor.row = -1; |
2050 | else |
2056 | else |
2051 | { |
2057 | { |
2052 | oldcursor.row = screen.cur.row + view_start; |
2058 | oldcursor.row = screen.cur.row - view_start; |
2053 | oldcursor.col = screen.cur.col; |
2059 | oldcursor.col = screen.cur.col; |
2054 | } |
2060 | } |
2055 | } |
2061 | } |
2056 | } |
2062 | } |
2057 | |
2063 | |
… | |
… | |
2079 | row = i > 0 ? 0 : j - 1; |
2085 | row = i > 0 ? 0 : j - 1; |
2080 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2086 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2081 | { |
2087 | { |
2082 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2088 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2083 | { |
2089 | { |
2084 | line_t s = ROW(row - view_start); |
2090 | line_t s = ROW(view_start + row); |
2085 | line_t d = drawn_buf[row]; |
2091 | line_t d = drawn_buf[row]; |
2086 | line_t d2 = drawn_buf[row + i]; |
2092 | line_t d2 = drawn_buf[row + i]; |
2087 | |
2093 | |
2088 | for (nits = 0, col = ncol; col--; ) |
2094 | for (nits = 0, col = ncol; col--; ) |
2089 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2095 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
… | |
… | |
2127 | /* |
2133 | /* |
2128 | * E: main pass across every character |
2134 | * E: main pass across every character |
2129 | */ |
2135 | */ |
2130 | for (row = 0; row < nrow; row++) |
2136 | for (row = 0; row < nrow; row++) |
2131 | { |
2137 | { |
2132 | text_t *stp = ROW(row - view_start).t; |
2138 | text_t *stp = ROW(view_start + row).t; |
2133 | rend_t *srp = ROW(row - view_start).r; |
2139 | rend_t *srp = ROW(view_start + row).r; |
2134 | text_t *dtp = drawn_buf[row].t; |
2140 | text_t *dtp = drawn_buf[row].t; |
2135 | rend_t *drp = drawn_buf[row].r; |
2141 | rend_t *drp = drawn_buf[row].r; |
2136 | |
2142 | |
2137 | /* |
2143 | /* |
2138 | * E2: OK, now the real pass |
2144 | * E2: OK, now the real pass |
… | |
… | |
2375 | /* |
2381 | /* |
2376 | * H: cleanup selection |
2382 | * H: cleanup selection |
2377 | */ |
2383 | */ |
2378 | scr_reverse_selection (); |
2384 | scr_reverse_selection (); |
2379 | |
2385 | |
2380 | if (refresh_type & SMOOTH_REFRESH) |
|
|
2381 | XFlush (display->display); |
|
|
2382 | |
|
|
2383 | num_scr = 0; |
2386 | num_scr = 0; |
2384 | num_scr_allow = 1; |
2387 | num_scr_allow = 1; |
2385 | } |
2388 | } |
2386 | |
2389 | |
2387 | void |
2390 | void |
2388 | rxvt_term::scr_remap_chars (line_t &l) |
2391 | rxvt_term::scr_remap_chars (line_t &l) |
2389 | { |
2392 | { |
2390 | if (!l.t) |
2393 | if (!l.t) |
2391 | return; |
2394 | return; |
2392 | |
2395 | |
2393 | l.touch (); // maybe a bit of an overkill, but its not performance-relevant |
2396 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2394 | |
2397 | |
2395 | for (int i = ncol; i--; ) |
2398 | for (int i = ncol; i--; ) |
2396 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2399 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2397 | } |
2400 | } |
2398 | |
2401 | |
… | |
… | |
2451 | |
2454 | |
2452 | if (really) |
2455 | if (really) |
2453 | XClearWindow (display->display, vt); |
2456 | XClearWindow (display->display, vt); |
2454 | } |
2457 | } |
2455 | |
2458 | |
|
|
2459 | void |
|
|
2460 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
|
|
2461 | { |
|
|
2462 | int view_end = view_start + nrow; |
|
|
2463 | int row, col; |
|
|
2464 | |
|
|
2465 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
|
|
2466 | { |
|
|
2467 | text_t *stp = ROW(row).t; |
|
|
2468 | rend_t *srp = ROW(row).r; |
|
|
2469 | |
|
|
2470 | for (col = beg_col; col < end_col; col++) |
|
|
2471 | srp[col] ^= rstyle1; |
|
|
2472 | |
|
|
2473 | while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2474 | srp[col] ^= rstyle2; |
|
|
2475 | |
|
|
2476 | if (++col < end_col) |
|
|
2477 | srp[col] ^= rstyle2; |
|
|
2478 | } |
|
|
2479 | } |
|
|
2480 | |
|
|
2481 | void |
|
|
2482 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
|
|
2483 | { |
|
|
2484 | int view_end = view_start + nrow; |
|
|
2485 | int row, col; |
|
|
2486 | |
|
|
2487 | if (beg_row >= view_start) |
|
|
2488 | { |
|
|
2489 | col = beg_col; |
|
|
2490 | row = beg_row; |
|
|
2491 | } |
|
|
2492 | else |
|
|
2493 | { |
|
|
2494 | col = 0; |
|
|
2495 | row = view_start; |
|
|
2496 | } |
|
|
2497 | |
|
|
2498 | for (; row < min (end_row, view_end); row++, col = 0) |
|
|
2499 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2500 | srp[col] ^= rstyle; |
|
|
2501 | |
|
|
2502 | if (row == end_row) |
|
|
2503 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
|
|
2504 | srp[col] ^= rstyle; |
|
|
2505 | } |
|
|
2506 | |
2456 | /* ------------------------------------------------------------------------- */ |
2507 | /* ------------------------------------------------------------------------- */ |
2457 | void |
2508 | void |
2458 | rxvt_term::scr_reverse_selection () |
2509 | rxvt_term::scr_reverse_selection () |
2459 | { |
2510 | { |
2460 | if (selection.op |
2511 | if (selection.op |
2461 | && current_screen == selection.screen |
2512 | && current_screen == selection.screen |
2462 | && selection.end.row >= -view_start) |
2513 | && selection.end.row >= view_start) |
2463 | { |
2514 | { |
2464 | int view_end = -view_start + nrow; |
|
|
2465 | int row, col; |
|
|
2466 | |
|
|
2467 | #if ENABLE_FRILLS |
2515 | #if ENABLE_FRILLS |
2468 | if (selection.rect) |
2516 | if (selection.rect) |
2469 | { |
2517 | 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++) |
2518 | selection.end.row, selection.end.col, |
2471 | { |
2519 | 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 |
2520 | else |
2486 | #endif |
2521 | #endif |
2487 | { |
2522 | scr_xor_span (selection.beg.row, selection.beg.col, |
2488 | if (selection.beg.row >= -view_start) |
2523 | selection.end.row, selection.end.col, |
2489 | { |
2524 | 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 | } |
2525 | } |
2508 | } |
2526 | } |
2509 | |
2527 | |
2510 | /* ------------------------------------------------------------------------- */ |
2528 | /* ------------------------------------------------------------------------- */ |
2511 | /* |
2529 | /* |
… | |
… | |
2549 | |
2567 | |
2550 | if (!selection.op) |
2568 | if (!selection.op) |
2551 | return; |
2569 | return; |
2552 | |
2570 | |
2553 | pos.row = pos.col = 0; |
2571 | pos.row = pos.col = 0; |
2554 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2572 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2555 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2573 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2556 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2574 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2557 | || (check_more == 1 |
2575 | || (check_more == 1 |
2558 | && current_screen == selection.screen |
2576 | && current_screen == selection.screen |
2559 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2577 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2560 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2578 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2561 | || (check_more == 2 |
2579 | || (check_more == 2 |
… | |
… | |
3003 | { |
3021 | { |
3004 | display->set_selection_owner (this); |
3022 | display->set_selection_owner (this); |
3005 | return true; |
3023 | return true; |
3006 | } |
3024 | } |
3007 | else |
3025 | else |
|
|
3026 | { |
|
|
3027 | selection_clear (); |
3008 | return false; |
3028 | return false; |
|
|
3029 | } |
3009 | |
3030 | |
3010 | #if 0 |
3031 | #if 0 |
3011 | XTextProperty ct; |
3032 | XTextProperty ct; |
3012 | |
3033 | |
3013 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3034 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
… | |
… | |
3027 | rxvt_term::selection_click (int clicks, int x, int y) |
3048 | rxvt_term::selection_click (int clicks, int x, int y) |
3028 | { |
3049 | { |
3029 | clicks = ((clicks - 1) % 3) + 1; |
3050 | clicks = ((clicks - 1) % 3) + 1; |
3030 | selection.clicks = clicks; /* save clicks so extend will work */ |
3051 | selection.clicks = clicks; /* save clicks so extend will work */ |
3031 | |
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 | |
3032 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3062 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3033 | |
3063 | |
3034 | if (clicks == 2 || clicks == 3) |
3064 | if (clicks == 2 || clicks == 3) |
3035 | selection_extend_colrow (selection.mark.col, |
3065 | selection_extend_colrow (selection.mark.col, |
3036 | selection.mark.row + view_start, |
3066 | selection.mark.row - view_start, |
3037 | 0, /* button 3 */ |
3067 | 0, /* button 3 */ |
3038 | 1, /* button press */ |
3068 | 1, /* button press */ |
3039 | 0); /* click change */ |
3069 | 0); /* click change */ |
3040 | } |
3070 | } |
3041 | |
3071 | |
… | |
… | |
3046 | void |
3076 | void |
3047 | rxvt_term::selection_start_colrow (int col, int row) |
3077 | rxvt_term::selection_start_colrow (int col, int row) |
3048 | { |
3078 | { |
3049 | want_refresh = 1; |
3079 | want_refresh = 1; |
3050 | |
3080 | |
3051 | selection.mark.row = row - view_start; |
3081 | selection.mark.row = row + view_start; |
3052 | selection.mark.col = col; |
3082 | selection.mark.col = col; |
3053 | |
3083 | |
3054 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3084 | selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1); |
3055 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3085 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3056 | |
3086 | |
3057 | while (selection.mark.col > 0 |
3087 | while (selection.mark.col > 0 |
3058 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3088 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3059 | --selection.mark.col; |
3089 | --selection.mark.col; |
… | |
… | |
3087 | text_t *stp; |
3117 | text_t *stp; |
3088 | rend_t *srp; |
3118 | rend_t *srp; |
3089 | |
3119 | |
3090 | if (dirn == UP) |
3120 | if (dirn == UP) |
3091 | { |
3121 | { |
3092 | bound.row = - nsaved - 1; |
3122 | bound.row = top_row - 1; |
3093 | bound.col = 0; |
3123 | bound.col = 0; |
3094 | dirnadd = -1; |
3124 | dirnadd = -1; |
3095 | } |
3125 | } |
3096 | else |
3126 | else |
3097 | { |
3127 | { |
… | |
… | |
3175 | * 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 |
3176 | * be _past_ a character for it to be selected. |
3206 | * be _past_ a character for it to be selected. |
3177 | */ |
3207 | */ |
3178 | if (((selection.clicks % 3) == 1) && !flag |
3208 | if (((selection.clicks % 3) == 1) && !flag |
3179 | && (col == selection.mark.col |
3209 | && (col == selection.mark.col |
3180 | && (row == selection.mark.row + view_start))) |
3210 | && (row == selection.mark.row - view_start))) |
3181 | { |
3211 | { |
3182 | /* select nothing */ |
3212 | /* select nothing */ |
3183 | selection.beg.row = selection.end.row = 0; |
3213 | selection.beg.row = selection.end.row = 0; |
3184 | selection.beg.col = selection.end.col = 0; |
3214 | selection.beg.col = selection.end.col = 0; |
3185 | selection.clicks = 4; |
3215 | selection.clicks = 4; |
… | |
… | |
3240 | selection.beg.col = selection.end.col = selection.mark.col; |
3270 | selection.beg.col = selection.end.col = selection.mark.col; |
3241 | selection.beg.row = selection.end.row = selection.mark.row; |
3271 | selection.beg.row = selection.end.row = selection.mark.row; |
3242 | } |
3272 | } |
3243 | |
3273 | |
3244 | pos.col = col; |
3274 | pos.col = col; |
3245 | pos.row = row - view_start; |
3275 | pos.row = view_start + row; |
3246 | |
3276 | |
3247 | /* |
3277 | /* |
3248 | * 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 |
3249 | * in the way button3 drag extension works. |
3279 | * in the way button3 drag extension works. |
3250 | * We're either doing: button1 drag; button3 press; or button3 drag |
3280 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3331 | else if (selection.clicks == 2) |
3361 | else if (selection.clicks == 2) |
3332 | { |
3362 | { |
3333 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3363 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3334 | selection.end.col--; |
3364 | selection.end.col--; |
3335 | |
3365 | |
3336 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3337 | { |
|
|
3338 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3366 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3339 | selection_delimit_word (DN, &selection.end, &selection.end); |
3367 | selection_delimit_word (DN, &selection.end, &selection.end); |
3340 | } |
|
|
3341 | } |
3368 | } |
3342 | else if (selection.clicks == 3) |
3369 | else if (selection.clicks == 3) |
3343 | { |
3370 | { |
3344 | #if ENABLE_FRILLS |
3371 | #if ENABLE_FRILLS |
3345 | if (OPTION (Opt_tripleclickwords)) |
3372 | if (OPTION (Opt_tripleclickwords)) |
… | |
… | |
3738 | for (int y = ov_h; y--; ) |
3765 | for (int y = ov_h; y--; ) |
3739 | { |
3766 | { |
3740 | text_t *t1 = ov_text[y]; |
3767 | text_t *t1 = ov_text[y]; |
3741 | rend_t *r1 = ov_rend[y]; |
3768 | rend_t *r1 = ov_rend[y]; |
3742 | |
3769 | |
3743 | 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; |
3744 | 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; |
3745 | |
3772 | |
3746 | for (int x = ov_w; x--; ) |
3773 | for (int x = ov_w; x--; ) |
3747 | { |
3774 | { |
3748 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3775 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3749 | 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)); |