… | |
… | |
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. */ |
119 | void |
119 | void |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | rxvt_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 */ |
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) const |
148 | { |
148 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
150 | |
150 | |
151 | l.l = 0; |
151 | l.l = 0; |
152 | l.f = 0; |
152 | l.f = 0; |
… | |
… | |
179 | if (nrow + saveLines < 2) |
179 | if (nrow + saveLines < 2) |
180 | { |
180 | { |
181 | //TODO//FIXME |
181 | //TODO//FIXME |
182 | saveLines++; |
182 | saveLines++; |
183 | prev_nrow--; |
183 | prev_nrow--; |
184 | nsaved++; |
184 | top_row--; |
185 | } |
185 | } |
186 | |
186 | |
187 | want_refresh = 1; |
187 | want_refresh = 1; |
188 | |
188 | |
189 | int prev_total_rows = prev_nrow + saveLines; |
189 | int prev_total_rows = prev_nrow + saveLines; |
… | |
… | |
195 | if (!row_buf) |
195 | if (!row_buf) |
196 | { |
196 | { |
197 | /* |
197 | /* |
198 | * first time called so just malloc everything: don't rely on realloc |
198 | * first time called so just malloc everything: don't rely on realloc |
199 | */ |
199 | */ |
200 | nsaved = 0; /* no saved lines */ |
200 | top_row = 0; /* no saved lines */ |
201 | term_start = 0; |
201 | term_start = 0; |
202 | |
202 | |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | |
205 | |
… | |
… | |
234 | selection.text = NULL; |
234 | selection.text = NULL; |
235 | selection.len = 0; |
235 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
238 | selection.clicks = 0; |
239 | CLEAR_ALL_SELECTION (); |
|
|
240 | rvideo = 0; |
239 | rvideo = 0; |
241 | } |
240 | } |
242 | else |
241 | else |
243 | { |
242 | { |
244 | /* |
243 | /* |
… | |
… | |
276 | |
275 | |
277 | line_t *old_buf = row_buf; |
276 | line_t *old_buf = row_buf; |
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
277 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
279 | |
278 | |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
279 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
281 | int pend = MOD (term_start - nsaved , prev_total_rows); |
280 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
281 | int q = total_rows; // rewrapped row |
283 | |
282 | |
284 | if (nsaved) |
283 | if (top_row) |
285 | { |
284 | { |
286 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
285 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
287 | // to come up with a lean and mean algorithm. |
286 | // to come up with a lean and mean algorithm. |
288 | |
287 | |
289 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
… | |
… | |
325 | qline->l = ncol; |
324 | qline->l = ncol; |
326 | qline->is_longer (1); |
325 | qline->is_longer (1); |
327 | |
326 | |
328 | int qcol = 0; |
327 | int qcol = 0; |
329 | |
328 | |
|
|
329 | // see below for cursor adjustment rationale |
|
|
330 | if (p == ocur.row) |
|
|
331 | screen.cur.row = q - (total_rows - nrow); |
|
|
332 | |
330 | // fill a single destination line |
333 | // fill a single destination line |
331 | while (lofs < llen && qcol < ncol) |
334 | while (lofs < llen && qcol < ncol) |
332 | { |
335 | { |
333 | int prow = lofs / prev_ncol; |
336 | int prow = lofs / prev_ncol; |
334 | int pcol = lofs % prev_ncol; |
337 | int pcol = lofs % prev_ncol; |
… | |
… | |
344 | |
347 | |
345 | line_t &pline = old_buf [prow]; |
348 | line_t &pline = old_buf [prow]; |
346 | |
349 | |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
348 | |
351 | |
|
|
352 | #if DEBUG_STRICT |
349 | assert (len); |
353 | assert (len); |
350 | assert (pline.t); |
354 | assert (pline.t); |
|
|
355 | #endif |
351 | |
356 | |
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
357 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
358 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
354 | |
359 | |
355 | lofs += len; |
360 | lofs += len; |
… | |
… | |
362 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
367 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
363 | } |
368 | } |
364 | while (p != pend && q > 0); |
369 | while (p != pend && q > 0); |
365 | |
370 | |
366 | term_start = total_rows - nrow; |
371 | term_start = total_rows - nrow; |
367 | nsaved = term_start - q; |
372 | top_row = q - term_start; |
368 | |
373 | |
369 | // make sure all terminal lines exist |
374 | // make sure all terminal lines exist |
370 | while (nsaved < 0) |
375 | while (top_row > 0) |
371 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
376 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
372 | } |
377 | } |
373 | else |
378 | else |
374 | { |
379 | { |
375 | // if no scrollback exists (yet), wing, instead of wrap |
380 | // if no scrollback exists (yet), wing, instead of wrap |
376 | |
381 | |
… | |
… | |
389 | } |
394 | } |
390 | |
395 | |
391 | term_start = 0; |
396 | term_start = 0; |
392 | } |
397 | } |
393 | |
398 | |
394 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
395 | for (int i = -nsaved; i < nrow; i++) |
|
|
396 | assert (ROW (i).t); |
|
|
397 | #endif |
|
|
398 | |
|
|
399 | free (old_buf); |
399 | free (old_buf); |
400 | delete old_ta; |
400 | delete old_ta; |
401 | delete old_ra; |
401 | delete old_ra; |
402 | |
402 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
405 | |
406 | if (tabs) |
406 | if (tabs) |
407 | free (tabs); |
407 | free (tabs); |
408 | } |
408 | } |
|
|
409 | |
|
|
410 | CLEAR_ALL_SELECTION (); |
409 | |
411 | |
410 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
412 | |
414 | |
413 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
415 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
… | |
… | |
448 | scr_release (); |
450 | scr_release (); |
449 | prev_nrow = prev_ncol = 0; |
451 | prev_nrow = prev_ncol = 0; |
450 | scr_reset (); |
452 | scr_reset (); |
451 | |
453 | |
452 | scr_clear (true); |
454 | scr_clear (true); |
453 | scr_refresh (SLOW_REFRESH); |
455 | scr_refresh (); |
454 | } |
456 | } |
455 | |
457 | |
456 | /* ------------------------------------------------------------------------- * |
458 | /* ------------------------------------------------------------------------- * |
457 | * PROCESS SCREEN COMMANDS * |
459 | * PROCESS SCREEN COMMANDS * |
458 | * ------------------------------------------------------------------------- */ |
460 | * ------------------------------------------------------------------------- */ |
… | |
… | |
460 | * Save and Restore cursor |
462 | * Save and Restore cursor |
461 | * XTERM_SEQ: Save cursor : ESC 7 |
463 | * XTERM_SEQ: Save cursor : ESC 7 |
462 | * XTERM_SEQ: Restore cursor: ESC 8 |
464 | * XTERM_SEQ: Restore cursor: ESC 8 |
463 | */ |
465 | */ |
464 | void |
466 | void |
465 | rxvt_term::scr_cursor (int mode) |
467 | rxvt_term::scr_cursor (cursor_mode mode) |
466 | { |
468 | { |
467 | screen_t *s; |
469 | screen_t *s; |
468 | |
470 | |
469 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
471 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
470 | if (current_screen == SECONDARY) |
472 | if (current_screen == SECONDARY) |
… | |
… | |
613 | want_refresh = 1; |
615 | want_refresh = 1; |
614 | num_scr += count; |
616 | num_scr += count; |
615 | |
617 | |
616 | if (count > 0 |
618 | if (count > 0 |
617 | && row1 == 0 |
619 | && row1 == 0 |
618 | && row2 == nrow - 1 |
|
|
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
620 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
620 | { |
621 | { |
621 | nsaved = min (nsaved + count, saveLines); |
622 | top_row = max (top_row - count, -saveLines); |
622 | |
623 | |
623 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
624 | // scroll everything up 'count' lines |
|
|
625 | term_start = (term_start + count) % total_rows; |
|
|
626 | |
|
|
627 | // sever bottommost line |
|
|
628 | { |
|
|
629 | line_t &l = ROW(row2 - count); |
|
|
630 | l.is_longer (0); |
|
|
631 | l.touch (); |
|
|
632 | } |
|
|
633 | |
|
|
634 | // erase newly scrolled-in lines |
|
|
635 | for (int i = count; 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 - 1 - 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 | } |
624 | |
658 | |
625 | term_start = (term_start + count) % total_rows; |
659 | // move and/or clear selection, if any |
626 | |
|
|
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 | // 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) |
676 | if (OPTION (Opt_scrollWithBuffer) |
655 | && view_start != 0 |
677 | && view_start != 0 |
656 | && view_start != saveLines) |
678 | && view_start != -saveLines) |
657 | scr_page (UP, count); |
679 | scr_page (UP, count); |
|
|
680 | |
|
|
681 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
|
|
682 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
658 | } |
683 | } |
659 | else |
684 | else |
660 | { |
685 | { |
661 | if (selection.op && current_screen == selection.screen) |
686 | if (selection.op && current_screen == selection.screen) |
662 | { |
687 | { |
… | |
… | |
738 | } |
763 | } |
739 | |
764 | |
740 | #ifdef DEBUG_STRICT |
765 | #ifdef DEBUG_STRICT |
741 | assert (screen.cur.col < ncol); |
766 | assert (screen.cur.col < ncol); |
742 | assert (screen.cur.row < nrow |
767 | assert (screen.cur.row < nrow |
743 | && screen.cur.row >= -nsaved); |
768 | && screen.cur.row >= top_row); |
744 | #endif |
769 | #endif |
745 | int row = screen.cur.row; |
770 | int row = screen.cur.row; |
746 | |
771 | |
747 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
772 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
748 | |
773 | |
… | |
… | |
794 | CLEAR_SELECTION (); |
819 | CLEAR_SELECTION (); |
795 | } |
820 | } |
796 | |
821 | |
797 | if (screen.flags & Screen_WrapNext) |
822 | if (screen.flags & Screen_WrapNext) |
798 | { |
823 | { |
799 | max_it (line->l, ncol); |
|
|
800 | line->is_longer (1); |
|
|
801 | |
|
|
802 | scr_do_wrap (); |
824 | scr_do_wrap (); |
803 | |
825 | |
|
|
826 | line->l = ncol; |
|
|
827 | line->is_longer (1); |
|
|
828 | |
804 | row = screen.cur.row; |
829 | row = screen.cur.row; |
805 | line = &ROW(row); /* _must_ refresh */ |
830 | line = &ROW(row); /* _must_ refresh */ |
806 | } |
831 | } |
807 | |
832 | |
808 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
833 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
… | |
… | |
1323 | rxvt_term::scr_erase_savelines () |
1348 | rxvt_term::scr_erase_savelines () |
1324 | { |
1349 | { |
1325 | want_refresh = 1; |
1350 | want_refresh = 1; |
1326 | ZERO_SCROLLBACK (); |
1351 | ZERO_SCROLLBACK (); |
1327 | |
1352 | |
1328 | nsaved = 0; |
1353 | top_row = 0; |
1329 | } |
1354 | } |
1330 | #endif |
1355 | #endif |
1331 | |
1356 | |
1332 | /* ------------------------------------------------------------------------- */ |
1357 | /* ------------------------------------------------------------------------- */ |
1333 | /* |
1358 | /* |
… | |
… | |
1767 | } |
1792 | } |
1768 | |
1793 | |
1769 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1794 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1770 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1795 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1771 | |
1796 | |
|
|
1797 | num_scr_allow = 0; |
|
|
1798 | |
1772 | if (refresh) |
1799 | if (refresh) |
1773 | scr_refresh (SLOW_REFRESH); |
1800 | scr_refresh (); |
1774 | } |
1801 | } |
1775 | |
1802 | |
1776 | /* ------------------------------------------------------------------------- */ |
1803 | /* ------------------------------------------------------------------------- */ |
1777 | /* |
1804 | /* |
1778 | * Refresh the entire screen |
1805 | * Refresh the entire screen |
… | |
… | |
1786 | /* ------------------------------------------------------------------------- */ |
1813 | /* ------------------------------------------------------------------------- */ |
1787 | /* |
1814 | /* |
1788 | * Move the display so that the line represented by scrollbar value Y is at |
1815 | * Move the display so that the line represented by scrollbar value Y is at |
1789 | * the top of the screen |
1816 | * the top of the screen |
1790 | */ |
1817 | */ |
1791 | int |
1818 | void |
1792 | rxvt_term::scr_move_to (int y, int len) |
1819 | rxvt_term::scr_move_to (int y, int len) |
1793 | { |
1820 | { |
1794 | long p = 0; |
1821 | 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 | } |
1822 | } |
1810 | |
1823 | |
1811 | /* ------------------------------------------------------------------------- */ |
1824 | /* ------------------------------------------------------------------------- */ |
1812 | /* |
1825 | /* |
1813 | * Page the screen up/down nlines |
1826 | * Page the screen up/down nlines |
1814 | * direction should be UP or DN |
1827 | * direction should be UP or DN |
1815 | */ |
1828 | */ |
1816 | int |
1829 | bool |
1817 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1830 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1818 | { |
1831 | { |
1819 | int n; |
1832 | 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; |
1833 | direction == UP ? view_start - nlines |
1832 | view_start = max (n, 0); |
1834 | : view_start + nlines; |
1833 | } |
|
|
1834 | |
1835 | |
1835 | return scr_changeview (oldviewstart); |
1836 | return scr_changeview (new_view_start); |
1836 | } |
1837 | } |
1837 | |
1838 | |
1838 | int |
1839 | bool |
1839 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1840 | rxvt_term::scr_changeview (int new_view_start) |
1840 | { |
1841 | { |
|
|
1842 | clamp_it (new_view_start, top_row, 0); |
|
|
1843 | |
1841 | if (view_start != oldviewstart) |
1844 | if (new_view_start == view_start) |
1842 | { |
1845 | return false; |
|
|
1846 | |
|
|
1847 | num_scr += new_view_start - view_start; |
|
|
1848 | view_start = new_view_start; |
|
|
1849 | want_refresh = 1; |
|
|
1850 | |
1843 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1851 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1844 | |
1852 | |
1845 | want_refresh = 1; |
1853 | return true; |
1846 | num_scr -= (view_start - oldviewstart); |
|
|
1847 | } |
|
|
1848 | |
|
|
1849 | return (int)view_start - (int)oldviewstart; |
|
|
1850 | } |
1854 | } |
1851 | |
1855 | |
1852 | /* ------------------------------------------------------------------------- */ |
1856 | /* ------------------------------------------------------------------------- */ |
1853 | void |
1857 | void |
1854 | rxvt_term::scr_bell () |
1858 | rxvt_term::scr_bell () |
… | |
… | |
1887 | if ((fd = popen_printer ()) == NULL) |
1891 | if ((fd = popen_printer ()) == NULL) |
1888 | return; |
1892 | return; |
1889 | |
1893 | |
1890 | if (fullhist) |
1894 | if (fullhist) |
1891 | { |
1895 | { |
1892 | nrows = nrow + nsaved; |
1896 | nrows = nrow - top_row; |
1893 | row_start = -nsaved; |
1897 | row_start = top_row; |
1894 | } |
1898 | } |
1895 | else |
1899 | else |
1896 | { |
1900 | { |
1897 | nrows = nrow; |
1901 | nrows = nrow; |
1898 | row_start = -view_start; |
1902 | row_start = view_start; |
1899 | } |
1903 | } |
1900 | |
1904 | |
1901 | wctomb (0, 0); |
1905 | wctomb (0, 0); |
1902 | |
1906 | |
1903 | for (int r1 = 0; r1 < nrows; r1++) |
1907 | for (int r1 = 0; r1 < nrows; r1++) |
… | |
… | |
1935 | * Refresh the screen |
1939 | * Refresh the screen |
1936 | * drawn_text/drawn_rend contain the screen information before the update. |
1940 | * drawn_text/drawn_rend contain the screen information before the update. |
1937 | * screen.text/screen.rend contain what the screen will change to. |
1941 | * screen.text/screen.rend contain what the screen will change to. |
1938 | */ |
1942 | */ |
1939 | void |
1943 | void |
1940 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1944 | rxvt_term::scr_refresh () |
1941 | { |
1945 | { |
1942 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1946 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1943 | showcursor; /* show the cursor */ |
1947 | showcursor; /* show the cursor */ |
1944 | int16_t col, row, /* column/row we're processing */ |
1948 | int16_t col, row, /* column/row we're processing */ |
1945 | ocrow; /* old cursor row */ |
1949 | ocrow; /* old cursor row */ |
… | |
… | |
2031 | |
2035 | |
2032 | /* make sure no outline cursor is left around */ |
2036 | /* make sure no outline cursor is left around */ |
2033 | setoldcursor = 0; |
2037 | setoldcursor = 0; |
2034 | if (ocrow != -1) |
2038 | if (ocrow != -1) |
2035 | { |
2039 | { |
2036 | if (screen.cur.row + view_start != ocrow |
2040 | if (screen.cur.row - view_start != ocrow |
2037 | || screen.cur.col != oldcursor.col) |
2041 | || screen.cur.col != oldcursor.col) |
2038 | { |
2042 | { |
2039 | if (ocrow < nrow |
2043 | if (ocrow < nrow |
2040 | && oldcursor.col < ncol) |
2044 | && oldcursor.col < ncol) |
2041 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2045 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
… | |
… | |
2049 | else if (!focus) |
2053 | else if (!focus) |
2050 | setoldcursor = 1; |
2054 | setoldcursor = 1; |
2051 | |
2055 | |
2052 | if (setoldcursor) |
2056 | if (setoldcursor) |
2053 | { |
2057 | { |
2054 | if (screen.cur.row + view_start >= nrow) |
2058 | if (screen.cur.row - view_start >= nrow) |
2055 | oldcursor.row = -1; |
2059 | oldcursor.row = -1; |
2056 | else |
2060 | else |
2057 | { |
2061 | { |
2058 | oldcursor.row = screen.cur.row + view_start; |
2062 | oldcursor.row = screen.cur.row - view_start; |
2059 | oldcursor.col = screen.cur.col; |
2063 | oldcursor.col = screen.cur.col; |
2060 | } |
2064 | } |
2061 | } |
2065 | } |
2062 | } |
2066 | } |
2063 | |
2067 | |
… | |
… | |
2069 | #ifndef NO_SLOW_LINK_SUPPORT |
2073 | #ifndef NO_SLOW_LINK_SUPPORT |
2070 | /* |
2074 | /* |
2071 | * D: CopyArea pass - very useful for slower links |
2075 | * D: CopyArea pass - very useful for slower links |
2072 | * This has been deliberately kept simple. |
2076 | * This has been deliberately kept simple. |
2073 | */ |
2077 | */ |
2074 | i = num_scr; |
|
|
2075 | if (!display->is_local |
2078 | if (!display->is_local |
2076 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2079 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2077 | && abs (num_scr) < nrow && !must_clear) |
2080 | && abs (num_scr) < nrow && !must_clear) |
2078 | { |
2081 | { |
2079 | int16_t nits; |
2082 | int16_t nits; |
2080 | int j; |
2083 | int j; |
2081 | int len, wlen; |
2084 | int len, wlen; |
|
|
2085 | dLocal (int, num_scr); |
2082 | |
2086 | |
2083 | j = nrow; |
2087 | j = nrow; |
2084 | wlen = len = -1; |
2088 | wlen = len = -1; |
2085 | row = i > 0 ? 0 : j - 1; |
2089 | row = i > 0 ? 0 : j - 1; |
2086 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2090 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2087 | { |
2091 | { |
2088 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2092 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2089 | { |
2093 | { |
2090 | line_t s = ROW(row - view_start); |
2094 | line_t s = ROW(view_start + row); |
2091 | line_t d = drawn_buf[row]; |
2095 | line_t d = drawn_buf[row]; |
2092 | line_t d2 = drawn_buf[row + i]; |
2096 | line_t d2 = drawn_buf[row + i]; |
2093 | |
2097 | |
2094 | for (nits = 0, col = ncol; col--; ) |
2098 | for (nits = 0, col = ncol; col--; ) |
2095 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2099 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
… | |
… | |
2133 | /* |
2137 | /* |
2134 | * E: main pass across every character |
2138 | * E: main pass across every character |
2135 | */ |
2139 | */ |
2136 | for (row = 0; row < nrow; row++) |
2140 | for (row = 0; row < nrow; row++) |
2137 | { |
2141 | { |
2138 | text_t *stp = ROW(row - view_start).t; |
2142 | text_t *stp = ROW(view_start + row).t; |
2139 | rend_t *srp = ROW(row - view_start).r; |
2143 | rend_t *srp = ROW(view_start + row).r; |
2140 | text_t *dtp = drawn_buf[row].t; |
2144 | text_t *dtp = drawn_buf[row].t; |
2141 | rend_t *drp = drawn_buf[row].r; |
2145 | rend_t *drp = drawn_buf[row].r; |
2142 | |
2146 | |
2143 | /* |
2147 | /* |
2144 | * E2: OK, now the real pass |
2148 | * E2: OK, now the real pass |
… | |
… | |
2457 | } |
2461 | } |
2458 | |
2462 | |
2459 | void |
2463 | 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) |
2464 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
2461 | { |
2465 | { |
2462 | int view_end = -view_start + nrow; |
2466 | int view_end = view_start + nrow; |
2463 | int row, col; |
2467 | int row, col; |
2464 | |
2468 | |
2465 | for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) |
2469 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
2466 | { |
2470 | { |
2467 | text_t *stp = ROW(row).t; |
2471 | text_t *stp = ROW(row).t; |
2468 | rend_t *srp = ROW(row).r; |
2472 | rend_t *srp = ROW(row).r; |
2469 | |
2473 | |
2470 | for (col = beg_col; col < end_col; col++) |
2474 | for (col = beg_col; col < end_col; col++) |
… | |
… | |
2479 | } |
2483 | } |
2480 | |
2484 | |
2481 | void |
2485 | void |
2482 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
2486 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
2483 | { |
2487 | { |
2484 | int view_end = -view_start + nrow; |
2488 | int view_end = view_start + nrow; |
2485 | int row, col; |
2489 | int row, col; |
2486 | |
2490 | |
2487 | if (beg_row >= -view_start) |
2491 | if (beg_row >= view_start) |
2488 | { |
2492 | { |
2489 | col = beg_col; |
2493 | col = beg_col; |
2490 | row = beg_row; |
2494 | row = beg_row; |
2491 | } |
2495 | } |
2492 | else |
2496 | else |
2493 | { |
2497 | { |
2494 | col = 0; |
2498 | col = 0; |
2495 | row = -view_start; |
2499 | row = view_start; |
2496 | } |
2500 | } |
2497 | |
2501 | |
2498 | for (; row < min (end_row, view_end); row++, col = 0) |
2502 | for (; row < min (end_row, view_end); row++, col = 0) |
2499 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2503 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2500 | srp[col] ^= rstyle; |
2504 | srp[col] ^= rstyle; |
… | |
… | |
2508 | void |
2512 | void |
2509 | rxvt_term::scr_reverse_selection () |
2513 | rxvt_term::scr_reverse_selection () |
2510 | { |
2514 | { |
2511 | if (selection.op |
2515 | if (selection.op |
2512 | && current_screen == selection.screen |
2516 | && current_screen == selection.screen |
2513 | && selection.end.row >= -view_start) |
2517 | && selection.end.row >= view_start) |
2514 | { |
2518 | { |
2515 | #if ENABLE_FRILLS |
2519 | #if ENABLE_FRILLS |
2516 | if (selection.rect) |
2520 | if (selection.rect) |
2517 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2521 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2518 | selection.end.row, selection.end.col, |
2522 | selection.end.row, selection.end.col, |
… | |
… | |
2567 | |
2571 | |
2568 | if (!selection.op) |
2572 | if (!selection.op) |
2569 | return; |
2573 | return; |
2570 | |
2574 | |
2571 | pos.row = pos.col = 0; |
2575 | pos.row = pos.col = 0; |
2572 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2576 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2573 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2577 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2574 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2578 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2575 | || (check_more == 1 |
2579 | || (check_more == 1 |
2576 | && current_screen == selection.screen |
2580 | && current_screen == selection.screen |
2577 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2581 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2578 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2582 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2579 | || (check_more == 2 |
2583 | || (check_more == 2 |
… | |
… | |
2798 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2802 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2799 | * will auto fallback to CUT_BUFFER0 |
2803 | * will auto fallback to CUT_BUFFER0 |
2800 | * EXT: button 2 release |
2804 | * EXT: button 2 release |
2801 | */ |
2805 | */ |
2802 | void |
2806 | void |
2803 | rxvt_term::selection_request (Time tm, int x, int y) |
2807 | rxvt_term::selection_request (Time tm, int selnum) |
2804 | { |
2808 | { |
2805 | if (x < 0 || x >= width || y < 0 || y >= height) |
2809 | /* After making a selection with selection_make this function will always |
2806 | return; /* outside window */ |
2810 | * return the internal selection, which is not correct IMO, now much more since |
2807 | |
2811 | * I added the selnum parameter. |
|
|
2812 | */ |
|
|
2813 | #if 0 |
2808 | if (selection.text) |
2814 | if (selection.text) |
2809 | { /* internal selection */ |
2815 | { /* internal selection */ |
2810 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2816 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2811 | paste (str, strlen (str)); |
2817 | paste (str, strlen (str)); |
2812 | free (str); |
2818 | free (str); |
2813 | return; |
2819 | return; |
2814 | } |
2820 | } |
2815 | else |
2821 | else |
|
|
2822 | #endif |
2816 | { |
2823 | { |
2817 | int i; |
|
|
2818 | |
|
|
2819 | selection_request_time = tm; |
2824 | selection_request_time = tm; |
2820 | selection_wait = Sel_normal; |
2825 | selection_wait = Sel_normal; |
2821 | |
2826 | |
2822 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
|
|
2823 | { |
|
|
2824 | #if X_HAVE_UTF8_STRING |
2827 | #if X_HAVE_UTF8_STRING |
2825 | selection_type = Sel_UTF8String; |
2828 | selection_type = Sel_UTF8String; |
2826 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2829 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2827 | return; |
2830 | return; |
2828 | #else |
2831 | #else |
2829 | selection_type = Sel_CompoundText; |
2832 | selection_type = Sel_CompoundText; |
2830 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2833 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2831 | return; |
2834 | return; |
2832 | #endif |
2835 | #endif |
2833 | } |
|
|
2834 | } |
2836 | } |
2835 | |
2837 | |
2836 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2838 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2837 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2839 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2838 | } |
2840 | } |
… | |
… | |
3061 | |
3063 | |
3062 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3064 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3063 | |
3065 | |
3064 | if (clicks == 2 || clicks == 3) |
3066 | if (clicks == 2 || clicks == 3) |
3065 | selection_extend_colrow (selection.mark.col, |
3067 | selection_extend_colrow (selection.mark.col, |
3066 | selection.mark.row + view_start, |
3068 | selection.mark.row - view_start, |
3067 | 0, /* button 3 */ |
3069 | 0, /* button 3 */ |
3068 | 1, /* button press */ |
3070 | 1, /* button press */ |
3069 | 0); /* click change */ |
3071 | 0); /* click change */ |
3070 | } |
3072 | } |
3071 | |
3073 | |
… | |
… | |
3076 | void |
3078 | void |
3077 | rxvt_term::selection_start_colrow (int col, int row) |
3079 | rxvt_term::selection_start_colrow (int col, int row) |
3078 | { |
3080 | { |
3079 | want_refresh = 1; |
3081 | want_refresh = 1; |
3080 | |
3082 | |
3081 | selection.mark.row = row - view_start; |
3083 | selection.mark.row = row + view_start; |
3082 | selection.mark.col = col; |
3084 | selection.mark.col = col; |
3083 | |
3085 | |
3084 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3086 | selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1); |
3085 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3087 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3086 | |
3088 | |
3087 | while (selection.mark.col > 0 |
3089 | while (selection.mark.col > 0 |
3088 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3090 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3089 | --selection.mark.col; |
3091 | --selection.mark.col; |
… | |
… | |
3117 | text_t *stp; |
3119 | text_t *stp; |
3118 | rend_t *srp; |
3120 | rend_t *srp; |
3119 | |
3121 | |
3120 | if (dirn == UP) |
3122 | if (dirn == UP) |
3121 | { |
3123 | { |
3122 | bound.row = - nsaved - 1; |
3124 | bound.row = top_row - 1; |
3123 | bound.col = 0; |
3125 | bound.col = 0; |
3124 | dirnadd = -1; |
3126 | dirnadd = -1; |
3125 | } |
3127 | } |
3126 | else |
3128 | else |
3127 | { |
3129 | { |
… | |
… | |
3205 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3207 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3206 | * be _past_ a character for it to be selected. |
3208 | * be _past_ a character for it to be selected. |
3207 | */ |
3209 | */ |
3208 | if (((selection.clicks % 3) == 1) && !flag |
3210 | if (((selection.clicks % 3) == 1) && !flag |
3209 | && (col == selection.mark.col |
3211 | && (col == selection.mark.col |
3210 | && (row == selection.mark.row + view_start))) |
3212 | && (row == selection.mark.row - view_start))) |
3211 | { |
3213 | { |
3212 | /* select nothing */ |
3214 | /* select nothing */ |
3213 | selection.beg.row = selection.end.row = 0; |
3215 | selection.beg.row = selection.end.row = 0; |
3214 | selection.beg.col = selection.end.col = 0; |
3216 | selection.beg.col = selection.end.col = 0; |
3215 | selection.clicks = 4; |
3217 | selection.clicks = 4; |
… | |
… | |
3270 | selection.beg.col = selection.end.col = selection.mark.col; |
3272 | selection.beg.col = selection.end.col = selection.mark.col; |
3271 | selection.beg.row = selection.end.row = selection.mark.row; |
3273 | selection.beg.row = selection.end.row = selection.mark.row; |
3272 | } |
3274 | } |
3273 | |
3275 | |
3274 | pos.col = col; |
3276 | pos.col = col; |
3275 | pos.row = row - view_start; |
3277 | pos.row = view_start + row; |
3276 | |
3278 | |
3277 | /* |
3279 | /* |
3278 | * This is mainly xterm style selection with a couple of differences, mainly |
3280 | * This is mainly xterm style selection with a couple of differences, mainly |
3279 | * in the way button3 drag extension works. |
3281 | * in the way button3 drag extension works. |
3280 | * We're either doing: button1 drag; button3 press; or button3 drag |
3282 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3765 | for (int y = ov_h; y--; ) |
3767 | for (int y = ov_h; y--; ) |
3766 | { |
3768 | { |
3767 | text_t *t1 = ov_text[y]; |
3769 | text_t *t1 = ov_text[y]; |
3768 | rend_t *r1 = ov_rend[y]; |
3770 | rend_t *r1 = ov_rend[y]; |
3769 | |
3771 | |
3770 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3772 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3771 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3773 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3772 | |
3774 | |
3773 | for (int x = ov_w; x--; ) |
3775 | for (int x = ov_w; x--; ) |
3774 | { |
3776 | { |
3775 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3777 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3776 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3778 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |