1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
24 | * This file handles _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
25 | */ |
25 | */ |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
|
|
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | |
30 | |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | |
32 | |
32 | #include <inttypes.h> |
33 | #include <inttypes.h> |
33 | |
34 | |
… | |
… | |
46 | |
47 | |
47 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
52 | view_start = 0 |
53 | view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
123 | lalloc (l); |
124 | lalloc (l); |
124 | col = 0; |
125 | col = 0; |
125 | width = ncol; |
126 | width = ncol; |
126 | } |
127 | } |
127 | |
128 | |
|
|
129 | l.touch (); |
|
|
130 | |
128 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; |
129 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
130 | |
133 | |
131 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
132 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
… | |
… | |
283 | // to come up with a lean and mean algorithm. |
286 | // to come up with a lean and mean algorithm. |
284 | |
287 | |
285 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
286 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
287 | |
290 | |
288 | while (p != pend && q > 0) |
291 | do |
289 | { |
292 | { |
290 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
291 | #ifdef DEBUG_STRICT |
294 | #ifdef DEBUG_STRICT |
292 | assert (old_buf [MOD (p, prev_total_rows)].t); |
295 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | #endif |
296 | #endif |
294 | |
|
|
295 | int plines = 1; |
297 | int plines = 1; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
297 | |
299 | |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
299 | { |
301 | { |
… | |
… | |
317 | // re-assemble the full line by destination lines |
319 | // re-assemble the full line by destination lines |
318 | for (int qrow = q; qlines--; qrow++) |
320 | for (int qrow = q; qlines--; qrow++) |
319 | { |
321 | { |
320 | qline = row_buf + qrow; |
322 | qline = row_buf + qrow; |
321 | lalloc (*qline); |
323 | lalloc (*qline); |
|
|
324 | qline->l = ncol; |
322 | qline->set_is_longer (); |
325 | qline->is_longer (1); |
323 | |
326 | |
324 | int qcol = 0; |
327 | int qcol = 0; |
325 | |
328 | |
326 | // fill a single destination line |
329 | // fill a single destination line |
327 | while (lofs < llen && qcol < ncol) |
330 | while (lofs < llen && qcol < ncol) |
… | |
… | |
329 | int prow = lofs / prev_ncol; |
332 | int prow = lofs / prev_ncol; |
330 | int pcol = lofs % prev_ncol; |
333 | int pcol = lofs % prev_ncol; |
331 | |
334 | |
332 | prow = MOD (p + prow, prev_total_rows); |
335 | prow = MOD (p + prow, prev_total_rows); |
333 | |
336 | |
334 | // we only adjust the cursor _row_, as this seems to upset |
337 | // we only adjust the cursor _row_ and put it into |
|
|
338 | // the topmost line of "long line" it was in, as |
335 | // applications/shells/readline least. |
339 | // this seems to upset applications/shells/readline |
|
|
340 | // least. |
336 | if (prow == ocur.row) |
341 | if (prow == ocur.row) |
337 | screen.cur.row = qrow - (total_rows - nrow); |
342 | screen.cur.row = q - (total_rows - nrow); |
338 | |
343 | |
339 | line_t &pline = old_buf [prow]; |
344 | line_t &pline = old_buf [prow]; |
340 | |
345 | |
341 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
346 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
342 | |
347 | |
… | |
… | |
349 | lofs += len; |
354 | lofs += len; |
350 | qcol += len; |
355 | qcol += len; |
351 | } |
356 | } |
352 | } |
357 | } |
353 | |
358 | |
354 | qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; |
359 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
|
|
360 | qline->is_longer (0); |
355 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
361 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
356 | } |
362 | } |
|
|
363 | while (p != pend && q > 0); |
357 | |
364 | |
358 | term_start = total_rows - nrow; |
365 | term_start = total_rows - nrow; |
359 | view_start = 0; |
|
|
360 | nsaved = term_start - q; |
366 | nsaved = term_start - q; |
361 | |
367 | |
362 | // make sure all terminal lines exist |
368 | // make sure all terminal lines exist |
363 | while (nsaved < 0) |
369 | while (nsaved < 0) |
364 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
370 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
365 | |
|
|
366 | } |
371 | } |
367 | else |
372 | else |
368 | { |
373 | { |
369 | // if no scrollback exists (yet), wing, instead of wrap |
374 | // if no scrollback exists (yet), wing, instead of wrap |
370 | |
375 | |
… | |
… | |
381 | { |
386 | { |
382 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
387 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
383 | } |
388 | } |
384 | |
389 | |
385 | term_start = 0; |
390 | term_start = 0; |
386 | view_start = 0; |
|
|
387 | } |
391 | } |
388 | |
392 | |
389 | #ifdef DEBUG_STRICT |
393 | #ifdef DEBUG_STRICT //TODO: remove |
390 | for (int i = -nsaved; i < nrow; i++) |
394 | for (int i = -nsaved; i < nrow; i++) |
391 | assert (ROW (i).t); |
395 | assert (ROW (i).t); |
392 | #endif |
396 | #endif |
393 | |
397 | |
394 | free (old_buf); |
398 | free (old_buf); |
… | |
… | |
409 | |
413 | |
410 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; col--; ) |
411 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
412 | |
416 | |
413 | tt_winch (); |
417 | tt_winch (); |
|
|
418 | |
|
|
419 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
414 | } |
420 | } |
415 | |
421 | |
416 | /* ------------------------------------------------------------------------- */ |
422 | /* ------------------------------------------------------------------------- */ |
417 | /* |
423 | /* |
418 | * Free everything. That way malloc debugging can find leakage. |
424 | * Free everything. That way malloc debugging can find leakage. |
… | |
… | |
522 | |
528 | |
523 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
524 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
525 | |
531 | |
526 | #if NSCREENS |
532 | #if NSCREENS |
527 | if (options & Opt_secondaryScreen) |
533 | if (OPTION (Opt_secondaryScreen)) |
528 | { |
534 | { |
529 | num_scr = 0; |
535 | num_scr = 0; |
530 | |
536 | |
531 | for (int i = prev_nrow; i--; ) |
537 | for (int i = prev_nrow; i--; ) |
532 | ::swap (ROW(i), swap_buf [i]); |
538 | ::swap (ROW(i), swap_buf [i]); |
… | |
… | |
536 | screen.flags |= Screen_VisibleCursor; |
542 | screen.flags |= Screen_VisibleCursor; |
537 | swap.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
538 | } |
544 | } |
539 | else |
545 | else |
540 | #endif |
546 | #endif |
541 | if (options & Opt_secondaryScroll) |
547 | if (OPTION (Opt_secondaryScroll)) |
542 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
543 | |
549 | |
544 | return scrn; |
550 | return scrn; |
545 | } |
551 | } |
546 | |
552 | |
… | |
… | |
608 | num_scr += count; |
614 | num_scr += count; |
609 | |
615 | |
610 | if (count > 0 |
616 | if (count > 0 |
611 | && row1 == 0 |
617 | && row1 == 0 |
612 | && row2 == nrow - 1 |
618 | && row2 == nrow - 1 |
613 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
614 | { |
620 | { |
615 | nsaved = min (nsaved + count, saveLines); |
621 | nsaved = min (nsaved + count, saveLines); |
|
|
622 | |
|
|
623 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
|
|
624 | |
616 | term_start = (term_start + count) % total_rows; |
625 | term_start = (term_start + count) % total_rows; |
617 | |
626 | |
618 | if (selection.op && current_screen == selection.screen) |
627 | if (selection.op && current_screen == selection.screen) |
619 | { |
628 | { |
620 | selection.beg.row -= count; |
629 | selection.beg.row -= count; |
621 | selection.end.row -= count; |
630 | selection.end.row -= count; |
622 | selection.mark.row -= count; |
631 | selection.mark.row -= count; |
623 | |
632 | |
624 | selection_check (0); |
633 | if (selection.beg.row < -nsaved |
|
|
634 | || selection.end.row < -nsaved |
|
|
635 | || selection.mark.row < -nsaved) |
|
|
636 | { |
|
|
637 | CLEAR_ALL_SELECTION (); |
|
|
638 | selection.op = SELECTION_CLEAR; |
|
|
639 | } |
625 | } |
640 | } |
626 | |
641 | |
627 | for (int i = count; i--; ) |
642 | for (int i = count; i--; ) |
|
|
643 | { |
|
|
644 | ROW(row2 - i).l = 0; |
628 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
645 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
646 | } |
629 | |
647 | |
630 | if ((options & Opt_scrollWithBuffer) |
648 | if (OPTION (Opt_scrollWithBuffer) |
631 | && view_start != 0 |
649 | && view_start != 0 |
632 | && view_start != saveLines) |
650 | && view_start != saveLines) |
633 | scr_page (UP, count); |
651 | scr_page (UP, count); |
634 | } |
652 | } |
635 | else |
653 | else |
636 | { |
654 | { |
637 | if (selection.op && current_screen == selection.screen) |
655 | if (selection.op && current_screen == selection.screen) |
638 | { |
656 | { |
639 | int i = selection.beg.row; |
657 | if ((selection.beg.row < row1 && selection.end.row > row1) |
640 | int j = selection.end.row; |
658 | || (selection.beg.row < row2 && selection.end.row > row2) |
641 | |
|
|
642 | if ((i < row1 && j > row1) |
|
|
643 | || (i < row2 && j > row2) |
|
|
644 | || (i - count < row1 && i >= row1) |
659 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
645 | || (i - count > row2 && i <= row2) |
660 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
646 | || (j - count < row1 && j >= row1) |
661 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
647 | || (j - count > row2 && j <= row2)) |
662 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
648 | { |
663 | { |
649 | CLEAR_ALL_SELECTION (); |
664 | CLEAR_ALL_SELECTION (); |
650 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
665 | selection.op = SELECTION_CLEAR; |
651 | } |
666 | } |
652 | else if (j >= row1 && j <= row2) |
667 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
653 | { |
668 | { |
654 | /* move selected region too */ |
669 | /* move selected region too */ |
655 | selection.beg.row -= count; |
670 | selection.beg.row -= count; |
656 | selection.end.row -= count; |
671 | selection.end.row -= count; |
657 | selection.mark.row -= count; |
672 | selection.mark.row -= count; |
… | |
… | |
685 | /* ------------------------------------------------------------------------- */ |
700 | /* ------------------------------------------------------------------------- */ |
686 | /* |
701 | /* |
687 | * Add text given in <str> of length <len> to screen struct |
702 | * Add text given in <str> of length <len> to screen struct |
688 | */ |
703 | */ |
689 | void |
704 | void |
690 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
705 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
691 | { |
706 | { |
692 | if (len <= 0) /* sanity */ |
707 | if (len <= 0) /* sanity */ |
693 | return; |
708 | return; |
694 | |
709 | |
695 | unsigned char checksel; |
710 | unsigned char checksel; |
696 | unicode_t c; |
711 | unicode_t c; |
697 | int row, last_col; |
712 | int ncol = this->ncol; |
698 | const unicode_t *strend = str + len; |
713 | const wchar_t *strend = str + len; |
699 | |
714 | |
700 | want_refresh = 1; |
715 | want_refresh = 1; |
701 | ZERO_SCROLLBACK (); |
716 | ZERO_SCROLLBACK (); |
702 | last_col = ncol; |
|
|
703 | |
717 | |
704 | if (nlines > 0) |
718 | if (minlines > 0) |
705 | { |
719 | { |
706 | nlines += screen.cur.row - screen.bscroll; |
720 | minlines += screen.cur.row - screen.bscroll; |
|
|
721 | |
707 | if (nlines > 0 |
722 | if (minlines > 0 |
708 | && screen.tscroll == 0 |
723 | && screen.tscroll == 0 |
709 | && screen.bscroll == (nrow - 1)) |
724 | && screen.bscroll == nrow - 1) |
710 | { |
725 | { |
711 | /* _at least_ this many lines need to be scrolled */ |
726 | /* _at least_ this many lines need to be scrolled */ |
712 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
727 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
713 | screen.cur.row -= nlines; |
728 | screen.cur.row -= minlines; |
714 | } |
729 | } |
715 | } |
730 | } |
716 | |
731 | |
717 | #ifdef DEBUG_STRICT |
732 | #ifdef DEBUG_STRICT |
718 | assert (screen.cur.col < last_col); |
733 | assert (screen.cur.col < ncol); |
719 | assert (screen.cur.row < nrow |
734 | assert (screen.cur.row < nrow |
720 | && screen.cur.row >= -nsaved); |
735 | && screen.cur.row >= -nsaved); |
721 | #endif |
736 | #endif |
722 | row = screen.cur.row; |
737 | int row = screen.cur.row; |
723 | |
738 | |
724 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
739 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
725 | |
740 | |
726 | line_t *line = &ROW(row); |
741 | line_t *line = &ROW(row); |
727 | |
742 | |
728 | while (str < strend) |
743 | while (str < strend) |
729 | { |
744 | { |
730 | c = *str++; |
745 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
731 | |
746 | |
732 | if (c < 0x20) |
747 | if (c < 0x20) |
733 | if (c == C0_LF) |
748 | if (c == C0_LF) |
734 | { |
749 | { |
735 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
736 | max_it (line->l, screen.cur.col); |
750 | max_it (line->l, screen.cur.col); |
737 | |
751 | |
738 | screen.flags &= ~Screen_WrapNext; |
752 | screen.flags &= ~Screen_WrapNext; |
739 | |
753 | |
740 | if (screen.cur.row == screen.bscroll) |
754 | if (screen.cur.row == screen.bscroll) |
741 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
755 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
… | |
… | |
745 | line = &ROW(row); /* _must_ refresh */ |
759 | line = &ROW(row); /* _must_ refresh */ |
746 | continue; |
760 | continue; |
747 | } |
761 | } |
748 | else if (c == C0_CR) |
762 | else if (c == C0_CR) |
749 | { |
763 | { |
750 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
751 | max_it (line->l, screen.cur.col); |
764 | max_it (line->l, screen.cur.col); |
752 | |
765 | |
753 | screen.flags &= ~Screen_WrapNext; |
766 | screen.flags &= ~Screen_WrapNext; |
754 | screen.cur.col = 0; |
767 | screen.cur.col = 0; |
755 | continue; |
768 | continue; |
756 | } |
769 | } |
… | |
… | |
773 | CLEAR_SELECTION (); |
786 | CLEAR_SELECTION (); |
774 | } |
787 | } |
775 | |
788 | |
776 | if (screen.flags & Screen_WrapNext) |
789 | if (screen.flags & Screen_WrapNext) |
777 | { |
790 | { |
|
|
791 | max_it (line->l, ncol); |
778 | line->set_is_longer (); |
792 | line->is_longer (1); |
779 | |
793 | |
780 | scr_do_wrap (); |
794 | scr_do_wrap (); |
781 | |
795 | |
782 | row = screen.cur.row; |
796 | row = screen.cur.row; |
783 | line = &ROW(row); /* _must_ refresh */ |
797 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
791 | // do wcwidth before further replacements, as wcwidth might return -1 |
805 | // do wcwidth before further replacements, as wcwidth might return -1 |
792 | // for the line drawing characters below as they might be invalid in the current |
806 | // for the line drawing characters below as they might be invalid in the current |
793 | // locale. |
807 | // locale. |
794 | int width = c < 0x100 ? 1 : wcwidth (c); |
808 | int width = c < 0x100 ? 1 : wcwidth (c); |
795 | |
809 | |
796 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
810 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
797 | { |
811 | { |
798 | // vt100 special graphics and line drawing |
812 | // vt100 special graphics and line drawing |
799 | // 5f-7e standard vt100 |
813 | // 5f-7e standard vt100 |
800 | // 40-5e rxvt extension for extra curses acs chars |
814 | // 40-5e rxvt extension for extra curses acs chars |
801 | static uint16_t vt100_0[62] = { // 41 .. 7e |
815 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
853 | } |
867 | } |
854 | |
868 | |
855 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
869 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
856 | |
870 | |
857 | // if the character doesn't fit into the remaining columns... |
871 | // if the character doesn't fit into the remaining columns... |
858 | if (screen.cur.col > last_col - width && last_col >= width) |
872 | if (screen.cur.col > ncol - width && ncol >= width) |
859 | { |
873 | { |
860 | // ...output spaces |
874 | // ...output spaces |
861 | c = ' '; |
875 | c = ' '; |
862 | // and try the same character next loop iteration |
876 | // and try the same character next loop iteration |
863 | --str; |
877 | --str; |
864 | } |
878 | } |
865 | |
879 | |
|
|
880 | line->touch (); |
|
|
881 | |
866 | do |
882 | do |
867 | { |
883 | { |
868 | line->t[screen.cur.col] = c; |
884 | line->t[screen.cur.col] = c; |
869 | line->r[screen.cur.col] = rend; |
885 | line->r[screen.cur.col] = rend; |
870 | |
886 | |
871 | if (screen.cur.col < last_col - 1) |
887 | if (screen.cur.col < ncol - 1) |
872 | screen.cur.col++; |
888 | screen.cur.col++; |
873 | else |
889 | else |
874 | { |
890 | { |
875 | line->l = last_col; |
891 | line->l = ncol; |
876 | if (screen.flags & Screen_Autowrap) |
892 | if (screen.flags & Screen_Autowrap) |
877 | screen.flags |= Screen_WrapNext; |
893 | screen.flags |= Screen_WrapNext; |
878 | break; |
894 | break; |
879 | } |
895 | } |
880 | |
896 | |
… | |
… | |
882 | } |
898 | } |
883 | while (--width > 0); |
899 | while (--width > 0); |
884 | |
900 | |
885 | // pad with spaces when overwriting wide character with smaller one |
901 | // pad with spaces when overwriting wide character with smaller one |
886 | if (!width) |
902 | if (!width) |
|
|
903 | { |
|
|
904 | line->touch (); |
|
|
905 | |
887 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
906 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
888 | { |
907 | { |
889 | line->t[c] = ' '; |
908 | line->t[c] = ' '; |
890 | line->r[c] = rend; |
909 | line->r[c] = rend; |
891 | } |
910 | } |
|
|
911 | } |
892 | } |
912 | } |
893 | else // width == 0 |
913 | else // width == 0 |
894 | { |
914 | { |
895 | #if ENABLE_COMBINING |
915 | #if ENABLE_COMBINING |
896 | // handle combining characters |
916 | // handle combining characters |
897 | // we just tag the accent on the previous on-screen character. |
917 | // we just tag the accent on the previous on-screen character. |
898 | // this is arguably not correct, but also arguably not wrong. |
918 | // this is arguably not correct, but also arguably not wrong. |
899 | // we don't handle double-width characters nicely yet. |
919 | // we don't handle double-width characters nicely yet. |
|
|
920 | line_t *linep; |
900 | text_t *tp; |
921 | text_t *tp; |
901 | rend_t *rp; |
922 | rend_t *rp; |
902 | |
923 | |
903 | if (screen.cur.col > 0) |
924 | if (screen.cur.col > 0) |
904 | { |
925 | { |
|
|
926 | linep = line; |
905 | tp = line->t + screen.cur.col - 1; |
927 | tp = line->t + screen.cur.col - 1; |
906 | rp = line->r + screen.cur.col - 1; |
928 | rp = line->r + screen.cur.col - 1; |
907 | |
|
|
908 | while (*tp == NOCHAR && tp > line->t) |
|
|
909 | tp--, rp--; |
|
|
910 | } |
929 | } |
911 | else if (screen.cur.row > 0 |
930 | else if (screen.cur.row > 0 |
912 | && ROW(screen.cur.row - 1).is_longer ()) |
931 | && ROW(screen.cur.row - 1).is_longer ()) |
913 | { |
932 | { |
914 | line_t *line = &ROW(screen.cur.row - 1); |
933 | linep = &ROW(screen.cur.row - 1); |
915 | |
|
|
916 | tp = line->t + last_col - 1; |
934 | tp = line->t + ncol - 1; |
917 | rp = line->r + last_col - 1; |
935 | rp = line->r + ncol - 1; |
918 | |
|
|
919 | while (*tp == NOCHAR && tp > line->t) |
|
|
920 | tp--, rp--; |
|
|
921 | } |
936 | } |
922 | else |
937 | else |
923 | continue; |
938 | continue; |
|
|
939 | |
|
|
940 | linep->touch (); |
|
|
941 | |
|
|
942 | while (*tp == NOCHAR && tp > linep->t) |
|
|
943 | tp--, rp--; |
924 | |
944 | |
925 | // first try to find a precomposed character |
945 | // first try to find a precomposed character |
926 | unicode_t n = rxvt_compose (*tp, c); |
946 | unicode_t n = rxvt_compose (*tp, c); |
927 | if (n == NOCHAR) |
947 | if (n == NOCHAR) |
928 | n = rxvt_composite.compose (*tp, c); |
948 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
931 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
951 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
932 | #endif |
952 | #endif |
933 | } |
953 | } |
934 | } |
954 | } |
935 | |
955 | |
936 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
937 | max_it (line->l, screen.cur.col); |
956 | max_it (line->l, screen.cur.col); |
938 | |
957 | |
939 | #ifdef DEBUG_STRICT |
958 | #ifdef DEBUG_STRICT |
940 | assert (screen.cur.row >= 0); |
959 | assert (screen.cur.row >= 0); |
941 | #endif |
960 | #endif |
942 | } |
961 | } |
… | |
… | |
984 | |
1003 | |
985 | if (count == 0) |
1004 | if (count == 0) |
986 | return; |
1005 | return; |
987 | else if (count > 0) |
1006 | else if (count > 0) |
988 | { |
1007 | { |
989 | int row = screen.cur.row; |
|
|
990 | |
|
|
991 | line_t &l = ROW(row); |
1008 | line_t &l = ROW(screen.cur.row); |
992 | rend_t base_rend = l.r[i]; |
1009 | rend_t base_rend = l.r[i]; |
993 | ht &= l.t[i] == ' '; |
1010 | ht &= l.t[i] == ' '; |
994 | |
1011 | |
995 | for (; ++i < ncol; ) |
1012 | for (; ++i < ncol; ) |
996 | if (tabs[i]) |
1013 | if (tabs[i]) |
997 | { |
1014 | { |
998 | x = i; |
1015 | x = i; |
|
|
1016 | |
999 | if (!--count) |
1017 | if (!--count) |
1000 | break; |
1018 | break; |
1001 | } |
1019 | } |
1002 | else |
1020 | else |
1003 | ht &= l.t[i] == ' ' |
1021 | ht &= l.t[i] == ' ' |
… | |
… | |
1006 | if (count) |
1024 | if (count) |
1007 | x = ncol - 1; |
1025 | x = ncol - 1; |
1008 | |
1026 | |
1009 | // store horizontal tab commands as characters inside the text |
1027 | // store horizontal tab commands as characters inside the text |
1010 | // buffer so they can be selected and pasted. |
1028 | // buffer so they can be selected and pasted. |
1011 | if (ht && options & Opt_pastableTabs) |
1029 | if (ht && OPTION (Opt_pastableTabs)) |
1012 | { |
1030 | { |
1013 | base_rend = SET_FONT (base_rend, 0); |
1031 | base_rend = SET_FONT (base_rend, 0); |
1014 | |
1032 | |
1015 | if (!l.is_longer ()) /* XXX: think about this */ |
1033 | l.touch (x); |
1016 | max_it (l.l, x); |
|
|
1017 | |
1034 | |
1018 | i = screen.cur.col; |
1035 | i = screen.cur.col; |
1019 | |
1036 | |
1020 | l.t[i] = '\t'; |
1037 | l.t[i] = '\t'; |
1021 | l.r[i] = base_rend; |
1038 | l.r[i] = base_rend; |
… | |
… | |
1071 | */ |
1088 | */ |
1072 | #if ENABLE_FRILLS |
1089 | #if ENABLE_FRILLS |
1073 | void |
1090 | void |
1074 | rxvt_term::scr_forwardindex () |
1091 | rxvt_term::scr_forwardindex () |
1075 | { |
1092 | { |
1076 | int row; |
|
|
1077 | |
|
|
1078 | if (screen.cur.col < ncol - 1) |
1093 | if (screen.cur.col < ncol - 1) |
1079 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1094 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1080 | else |
1095 | else |
1081 | { |
1096 | { |
1082 | row = screen.cur.row; |
1097 | line_t &l = ROW(screen.cur.row); |
1083 | |
1098 | |
1084 | if (ROW(row).is_longer ()) //TODO//FIXME//LEN |
1099 | l.touch (); |
1085 | ROW(row).l = ncol; |
1100 | l.is_longer (0); |
1086 | |
1101 | |
1087 | scr_gotorc (0, 0, R_RELATIVE); |
1102 | scr_gotorc (0, 0, R_RELATIVE); |
1088 | scr_insdel_chars (1, DELETE); |
1103 | scr_insdel_chars (1, DELETE); |
1089 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1104 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1090 | } |
1105 | } |
… | |
… | |
1173 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1188 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1174 | */ |
1189 | */ |
1175 | void |
1190 | void |
1176 | rxvt_term::scr_erase_line (int mode) |
1191 | rxvt_term::scr_erase_line (int mode) |
1177 | { |
1192 | { |
1178 | unsigned int row, col, num; |
1193 | unsigned int col, num; |
1179 | |
1194 | |
1180 | want_refresh = 1; |
1195 | want_refresh = 1; |
1181 | ZERO_SCROLLBACK (); |
1196 | ZERO_SCROLLBACK (); |
1182 | |
1197 | |
1183 | selection_check (1); |
1198 | selection_check (1); |
1184 | |
1199 | |
1185 | row = screen.cur.row; |
1200 | line_t &line = ROW(screen.cur.row); |
|
|
1201 | |
|
|
1202 | line.touch (); |
|
|
1203 | line.is_longer (0); |
1186 | |
1204 | |
1187 | switch (mode) |
1205 | switch (mode) |
1188 | { |
1206 | { |
1189 | case 0: /* erase to end of line */ |
1207 | case 0: /* erase to end of line */ |
1190 | col = screen.cur.col; |
1208 | col = screen.cur.col; |
1191 | num = ncol - col; |
1209 | num = ncol - col; |
1192 | min_it (ROW(row).l, col); |
1210 | min_it (line.l, col); |
1193 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1211 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1194 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1212 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1195 | CLEAR_SELECTION (); |
1213 | CLEAR_SELECTION (); |
1196 | break; |
1214 | break; |
1197 | case 1: /* erase to beginning of line */ |
1215 | case 1: /* erase to beginning of line */ |
… | |
… | |
1202 | CLEAR_SELECTION (); |
1220 | CLEAR_SELECTION (); |
1203 | break; |
1221 | break; |
1204 | case 2: /* erase whole line */ |
1222 | case 2: /* erase whole line */ |
1205 | col = 0; |
1223 | col = 0; |
1206 | num = ncol; |
1224 | num = ncol; |
1207 | ROW(row).l = 0; |
1225 | line.l = 0; |
1208 | if (selection.beg.row <= screen.cur.row |
1226 | if (selection.beg.row <= screen.cur.row |
1209 | && selection.end.row >= screen.cur.row) |
1227 | && selection.end.row >= screen.cur.row) |
1210 | CLEAR_SELECTION (); |
1228 | CLEAR_SELECTION (); |
1211 | break; |
1229 | break; |
1212 | default: |
1230 | default: |
1213 | return; |
1231 | return; |
1214 | } |
1232 | } |
1215 | |
1233 | |
1216 | scr_blank_line (ROW(row), col, num, rstyle); |
1234 | scr_blank_line (line, col, num, rstyle); |
1217 | } |
1235 | } |
1218 | |
1236 | |
1219 | /* ------------------------------------------------------------------------- */ |
1237 | /* ------------------------------------------------------------------------- */ |
1220 | /* |
1238 | /* |
1221 | * Erase part of whole of the screen |
1239 | * Erase part of whole of the screen |
… | |
… | |
1276 | CLEAR_ROWS (row, num); |
1294 | CLEAR_ROWS (row, num); |
1277 | } |
1295 | } |
1278 | else |
1296 | else |
1279 | { |
1297 | { |
1280 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1298 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1281 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1299 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1282 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1300 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1283 | ERASE_ROWS (row, num); |
1301 | ERASE_ROWS (row, num); |
1284 | gcvalue.foreground = pix_colors[Color_fg]; |
1302 | gcvalue.foreground = pix_colors[Color_fg]; |
1285 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1303 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1286 | } |
1304 | } |
1287 | |
1305 | |
1288 | for (; num--; row++) |
1306 | for (; num--; row++) |
1289 | { |
1307 | { |
|
|
1308 | line_t &l = ROW(row); |
|
|
1309 | l.l = 0; |
|
|
1310 | l.is_longer (0); |
1290 | scr_blank_screen_mem (ROW (row), rstyle); |
1311 | scr_blank_screen_mem (l, rstyle); |
1291 | ROW (row).l = 0; |
|
|
1292 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1312 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1293 | } |
1313 | } |
1294 | } |
1314 | } |
1295 | |
1315 | |
1296 | #if ENABLE_FRILLS |
1316 | #if ENABLE_FRILLS |
… | |
… | |
1329 | rend_t *r1 = line.r; |
1349 | rend_t *r1 = line.r; |
1330 | |
1350 | |
1331 | for (int j = ncol; j--; ) |
1351 | for (int j = ncol; j--; ) |
1332 | *r1++ = fs; |
1352 | *r1++ = fs; |
1333 | |
1353 | |
1334 | line.l = ncol; /* make the `E's selectable */ |
1354 | line.is_longer (0); |
|
|
1355 | line.touch (ncol); |
1335 | } |
1356 | } |
1336 | } |
1357 | } |
1337 | |
1358 | |
1338 | /* ------------------------------------------------------------------------- */ |
1359 | /* ------------------------------------------------------------------------- */ |
1339 | /* |
1360 | /* |
… | |
… | |
1387 | min_it (count, ncol - screen.cur.col); |
1408 | min_it (count, ncol - screen.cur.col); |
1388 | |
1409 | |
1389 | row = screen.cur.row; |
1410 | row = screen.cur.row; |
1390 | |
1411 | |
1391 | line_t *line = &ROW(row); |
1412 | line_t *line = &ROW(row); |
|
|
1413 | |
|
|
1414 | line->touch (); |
|
|
1415 | line->is_longer (0); |
1392 | |
1416 | |
1393 | switch (insdel) |
1417 | switch (insdel) |
1394 | { |
1418 | { |
1395 | case INSERT: |
1419 | case INSERT: |
1396 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1420 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1397 | { |
1421 | { |
1398 | line->t[col] = line->t[col - count]; |
1422 | line->t[col] = line->t[col - count]; |
1399 | line->r[col] = line->r[col - count]; |
1423 | line->r[col] = line->r[col - count]; |
1400 | } |
1424 | } |
1401 | |
1425 | |
1402 | if (!line->is_longer ()) |
1426 | line->l = min (line->l + count, ncol); |
1403 | { |
|
|
1404 | line->l += count; |
|
|
1405 | min_it (line->l, ncol); |
|
|
1406 | } |
|
|
1407 | |
1427 | |
1408 | if (selection.op && current_screen == selection.screen |
1428 | if (selection.op && current_screen == selection.screen |
1409 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1429 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1410 | { |
1430 | { |
1411 | if (selection.end.row != screen.cur.row |
1431 | if (selection.end.row != screen.cur.row |
… | |
… | |
1424 | |
1444 | |
1425 | case ERASE: |
1445 | case ERASE: |
1426 | screen.cur.col += count; /* don't worry if > ncol */ |
1446 | screen.cur.col += count; /* don't worry if > ncol */ |
1427 | selection_check (1); |
1447 | selection_check (1); |
1428 | screen.cur.col -= count; |
1448 | screen.cur.col -= count; |
|
|
1449 | |
|
|
1450 | line->l = max (line->l - count, 0); |
1429 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1451 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1430 | break; |
1452 | break; |
1431 | |
1453 | |
1432 | case DELETE: |
1454 | case DELETE: |
1433 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1455 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1436 | { |
1458 | { |
1437 | line->t[col] = line->t[col + count]; |
1459 | line->t[col] = line->t[col + count]; |
1438 | line->r[col] = line->r[col + count]; |
1460 | line->r[col] = line->r[col + count]; |
1439 | } |
1461 | } |
1440 | |
1462 | |
|
|
1463 | line->l = max (line->l - count, 0); |
1441 | scr_blank_line (*line, ncol - count, count, tr); |
1464 | scr_blank_line (*line, ncol - count, count, tr); |
1442 | |
|
|
1443 | if (line->is_longer ()) /* break line continuation */ |
|
|
1444 | line->l = ncol; |
|
|
1445 | |
|
|
1446 | line->l = max (line->l - count, 0); |
|
|
1447 | |
1465 | |
1448 | if (selection.op && current_screen == selection.screen |
1466 | if (selection.op && current_screen == selection.screen |
1449 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1467 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1450 | { |
1468 | { |
1451 | if (selection.end.row != screen.cur.row |
1469 | if (selection.end.row != screen.cur.row |
… | |
… | |
1563 | rxvt_term::scr_set_tab (int mode) |
1581 | rxvt_term::scr_set_tab (int mode) |
1564 | { |
1582 | { |
1565 | if (mode < 0) |
1583 | if (mode < 0) |
1566 | memset (tabs, 0, ncol * sizeof (char)); |
1584 | memset (tabs, 0, ncol * sizeof (char)); |
1567 | else if (screen.cur.col < ncol) |
1585 | else if (screen.cur.col < ncol) |
1568 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1586 | tabs [screen.cur.col] = !!mode; |
1569 | } |
1587 | } |
1570 | |
1588 | |
1571 | /* ------------------------------------------------------------------------- */ |
1589 | /* ------------------------------------------------------------------------- */ |
1572 | /* |
1590 | /* |
1573 | * Set reverse/normal video |
1591 | * Set reverse/normal video |
… | |
… | |
1585 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1603 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1586 | #if XPM_BACKGROUND |
1604 | #if XPM_BACKGROUND |
1587 | if (bgPixmap.pixmap == None) |
1605 | if (bgPixmap.pixmap == None) |
1588 | #endif |
1606 | #endif |
1589 | #if TRANSPARENT |
1607 | #if TRANSPARENT |
1590 | if (! (options & Opt_transparent) || am_transparent == 0) |
1608 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1591 | #endif |
1609 | #endif |
1592 | XSetWindowBackground (display->display, vt, |
1610 | XSetWindowBackground (display->display, vt, |
1593 | pix_colors[Color_bg]); |
1611 | pix_colors[Color_bg]); |
1594 | |
1612 | |
1595 | gcvalue.foreground = pix_colors[Color_fg]; |
1613 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1620 | * Set font style |
1638 | * Set font style |
1621 | */ |
1639 | */ |
1622 | void |
1640 | void |
1623 | rxvt_term::set_font_style () |
1641 | rxvt_term::set_font_style () |
1624 | { |
1642 | { |
|
|
1643 | #if 0 |
1625 | switch (charsets[screen.charset]) |
1644 | switch (charsets [screen.charset]) |
1626 | { |
1645 | { |
1627 | case '0': /* DEC Special Character & Line Drawing Set */ |
1646 | case '0': /* DEC Special Character & Line Drawing Set */ |
1628 | break; |
1647 | break; |
1629 | case 'A': /* United Kingdom (UK) */ |
1648 | case 'A': /* United Kingdom (UK) */ |
1630 | break; |
1649 | break; |
… | |
… | |
1637 | case 'C': /* Finnish character set */ |
1656 | case 'C': /* Finnish character set */ |
1638 | break; |
1657 | break; |
1639 | case 'K': /* German character set */ |
1658 | case 'K': /* German character set */ |
1640 | break; |
1659 | break; |
1641 | } |
1660 | } |
|
|
1661 | #endif |
1642 | } |
1662 | } |
1643 | |
1663 | |
1644 | /* ------------------------------------------------------------------------- */ |
1664 | /* ------------------------------------------------------------------------- */ |
1645 | /* |
1665 | /* |
1646 | * Choose a font |
1666 | * Choose a font |
… | |
… | |
1813 | int |
1833 | int |
1814 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1834 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1815 | { |
1835 | { |
1816 | if (view_start != oldviewstart) |
1836 | if (view_start != oldviewstart) |
1817 | { |
1837 | { |
|
|
1838 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1839 | |
1818 | want_refresh = 1; |
1840 | want_refresh = 1; |
1819 | num_scr -= (view_start - oldviewstart); |
1841 | num_scr -= (view_start - oldviewstart); |
1820 | } |
1842 | } |
1821 | |
1843 | |
1822 | return (int) (view_start - oldviewstart); |
1844 | return (int)view_start - (int)oldviewstart; |
1823 | } |
1845 | } |
1824 | |
1846 | |
1825 | /* ------------------------------------------------------------------------- */ |
1847 | /* ------------------------------------------------------------------------- */ |
1826 | void |
1848 | void |
1827 | rxvt_term::scr_bell () |
1849 | rxvt_term::scr_bell () |
1828 | { |
1850 | { |
1829 | #ifndef NO_BELL |
1851 | #ifndef NO_BELL |
1830 | |
1852 | |
1831 | # ifndef NO_MAPALERT |
1853 | # ifndef NO_MAPALERT |
1832 | # ifdef MAPALERT_OPTION |
1854 | # ifdef MAPALERT_OPTION |
1833 | if (options & Opt_mapAlert) |
1855 | if (OPTION (Opt_mapAlert)) |
1834 | # endif |
1856 | # endif |
1835 | XMapWindow (display->display, parent[0]); |
1857 | XMapWindow (display->display, parent[0]); |
1836 | # endif |
1858 | # endif |
1837 | |
1859 | |
1838 | if (options & Opt_visualBell) |
1860 | if (OPTION (Opt_visualBell)) |
1839 | { |
1861 | { |
1840 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1862 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1841 | rxvt_usleep (VISUAL_BELL_DURATION); |
1863 | rxvt_usleep (VISUAL_BELL_DURATION); |
1842 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1864 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1843 | } |
1865 | } |
… | |
… | |
1934 | |
1956 | |
1935 | #if XPM_BACKGROUND |
1957 | #if XPM_BACKGROUND |
1936 | must_clear |= bgPixmap.pixmap != None; |
1958 | must_clear |= bgPixmap.pixmap != None; |
1937 | #endif |
1959 | #endif |
1938 | #if TRANSPARENT |
1960 | #if TRANSPARENT |
1939 | must_clear |= (options & Opt_transparent) && am_transparent; |
1961 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1940 | #endif |
1962 | #endif |
1941 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1963 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1942 | |
1964 | |
1943 | /* |
1965 | /* |
1944 | * B: reverse any characters which are selected |
1966 | * B: reverse any characters which are selected |
… | |
… | |
1968 | |
1990 | |
1969 | crp = &ROW(screen.cur.row).r[col]; |
1991 | crp = &ROW(screen.cur.row).r[col]; |
1970 | |
1992 | |
1971 | if (showcursor && focus) |
1993 | if (showcursor && focus) |
1972 | { |
1994 | { |
1973 | if (options & Opt_cursorUnderline) |
1995 | if (OPTION (Opt_cursorUnderline)) |
1974 | *crp ^= RS_Uline; |
1996 | *crp ^= RS_Uline; |
1975 | else |
1997 | else |
1976 | { |
1998 | { |
1977 | *crp ^= RS_RVid; |
1999 | *crp ^= RS_RVid; |
1978 | |
2000 | |
… | |
… | |
1980 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2002 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1981 | if (ISSET_PIXCOLOR (Color_cursor)) |
2003 | if (ISSET_PIXCOLOR (Color_cursor)) |
1982 | ccol1 = Color_cursor; |
2004 | ccol1 = Color_cursor; |
1983 | else |
2005 | else |
1984 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2006 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1985 | ccol1 = GET_FGCOLOR (rstyle); |
2007 | ccol1 = fgcolor_of (rstyle); |
1986 | #else |
2008 | #else |
1987 | ccol1 = Color_fg; |
2009 | ccol1 = Color_fg; |
1988 | #endif |
2010 | #endif |
1989 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2011 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1990 | ccol2 = Color_cursor2; |
2012 | ccol2 = Color_cursor2; |
1991 | else |
2013 | else |
1992 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2014 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1993 | ccol2 = GET_BGCOLOR (rstyle); |
2015 | ccol2 = bgcolor_of (rstyle); |
1994 | #else |
2016 | #else |
1995 | ccol2 = Color_bg; |
2017 | ccol2 = Color_bg; |
1996 | #endif |
2018 | #endif |
1997 | *crp = SET_FGCOLOR (*crp, ccol1); |
2019 | *crp = SET_FGCOLOR (*crp, ccol1); |
1998 | *crp = SET_BGCOLOR (*crp, ccol2); |
2020 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2031 | oldcursor.col = screen.cur.col; |
2053 | oldcursor.col = screen.cur.col; |
2032 | } |
2054 | } |
2033 | } |
2055 | } |
2034 | } |
2056 | } |
2035 | |
2057 | |
|
|
2058 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2036 | #if ENABLE_OVERLAY |
2059 | #if ENABLE_OVERLAY |
2037 | scr_swap_overlay (); |
2060 | scr_swap_overlay (); |
2038 | #endif |
2061 | #endif |
2039 | |
2062 | |
2040 | #ifndef NO_SLOW_LINK_SUPPORT |
2063 | #ifndef NO_SLOW_LINK_SUPPORT |
… | |
… | |
2090 | if (wlen < len) |
2113 | if (wlen < len) |
2091 | ::swap (wlen, len); |
2114 | ::swap (wlen, len); |
2092 | |
2115 | |
2093 | XCopyArea (display->display, vt, vt, |
2116 | XCopyArea (display->display, vt, vt, |
2094 | gc, 0, Row2Pixel (len + i), |
2117 | gc, 0, Row2Pixel (len + i), |
2095 | (unsigned int)TermWin_TotalWidth (), |
2118 | (unsigned int)this->width, |
2096 | (unsigned int)Height2Pixel (wlen - len + 1), |
2119 | (unsigned int)Height2Pixel (wlen - len + 1), |
2097 | 0, Row2Pixel (len)); |
2120 | 0, Row2Pixel (len)); |
2098 | len = -1; |
2121 | len = -1; |
2099 | } |
2122 | } |
2100 | } |
2123 | } |
… | |
… | |
2179 | count++, i--; |
2202 | count++, i--; |
2180 | |
2203 | |
2181 | /* |
2204 | /* |
2182 | * Determine the attributes for the string |
2205 | * Determine the attributes for the string |
2183 | */ |
2206 | */ |
2184 | int fore = GET_FGCOLOR (rend); // desired foreground |
2207 | int fore = fgcolor_of (rend); // desired foreground |
2185 | int back = GET_BGCOLOR (rend); // desired background |
2208 | int back = bgcolor_of (rend); // desired background |
2186 | |
2209 | |
2187 | // only do special processing if any attributes are set, which is rare |
2210 | // only do special processing if any attributes are set, which is unlikely |
2188 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2211 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2189 | { |
2212 | { |
2190 | #if ENABLE_STYLES |
2213 | #if ENABLE_STYLES |
2191 | // force redraw after "careful" characters to avoid pixel droppings |
2214 | // force redraw after "careful" characters to avoid pixel droppings |
2192 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2215 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
… | |
… | |
2303 | } /* for (row....) */ |
2326 | } /* for (row....) */ |
2304 | |
2327 | |
2305 | #if ENABLE_OVERLAY |
2328 | #if ENABLE_OVERLAY |
2306 | scr_swap_overlay (); |
2329 | scr_swap_overlay (); |
2307 | #endif |
2330 | #endif |
|
|
2331 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2308 | |
2332 | |
2309 | /* |
2333 | /* |
2310 | * G: cleanup cursor and display outline cursor if necessary |
2334 | * G: cleanup cursor and display outline cursor if necessary |
2311 | */ |
2335 | */ |
2312 | if (showcursor) |
2336 | if (showcursor) |
2313 | { |
2337 | { |
2314 | if (focus) |
2338 | if (focus) |
2315 | { |
2339 | { |
2316 | if (options & Opt_cursorUnderline) |
2340 | if (OPTION (Opt_cursorUnderline)) |
2317 | *crp ^= RS_Uline; |
2341 | *crp ^= RS_Uline; |
2318 | else |
2342 | else |
2319 | { |
2343 | { |
2320 | *crp ^= RS_RVid; |
2344 | *crp ^= RS_RVid; |
2321 | #ifndef NO_CURSORCOLOR |
2345 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2359 | num_scr = 0; |
2383 | num_scr = 0; |
2360 | num_scr_allow = 1; |
2384 | num_scr_allow = 1; |
2361 | } |
2385 | } |
2362 | |
2386 | |
2363 | void |
2387 | void |
2364 | rxvt_term::scr_remap_chars (const line_t &l) |
2388 | rxvt_term::scr_remap_chars (line_t &l) |
2365 | { |
2389 | { |
2366 | if (!l.t) |
2390 | if (!l.t) |
2367 | return; |
2391 | return; |
|
|
2392 | |
|
|
2393 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2368 | |
2394 | |
2369 | for (int i = ncol; i--; ) |
2395 | for (int i = ncol; i--; ) |
2370 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2396 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2371 | } |
2397 | } |
2372 | |
2398 | |
… | |
… | |
2440 | |
2466 | |
2441 | #if ENABLE_FRILLS |
2467 | #if ENABLE_FRILLS |
2442 | if (selection.rect) |
2468 | if (selection.rect) |
2443 | { |
2469 | { |
2444 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2470 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
|
|
2471 | { |
|
|
2472 | text_t *stp = ROW(row).t; |
|
|
2473 | rend_t *srp = ROW(row).r; |
|
|
2474 | |
2445 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2475 | for (col = selection.beg.col; col < selection.end.col; col++) |
2446 | srp[col] ^= RS_RVid; |
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 | } |
2447 | } |
2484 | } |
2448 | else |
2485 | else |
2449 | #endif |
2486 | #endif |
2450 | { |
2487 | { |
2451 | if (selection.beg.row >= -view_start) |
2488 | if (selection.beg.row >= -view_start) |
… | |
… | |
2454 | row = selection.beg.row; |
2491 | row = selection.beg.row; |
2455 | } |
2492 | } |
2456 | else |
2493 | else |
2457 | { |
2494 | { |
2458 | col = 0; |
2495 | col = 0; |
2459 | row = view_start; |
2496 | row = -view_start; |
2460 | } |
2497 | } |
2461 | |
2498 | |
2462 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2499 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2463 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2500 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2464 | srp[col] ^= RS_RVid; |
2501 | srp[col] ^= RS_RVid; |
… | |
… | |
2535 | /* ------------------------------------------------------------------------- */ |
2572 | /* ------------------------------------------------------------------------- */ |
2536 | /* |
2573 | /* |
2537 | * Paste a selection direct to the command fd |
2574 | * Paste a selection direct to the command fd |
2538 | */ |
2575 | */ |
2539 | void |
2576 | void |
2540 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2577 | rxvt_term::paste (char *data, unsigned int len) |
2541 | { |
2578 | { |
2542 | /* convert normal newline chars into common keyboard Return key sequence */ |
2579 | /* convert normal newline chars into common keyboard Return key sequence */ |
2543 | for (unsigned int i = 0; i < len; i++) |
2580 | for (unsigned int i = 0; i < len; i++) |
2544 | if (data[i] == C0_LF) |
2581 | if (data[i] == C0_LF) |
2545 | data[i] = C0_CR; |
2582 | data[i] = C0_CR; |
… | |
… | |
2689 | { |
2726 | { |
2690 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2727 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2691 | char *s = rxvt_wcstombs (w); |
2728 | char *s = rxvt_wcstombs (w); |
2692 | free (w); |
2729 | free (w); |
2693 | // TODO: strlen == only the first element will be converted. well... |
2730 | // TODO: strlen == only the first element will be converted. well... |
2694 | paste ((unsigned char *)s, strlen (s)); |
2731 | paste (s, strlen (s)); |
2695 | free (s); |
2732 | free (s); |
2696 | } |
2733 | } |
2697 | else |
2734 | else |
2698 | #endif |
2735 | #endif |
2699 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2736 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2700 | && cl) |
2737 | && cl) |
2701 | { |
2738 | { |
2702 | for (int i = 0; i < cr; i++) |
2739 | for (int i = 0; i < cr; i++) |
2703 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2740 | paste (cl[i], strlen (cl[i])); |
2704 | |
2741 | |
2705 | XFreeStringList (cl); |
2742 | XFreeStringList (cl); |
2706 | } |
2743 | } |
2707 | else |
2744 | else |
2708 | paste (ct.value, ct.nitems); // paste raw |
2745 | paste ((char *)ct.value, ct.nitems); // paste raw |
2709 | |
2746 | |
2710 | bailout: |
2747 | bailout: |
2711 | XFree (ct.value); |
2748 | XFree (ct.value); |
2712 | |
2749 | |
2713 | if (selection_wait == Sel_normal) |
2750 | if (selection_wait == Sel_normal) |
… | |
… | |
2751 | return; /* outside window */ |
2788 | return; /* outside window */ |
2752 | |
2789 | |
2753 | if (selection.text) |
2790 | if (selection.text) |
2754 | { /* internal selection */ |
2791 | { /* internal selection */ |
2755 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2792 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2756 | paste ((unsigned char *)str, strlen (str)); |
2793 | paste (str, strlen (str)); |
2757 | free (str); |
2794 | free (str); |
2758 | return; |
2795 | return; |
2759 | } |
2796 | } |
2760 | else |
2797 | else |
2761 | { |
2798 | { |
… | |
… | |
2853 | selection.op = SELECTION_DONE; |
2890 | selection.op = SELECTION_DONE; |
2854 | |
2891 | |
2855 | if (selection.clicks == 4) |
2892 | if (selection.clicks == 4) |
2856 | return; /* nothing selected, go away */ |
2893 | return; /* nothing selected, go away */ |
2857 | |
2894 | |
|
|
2895 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2896 | return; |
|
|
2897 | |
2858 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2898 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2859 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2899 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2860 | |
2900 | |
2861 | int ofs = 0; |
2901 | int ofs = 0; |
2862 | int extra = 0; |
2902 | int extra = 0; |
… | |
… | |
2874 | col = selection.beg.col; |
2914 | col = selection.beg.col; |
2875 | end_col = ncol + 1; |
2915 | end_col = ncol + 1; |
2876 | } |
2916 | } |
2877 | else |
2917 | else |
2878 | #endif |
2918 | #endif |
2879 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2919 | end_col = ROW(row).l; |
2880 | |
2920 | |
2881 | col = max (col, 0); |
2921 | col = max (col, 0); |
2882 | |
2922 | |
2883 | if (row == selection.end.row || selection.rect) |
2923 | if (row == selection.end.row |
|
|
2924 | #if ENABLE_FRILLS |
|
|
2925 | || selection.rect |
|
|
2926 | #endif |
|
|
2927 | ) |
2884 | end_col = min (end_col, selection.end.col); |
2928 | min_it (end_col, selection.end.col); |
2885 | |
2929 | |
2886 | t = ROW(row).t + col; |
2930 | t = ROW(row).t + col; |
|
|
2931 | |
2887 | for (; col < end_col; col++) |
2932 | for (; col < end_col; col++) |
2888 | { |
2933 | { |
2889 | if (*t == NOCHAR) |
2934 | if (*t == NOCHAR) |
2890 | t++; |
2935 | t++; |
2891 | #if ENABLE_COMBINING |
2936 | #if ENABLE_COMBINING |
… | |
… | |
2907 | #endif |
2952 | #endif |
2908 | else |
2953 | else |
2909 | new_selection_text[ofs++] = *t++; |
2954 | new_selection_text[ofs++] = *t++; |
2910 | } |
2955 | } |
2911 | |
2956 | |
|
|
2957 | #if ENABLE_FRILLS |
|
|
2958 | if (selection.rect) |
|
|
2959 | { |
|
|
2960 | while (ofs |
|
|
2961 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2962 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2963 | --ofs; |
|
|
2964 | |
|
|
2965 | new_selection_text[ofs++] = C0_LF; |
|
|
2966 | } |
|
|
2967 | else |
|
|
2968 | #endif |
2912 | if (!ROW(row).is_longer () && row != selection.end.row) |
2969 | if (!ROW(row).is_longer () && row != selection.end.row) |
2913 | new_selection_text[ofs++] = C0_LF; |
2970 | new_selection_text[ofs++] = C0_LF; |
2914 | } |
2971 | } |
2915 | |
2972 | |
2916 | if (end_col != selection.end.col) |
2973 | if (end_col != selection.end.col) |
2917 | new_selection_text[ofs++] = C0_LF; |
2974 | new_selection_text[ofs++] = C0_LF; |
2918 | |
2975 | |
… | |
… | |
2928 | |
2985 | |
2929 | // we usually allocate much more than necessary, so realloc it smaller again |
2986 | // we usually allocate much more than necessary, so realloc it smaller again |
2930 | selection.len = ofs; |
2987 | selection.len = ofs; |
2931 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2988 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2932 | |
2989 | |
|
|
2990 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
2991 | return; |
|
|
2992 | |
|
|
2993 | selection_grab (tm); |
|
|
2994 | } |
|
|
2995 | |
|
|
2996 | bool |
|
|
2997 | rxvt_term::selection_grab (Time tm) |
|
|
2998 | { |
|
|
2999 | selection_time = tm; |
|
|
3000 | |
2933 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3001 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2934 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3002 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3003 | { |
2935 | display->set_selection_owner (this); |
3004 | display->set_selection_owner (this); |
|
|
3005 | return true; |
|
|
3006 | } |
2936 | else |
3007 | else |
2937 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3008 | return false; |
2938 | |
3009 | |
2939 | #if 0 |
3010 | #if 0 |
2940 | XTextProperty ct; |
3011 | XTextProperty ct; |
2941 | |
3012 | |
2942 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3013 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2943 | { |
3014 | { |
2944 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3015 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2945 | XFree (ct.value); |
3016 | XFree (ct.value); |
2946 | } |
3017 | } |
2947 | #endif |
3018 | #endif |
2948 | |
|
|
2949 | selection_time = tm; |
|
|
2950 | } |
3019 | } |
2951 | |
3020 | |
2952 | /* ------------------------------------------------------------------------- */ |
3021 | /* ------------------------------------------------------------------------- */ |
2953 | /* |
3022 | /* |
2954 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3023 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
3076 | } |
3145 | } |
3077 | } |
3146 | } |
3078 | break; |
3147 | break; |
3079 | } |
3148 | } |
3080 | |
3149 | |
3081 | Old_Word_Selection_You_Die: |
|
|
3082 | if (dirn == DN) |
3150 | if (dirn == DN) |
3083 | col++; /* put us on one past the end */ |
3151 | col++; /* put us on one past the end */ |
3084 | |
3152 | |
3085 | /* Poke the values back in */ |
3153 | /* Poke the values back in */ |
3086 | ret->row = row; |
3154 | ret->row = row; |
… | |
… | |
3263 | else if (selection.clicks == 2) |
3331 | else if (selection.clicks == 2) |
3264 | { |
3332 | { |
3265 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3333 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3266 | selection.end.col--; |
3334 | selection.end.col--; |
3267 | |
3335 | |
|
|
3336 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3337 | { |
3268 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3338 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3269 | selection_delimit_word (DN, &selection.end, &selection.end); |
3339 | selection_delimit_word (DN, &selection.end, &selection.end); |
|
|
3340 | } |
3270 | } |
3341 | } |
3271 | else if (selection.clicks == 3) |
3342 | else if (selection.clicks == 3) |
3272 | { |
3343 | { |
3273 | #if ENABLE_FRILLS |
3344 | #if ENABLE_FRILLS |
3274 | if (options & Opt_tripleclickwords) |
3345 | if (OPTION (Opt_tripleclickwords)) |
3275 | { |
3346 | { |
3276 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3347 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3277 | |
3348 | |
3278 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3349 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3279 | { |
3350 | { |
… | |
… | |
3340 | { |
3411 | { |
3341 | stp = ROW(end_row).t; |
3412 | stp = ROW(end_row).t; |
3342 | |
3413 | |
3343 | while (--end_col >= 0) |
3414 | while (--end_col >= 0) |
3344 | { |
3415 | { |
3345 | if (stp[end_col] != ' ' |
3416 | if (stp[end_col] != NOCHAR |
3346 | && stp[end_col] != '\t' |
3417 | && !unicode::is_space (stp[end_col])) |
3347 | && stp[end_col] != NOCHAR) |
|
|
3348 | break; |
3418 | break; |
3349 | } |
3419 | } |
3350 | |
3420 | |
3351 | if (end_col >= 0 |
3421 | if (end_col >= 0 |
3352 | || !ROW(end_row - 1).is_longer ()) |
3422 | || !ROW(end_row - 1).is_longer ()) |
… | |
… | |
3551 | |
3621 | |
3552 | #if ENABLE_OVERLAY |
3622 | #if ENABLE_OVERLAY |
3553 | void |
3623 | void |
3554 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3624 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3555 | { |
3625 | { |
3556 | if (nrow < 3 || ncol < 3) |
3626 | if (nrow < 1 || ncol < 1) |
3557 | return; |
3627 | return; |
3558 | |
3628 | |
3559 | want_refresh = 1; |
3629 | want_refresh = 1; |
3560 | |
3630 | |
3561 | scr_overlay_off (); |
3631 | scr_overlay_off (); |
… | |
… | |
3668 | for (int y = ov_h; y--; ) |
3738 | for (int y = ov_h; y--; ) |
3669 | { |
3739 | { |
3670 | text_t *t1 = ov_text[y]; |
3740 | text_t *t1 = ov_text[y]; |
3671 | rend_t *r1 = ov_rend[y]; |
3741 | rend_t *r1 = ov_rend[y]; |
3672 | |
3742 | |
3673 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3743 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3674 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3744 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3675 | |
3745 | |
3676 | for (int x = ov_w; x--; ) |
3746 | for (int x = ov_w; x--; ) |
3677 | { |
3747 | { |
3678 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3748 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3679 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3749 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |