… | |
… | |
25 | */ |
25 | */ |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #define INTERN_SCREEN |
28 | #define INTERN_SCREEN |
29 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvt.h" /* NECESSARY */ |
30 | #include "screen.intpro" /* PROTOS for internal routines */ |
|
|
31 | |
30 | |
32 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
33 | |
32 | |
34 | #include <inttypes.h> |
33 | #include <inttypes.h> |
35 | #include <wchar.h> |
34 | #include <wchar.h> |
… | |
… | |
48 | |
47 | |
49 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
50 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
51 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
52 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
53 | if (Options & Opt_scrollTtyOutput) \ |
52 | if (options & Opt_scrollTtyOutput) \ |
54 | TermWin.view_start = 0 |
53 | TermWin.view_start = 0 |
55 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
56 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
57 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
58 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
118 | /* Fill part/all of a line with blanks. */ |
117 | /* Fill part/all of a line with blanks. */ |
119 | void |
118 | void |
120 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
119 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
121 | { |
120 | { |
122 | efs &= ~RS_baseattrMask; |
121 | efs &= ~RS_baseattrMask; |
123 | efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); |
122 | efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); |
124 | |
123 | |
125 | while (width--) |
124 | while (width--) |
126 | { |
125 | { |
127 | *et++ = ' '; |
126 | *et++ = ' '; |
128 | *er++ = efs; |
127 | *er++ = efs; |
… | |
… | |
155 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
154 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
156 | unsigned int p, q; |
155 | unsigned int p, q; |
157 | int k; |
156 | int k; |
158 | rend_t setrstyle; |
157 | rend_t setrstyle; |
159 | |
158 | |
160 | D_SCREEN ((stderr, "rxvt_scr_reset ()")); |
159 | #if ENABLE_OVERLAY |
|
|
160 | scr_overlay_off (); |
|
|
161 | #endif |
161 | |
162 | |
162 | TermWin.view_start = 0; |
163 | TermWin.view_start = 0; |
163 | num_scr = 0; |
164 | num_scr = 0; |
164 | |
165 | |
165 | if (TermWin.ncol == 0) |
166 | if (TermWin.ncol == 0) |
… | |
… | |
172 | nrow = TermWin.nrow; |
173 | nrow = TermWin.nrow; |
173 | |
174 | |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | return; |
176 | return; |
176 | |
177 | |
|
|
178 | // we need at least two lines for wrapping to work correctly |
|
|
179 | if (nrow + TermWin.saveLines < 2) |
|
|
180 | { |
|
|
181 | TermWin.saveLines++; |
|
|
182 | prev_nrow--; |
|
|
183 | TermWin.nscrolled++; |
|
|
184 | } |
|
|
185 | |
177 | want_refresh = 1; |
186 | want_refresh = 1; |
178 | |
187 | |
|
|
188 | prev_total_rows = prev_nrow + TermWin.saveLines; |
179 | total_rows = nrow + TermWin.saveLines; |
189 | total_rows = nrow + TermWin.saveLines; |
180 | prev_total_rows = prev_nrow + TermWin.saveLines; |
|
|
181 | |
190 | |
182 | screen.tscroll = 0; |
191 | screen.tscroll = 0; |
183 | screen.bscroll = nrow - 1; |
192 | screen.bscroll = nrow - 1; |
184 | |
193 | |
185 | if (!talloc) |
194 | if (!talloc) |
186 | { |
195 | { |
187 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
196 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
188 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
197 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
189 | } |
198 | } |
190 | |
199 | |
191 | if (prev_nrow == 0) |
200 | if (!screen.text) |
192 | { |
201 | { |
193 | /* |
202 | /* |
194 | * first time called so just malloc everything: don't rely on realloc |
203 | * first time called so just malloc everything: don't rely on realloc |
195 | * Note: this is still needed so that all the scrollback lines are NULL |
204 | * Note: this is still needed so that all the scrollback lines are NULL |
196 | */ |
205 | */ |
… | |
… | |
214 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
223 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
215 | screen.tlen[q] = swap.tlen[p] = 0; |
224 | screen.tlen[q] = swap.tlen[p] = 0; |
216 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
225 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
217 | } |
226 | } |
218 | |
227 | |
219 | MEMSET (charsets, 'B', sizeof (charsets)); |
228 | memset (charsets, 'B', sizeof (charsets)); |
220 | TermWin.nscrolled = 0; /* no saved lines */ |
229 | TermWin.nscrolled = 0; /* no saved lines */ |
221 | rstyle = DEFAULT_RSTYLE; |
230 | rstyle = DEFAULT_RSTYLE; |
222 | screen.flags = Screen_DefaultFlags; |
231 | screen.flags = Screen_DefaultFlags; |
223 | screen.cur.row = screen.cur.col = 0; |
232 | screen.cur.row = screen.cur.col = 0; |
224 | screen.charset = 0; |
233 | screen.charset = 0; |
… | |
… | |
471 | * Hard reset |
480 | * Hard reset |
472 | */ |
481 | */ |
473 | void |
482 | void |
474 | rxvt_term::scr_poweron () |
483 | rxvt_term::scr_poweron () |
475 | { |
484 | { |
476 | D_SCREEN ((stderr, "rxvt_scr_poweron ()")); |
|
|
477 | |
|
|
478 | scr_release (); |
485 | scr_release (); |
479 | prev_nrow = prev_ncol = 0; |
486 | prev_nrow = prev_ncol = 0; |
480 | scr_reset (); |
487 | scr_reset (); |
481 | |
488 | |
482 | scr_clear (true); |
489 | scr_clear (true); |
… | |
… | |
493 | */ |
500 | */ |
494 | void |
501 | void |
495 | rxvt_term::scr_cursor (int mode) |
502 | rxvt_term::scr_cursor (int mode) |
496 | { |
503 | { |
497 | screen_t *s; |
504 | screen_t *s; |
498 | |
|
|
499 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
|
|
500 | |
505 | |
501 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
506 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
502 | if (current_screen == SECONDARY) |
507 | if (current_screen == SECONDARY) |
503 | s = &swap; |
508 | s = &swap; |
504 | else |
509 | else |
… | |
… | |
553 | int offset; |
558 | int offset; |
554 | #endif |
559 | #endif |
555 | |
560 | |
556 | want_refresh = 1; |
561 | want_refresh = 1; |
557 | |
562 | |
558 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
|
|
559 | |
|
|
560 | TermWin.view_start = 0; |
563 | TermWin.view_start = 0; |
561 | |
564 | |
562 | if (current_screen == scrn) |
565 | if (current_screen == scrn) |
563 | return scrn; |
566 | return scrn; |
564 | |
567 | |
565 | selection_check (2); /* check for boundary cross */ |
568 | selection_check (2); /* check for boundary cross */ |
566 | |
569 | |
567 | SWAP_IT (current_screen, scrn, int); |
570 | SWAP_IT (current_screen, scrn, int); |
568 | #if NSCREENS |
571 | #if NSCREENS |
569 | if (Options & Opt_secondaryScreen) |
572 | if (options & Opt_secondaryScreen) |
570 | { |
573 | { |
571 | num_scr = 0; |
574 | num_scr = 0; |
572 | offset = TermWin.saveLines; |
575 | offset = TermWin.saveLines; |
573 | for (i = prev_nrow; i--;) |
576 | for (i = prev_nrow; i--;) |
574 | { |
577 | { |
… | |
… | |
592 | screen.flags |= Screen_VisibleCursor; |
595 | screen.flags |= Screen_VisibleCursor; |
593 | swap.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
594 | } |
597 | } |
595 | else |
598 | else |
596 | #endif |
599 | #endif |
597 | if (Options & Opt_secondaryScroll) |
600 | if (options & Opt_secondaryScroll) |
598 | //if (current_screen == PRIMARY) |
601 | //if (current_screen == PRIMARY) |
599 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
602 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
600 | return scrn; |
603 | return scrn; |
|
|
604 | } |
|
|
605 | |
|
|
606 | // clear WrapNext indicator, solidifying position on next line |
|
|
607 | void |
|
|
608 | rxvt_term::scr_do_wrap () |
|
|
609 | { |
|
|
610 | if (!(screen.flags & Screen_WrapNext)) |
|
|
611 | return; |
|
|
612 | |
|
|
613 | screen.flags &= ~Screen_WrapNext; |
|
|
614 | |
|
|
615 | screen.cur.col = 0; |
|
|
616 | |
|
|
617 | if (screen.cur.row == screen.bscroll) |
|
|
618 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
619 | else if (screen.cur.row < TermWin.nrow - 1) |
|
|
620 | screen.cur.row++; |
601 | } |
621 | } |
602 | |
622 | |
603 | /* ------------------------------------------------------------------------- */ |
623 | /* ------------------------------------------------------------------------- */ |
604 | /* |
624 | /* |
605 | * Change the colour for following text |
625 | * Change the colour for following text |
… | |
… | |
644 | |
664 | |
645 | if (count == 0 || (row1 > row2)) |
665 | if (count == 0 || (row1 > row2)) |
646 | return 0; |
666 | return 0; |
647 | |
667 | |
648 | want_refresh = 1; |
668 | want_refresh = 1; |
649 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
|
|
650 | |
669 | |
651 | if (row1 == 0 && count > 0 |
670 | if (row1 == 0 && count > 0 |
652 | && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) |
671 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
653 | { |
672 | { |
654 | nscrolled = (long)TermWin.nscrolled + (long)count; |
673 | nscrolled = (long)TermWin.nscrolled + (long)count; |
655 | |
674 | |
656 | if (nscrolled > (long)TermWin.saveLines) |
675 | if (nscrolled > (long)TermWin.saveLines) |
657 | TermWin.nscrolled = TermWin.saveLines; |
676 | TermWin.nscrolled = TermWin.saveLines; |
658 | else |
677 | else |
659 | TermWin.nscrolled = (uint16_t)nscrolled; |
678 | TermWin.nscrolled = (uint16_t)nscrolled; |
660 | |
679 | |
661 | if ((Options & Opt_scrollWithBuffer) |
680 | if ((options & Opt_scrollWithBuffer) |
662 | && TermWin.view_start != 0 |
681 | && TermWin.view_start != 0 |
663 | && TermWin.view_start != TermWin.saveLines) |
682 | && TermWin.view_start != TermWin.saveLines) |
664 | scr_page (UP, count); |
683 | scr_page (UP, count); |
665 | } |
684 | } |
666 | else if (!spec) |
685 | else if (!spec) |
… | |
… | |
705 | if (j > 0) |
724 | if (j > 0) |
706 | { |
725 | { |
707 | /* A: scroll up */ |
726 | /* A: scroll up */ |
708 | |
727 | |
709 | /* A1: Copy lines that will get clobbered by the rotation */ |
728 | /* A1: Copy lines that will get clobbered by the rotation */ |
|
|
729 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
|
|
730 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
731 | |
|
|
732 | /* A2: Rotate lines */ |
|
|
733 | i = row2 - row1 - count + 1; |
|
|
734 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
|
|
735 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
736 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
737 | |
|
|
738 | j = row2 - count + 1, i = count; |
|
|
739 | } |
|
|
740 | else /* if (j < 0) */ |
|
|
741 | { |
|
|
742 | /* B: scroll down */ |
|
|
743 | |
|
|
744 | /* B1: Copy lines that will get clobbered by the rotation */ |
710 | for (i = 0, j = row1; i < count; i++, j++) |
745 | for (i = 0, j = row2; i < count; i++, j--) |
711 | { |
746 | { |
712 | buf_text[i] = screen.text[j]; |
747 | buf_text[i] = screen.text[j]; |
713 | buf_rend[i] = screen.rend[j]; |
748 | buf_rend[i] = screen.rend[j]; |
714 | } |
749 | } |
715 | |
750 | |
716 | /* A2: Rotate lines */ |
751 | /* B2: Rotate lines */ |
717 | for (j = row1, i = j + count; i <= row2; i++, j++) |
752 | for (j = row2, i = j - count; i >= row1; i--, j--) |
718 | { |
753 | { |
719 | screen.tlen[j] = screen.tlen[i]; |
754 | screen.tlen[j] = screen.tlen[i]; |
720 | screen.text[j] = screen.text[i]; |
755 | screen.text[j] = screen.text[i]; |
721 | screen.rend[j] = screen.rend[i]; |
756 | screen.rend[j] = screen.rend[i]; |
722 | } |
757 | } |
723 | |
758 | |
724 | j = row2 - count + 1, i = count; |
|
|
725 | } |
|
|
726 | else /* if (j < 0) */ |
|
|
727 | { |
|
|
728 | /* B: scroll down */ |
|
|
729 | |
|
|
730 | /* B1: Copy lines that will get clobbered by the rotation */ |
|
|
731 | for (i = 0, j = row2; i < count; i++, j--) |
|
|
732 | { |
|
|
733 | buf_text[i] = screen.text[j]; |
|
|
734 | buf_rend[i] = screen.rend[j]; |
|
|
735 | } |
|
|
736 | |
|
|
737 | /* B2: Rotate lines */ |
|
|
738 | for (j = row2, i = j - count; i >= row1; i--, j--) |
|
|
739 | { |
|
|
740 | screen.tlen[j] = screen.tlen[i]; |
|
|
741 | screen.text[j] = screen.text[i]; |
|
|
742 | screen.rend[j] = screen.rend[i]; |
|
|
743 | } |
|
|
744 | |
|
|
745 | j = row1, i = count; |
759 | j = row1, i = count; |
746 | count = -count; |
760 | count = -count; |
747 | } |
761 | } |
748 | |
762 | |
749 | /* C: Resurrect lines */ |
763 | /* C: Resurrect lines */ |
|
|
764 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
|
|
765 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
|
|
766 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
|
|
767 | if (!spec) /* line length may not equal TermWin.ncol */ |
750 | for (; i--; j++) |
768 | for (; i--; j++) |
751 | { |
|
|
752 | screen.tlen[j] = 0; |
|
|
753 | screen.text[j] = buf_text[i]; |
|
|
754 | screen.rend[j] = buf_rend[i]; |
|
|
755 | |
|
|
756 | if (!spec) /* line length may not equal TermWin.ncol */ |
|
|
757 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
769 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
758 | } |
|
|
759 | |
770 | |
760 | return count; |
771 | return count; |
761 | } |
772 | } |
762 | |
773 | |
763 | /* ------------------------------------------------------------------------- */ |
774 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
765 | * Add text given in <str> of length <len> to screen struct |
776 | * Add text given in <str> of length <len> to screen struct |
766 | */ |
777 | */ |
767 | void |
778 | void |
768 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
779 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
769 | { |
780 | { |
770 | unsigned char checksel, clearsel; |
781 | unsigned char checksel; |
771 | unicode_t c; |
782 | unicode_t c; |
772 | int i, row, last_col; |
783 | int i, row, last_col; |
773 | text_t *stp; |
784 | text_t *stp; |
774 | rend_t *srp; |
785 | rend_t *srp; |
775 | |
786 | |
776 | if (len <= 0) /* sanity */ |
787 | if (len <= 0) /* sanity */ |
777 | return; |
788 | return; |
778 | |
789 | |
779 | want_refresh = 1; |
790 | want_refresh = 1; |
|
|
791 | ZERO_SCROLLBACK (); |
780 | last_col = TermWin.ncol; |
792 | last_col = TermWin.ncol; |
781 | |
793 | |
782 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
|
|
783 | ZERO_SCROLLBACK (); |
|
|
784 | if (nlines > 0) |
794 | if (nlines > 0) |
785 | { |
795 | { |
786 | nlines += (screen.cur.row - screen.bscroll); |
796 | nlines += screen.cur.row - screen.bscroll; |
787 | if ((nlines > 0) |
797 | if ((nlines > 0) |
788 | && (screen.tscroll == 0) |
798 | && (screen.tscroll == 0) |
789 | && (screen.bscroll == (TermWin.nrow - 1))) |
799 | && (screen.bscroll == (TermWin.nrow - 1))) |
790 | { |
800 | { |
791 | /* _at least_ this many lines need to be scrolled */ |
801 | /* _at least_ this many lines need to be scrolled */ |
792 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
802 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
793 | screen.cur.row -= nlines; |
803 | screen.cur.row -= nlines; |
794 | } |
804 | } |
795 | } |
805 | } |
|
|
806 | |
796 | #ifdef DEBUG_STRICT |
807 | #ifdef DEBUG_STRICT |
797 | assert (screen.cur.col < last_col); |
808 | assert (screen.cur.col < last_col); |
798 | assert ((screen.cur.row < TermWin.nrow) |
809 | assert ((screen.cur.row < TermWin.nrow) |
799 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
810 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
800 | #else /* drive with your eyes closed */ |
811 | #else /* drive with your eyes closed */ |
801 | MIN_IT (screen.cur.col, last_col - 1); |
812 | MIN_IT (screen.cur.col, last_col - 1); |
802 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
813 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
803 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
814 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
804 | #endif |
815 | #endif |
805 | row = screen.cur.row + TermWin.saveLines; |
816 | row = screen.cur.row + TermWin.saveLines; |
806 | |
817 | |
807 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
818 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
808 | clearsel = 0; |
|
|
809 | |
819 | |
810 | stp = screen.text[row]; |
820 | stp = screen.text[row]; |
811 | srp = screen.rend[row]; |
821 | srp = screen.rend[row]; |
812 | |
822 | |
813 | while (len--) |
823 | while (len--) |
… | |
… | |
848 | if (checksel /* see if we're writing within selection */ |
858 | if (checksel /* see if we're writing within selection */ |
849 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
859 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
850 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
860 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
851 | { |
861 | { |
852 | checksel = 0; |
862 | checksel = 0; |
853 | clearsel = 1; |
863 | /* |
|
|
864 | * If we wrote anywhere in the selected area, kill the selection |
|
|
865 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
866 | * should be a similar check. |
|
|
867 | */ |
|
|
868 | CLEAR_SELECTION (); |
854 | } |
869 | } |
855 | |
870 | |
856 | if (screen.flags & Screen_WrapNext) |
871 | if (screen.flags & Screen_WrapNext) |
857 | { |
872 | { |
858 | screen.tlen[row] = -1; |
873 | screen.tlen[row] = -1; |
859 | if (screen.cur.row == screen.bscroll) |
874 | |
860 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
861 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
862 | row = (++screen.cur.row) + TermWin.saveLines; |
875 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
863 | |
876 | |
864 | stp = screen.text[row]; /* _must_ refresh */ |
877 | stp = screen.text[row]; /* _must_ refresh */ |
865 | srp = screen.rend[row]; /* _must_ refresh */ |
878 | srp = screen.rend[row]; /* _must_ refresh */ |
866 | screen.cur.col = 0; |
|
|
867 | screen.flags &= ~Screen_WrapNext; |
|
|
868 | } |
879 | } |
869 | |
880 | |
870 | if (screen.flags & Screen_Insert) |
881 | if (screen.flags & Screen_Insert) |
871 | scr_insdel_chars (1, INSERT); |
882 | scr_insdel_chars (1, INSERT); |
872 | |
883 | |
873 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
884 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
874 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
885 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
875 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
886 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
876 | int width = c < 256 ? 1 : wcwidth (c); |
887 | int width = c < 0x100 ? 1 : wcwidth (c); |
877 | |
888 | |
878 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
889 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
879 | { |
890 | { |
880 | // vt100 special graphics and line drawing |
891 | // vt100 special graphics and line drawing |
881 | static uint16_t vt100_0[32] = { // 5f .. 7e |
892 | static uint16_t vt100_0[32] = { // 5f .. 7e |
… | |
… | |
892 | } |
903 | } |
893 | } |
904 | } |
894 | |
905 | |
895 | if (width != 0) |
906 | if (width != 0) |
896 | { |
907 | { |
897 | #if !UNICODE_3 && ENABLE_COMBINING |
908 | #if !UNICODE_3 |
898 | // trim characters we can't store directly :( |
909 | // trim characters we can't store directly :( |
899 | if (c >= 0x10000) |
910 | if (c >= 0x10000) |
|
|
911 | # if ENABLE_COMBINING |
900 | c = rxvt_composite.compose (c); // map to lower 16 bits |
912 | c = rxvt_composite.compose (c); // map to lower 16 bits |
|
|
913 | # else |
|
|
914 | c = 0xfffd; |
901 | #endif |
915 | # endif |
|
|
916 | #endif |
902 | bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); |
917 | bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0); |
903 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c, bold)); |
918 | rend_t rend = SET_FONT (rstyle, |
|
|
919 | c > 0x7f || bold || c < 0x20 |
|
|
920 | ? TermWin.fontset->find_font (c, bold) |
|
|
921 | : TermWin.ascii_map [c - 0x20]); |
904 | |
922 | |
905 | do |
923 | do |
906 | { |
924 | { |
907 | stp[screen.cur.col] = c; |
925 | stp[screen.cur.col] = c; |
908 | srp[screen.cur.col] = rend; |
926 | srp[screen.cur.col] = rend; |
… | |
… | |
969 | } |
987 | } |
970 | |
988 | |
971 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
989 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
972 | MAX_IT (screen.tlen[row], screen.cur.col); |
990 | MAX_IT (screen.tlen[row], screen.cur.col); |
973 | |
991 | |
974 | /* |
|
|
975 | * If we wrote anywhere in the selected area, kill the selection |
|
|
976 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
977 | * should be a similar check. |
|
|
978 | */ |
|
|
979 | if (clearsel) |
|
|
980 | CLEAR_SELECTION (); |
|
|
981 | |
|
|
982 | #ifdef DEBUG_STRICT |
992 | #ifdef DEBUG_STRICT |
983 | assert (screen.cur.row >= 0); |
993 | assert (screen.cur.row >= 0); |
984 | #else /* drive with your eyes closed */ |
994 | #else /* drive with your eyes closed */ |
985 | MAX_IT (screen.cur.row, 0); |
995 | MAX_IT (screen.cur.row, 0); |
986 | #endif |
996 | #endif |
… | |
… | |
1003 | #ifdef TERMCAP_HAS_BW |
1013 | #ifdef TERMCAP_HAS_BW |
1004 | screen.cur.col = TermWin.ncol - 1; |
1014 | screen.cur.col = TermWin.ncol - 1; |
1005 | screen.cur.row--; |
1015 | screen.cur.row--; |
1006 | return; |
1016 | return; |
1007 | #endif |
1017 | #endif |
1008 | |
|
|
1009 | } |
1018 | } |
1010 | } |
1019 | } |
1011 | else if ((screen.flags & Screen_WrapNext) == 0) |
1020 | else if (!(screen.flags & Screen_WrapNext)) |
1012 | scr_gotorc (0, -1, RELATIVE); |
1021 | scr_gotorc (0, -1, RELATIVE); |
1013 | |
1022 | |
1014 | screen.flags &= ~Screen_WrapNext; |
1023 | screen.flags &= ~Screen_WrapNext; |
1015 | } |
1024 | } |
1016 | |
1025 | |
… | |
… | |
1023 | void |
1032 | void |
1024 | rxvt_term::scr_tab (int count) |
1033 | rxvt_term::scr_tab (int count) |
1025 | { |
1034 | { |
1026 | int i, x; |
1035 | int i, x; |
1027 | |
1036 | |
1028 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
|
|
1029 | want_refresh = 1; |
1037 | want_refresh = 1; |
1030 | i = x = screen.cur.col; |
1038 | i = x = screen.cur.col; |
1031 | |
1039 | |
1032 | if (count == 0) |
1040 | if (count == 0) |
1033 | return; |
1041 | return; |
… | |
… | |
1067 | * Process DEC Back Index |
1075 | * Process DEC Back Index |
1068 | * XTERM_SEQ: ESC 6 |
1076 | * XTERM_SEQ: ESC 6 |
1069 | * Move cursor left in row. If we're at the left boundary, shift everything |
1077 | * Move cursor left in row. If we're at the left boundary, shift everything |
1070 | * in that row right. Clear left column. |
1078 | * in that row right. Clear left column. |
1071 | */ |
1079 | */ |
1072 | #ifndef NO_FRILLS |
1080 | #if ENABLE_FRILLS |
1073 | void |
1081 | void |
1074 | rxvt_term::scr_backindex () |
1082 | rxvt_term::scr_backindex () |
1075 | { |
1083 | { |
1076 | if (screen.cur.col > 0) |
1084 | if (screen.cur.col > 0) |
1077 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1085 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1078 | else |
1086 | else |
1079 | { |
1087 | { |
1080 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1088 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1081 | return; /* um, yeah? */ |
1089 | return; /* um, yeah? */ |
|
|
1090 | |
1082 | scr_insdel_chars (1, INSERT); |
1091 | scr_insdel_chars (1, INSERT); |
1083 | } |
1092 | } |
1084 | } |
1093 | } |
1085 | #endif |
1094 | #endif |
1086 | /* ------------------------------------------------------------------------- */ |
1095 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1088 | * Process DEC Forward Index |
1097 | * Process DEC Forward Index |
1089 | * XTERM_SEQ: ESC 9 |
1098 | * XTERM_SEQ: ESC 9 |
1090 | * Move cursor right in row. If we're at the right boundary, shift everything |
1099 | * Move cursor right in row. If we're at the right boundary, shift everything |
1091 | * in that row left. Clear right column. |
1100 | * in that row left. Clear right column. |
1092 | */ |
1101 | */ |
1093 | #ifndef NO_FRILLS |
1102 | #if ENABLE_FRILLS |
1094 | void |
1103 | void |
1095 | rxvt_term::scr_forwardindex () |
1104 | rxvt_term::scr_forwardindex () |
1096 | { |
1105 | { |
1097 | int row; |
1106 | int row; |
1098 | |
1107 | |
1099 | if (screen.cur.col < TermWin.ncol - 1) |
1108 | if (screen.cur.col < TermWin.ncol - 1) |
1100 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1109 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1101 | else |
1110 | else |
1102 | { |
1111 | { |
1103 | row = screen.cur.row + TermWin.saveLines; |
1112 | row = screen.cur.row + TermWin.saveLines; |
|
|
1113 | |
1104 | if (screen.tlen[row] == 0) |
1114 | if (screen.tlen[row] == 0) |
1105 | return; /* um, yeah? */ |
1115 | return; /* um, yeah? */ |
1106 | else if (screen.tlen[row] == -1) |
1116 | else if (screen.tlen[row] == -1) |
1107 | screen.tlen[row] = TermWin.ncol; |
1117 | screen.tlen[row] = TermWin.ncol; |
|
|
1118 | |
1108 | scr_gotorc (0, 0, R_RELATIVE); |
1119 | scr_gotorc (0, 0, R_RELATIVE); |
1109 | scr_insdel_chars (1, DELETE); |
1120 | scr_insdel_chars (1, DELETE); |
1110 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1121 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1111 | } |
1122 | } |
1112 | } |
1123 | } |
… | |
… | |
1120 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1131 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1121 | { |
1132 | { |
1122 | want_refresh = 1; |
1133 | want_refresh = 1; |
1123 | ZERO_SCROLLBACK (); |
1134 | ZERO_SCROLLBACK (); |
1124 | |
1135 | |
1125 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
|
|
1126 | |
|
|
1127 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1136 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1128 | MAX_IT (screen.cur.col, 0); |
1137 | MAX_IT (screen.cur.col, 0); |
1129 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1138 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1130 | |
1139 | |
1131 | screen.flags &= ~Screen_WrapNext; |
1140 | screen.flags &= ~Screen_WrapNext; |
|
|
1141 | |
1132 | if (relative & R_RELATIVE) |
1142 | if (relative & R_RELATIVE) |
1133 | { |
1143 | { |
1134 | if (row > 0) |
1144 | if (row > 0) |
1135 | { |
1145 | { |
1136 | if (screen.cur.row <= screen.bscroll |
1146 | if (screen.cur.row <= screen.bscroll |
… | |
… | |
1156 | MIN_IT (screen.cur.row, screen.bscroll); |
1166 | MIN_IT (screen.cur.row, screen.bscroll); |
1157 | } |
1167 | } |
1158 | else |
1168 | else |
1159 | screen.cur.row = row; |
1169 | screen.cur.row = row; |
1160 | } |
1170 | } |
|
|
1171 | |
1161 | MAX_IT (screen.cur.row, 0); |
1172 | MAX_IT (screen.cur.row, 0); |
1162 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1173 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1163 | |
|
|
1164 | while (screen.cur.col > 0 |
|
|
1165 | && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) |
|
|
1166 | screen.cur.col--; |
|
|
1167 | } |
1174 | } |
1168 | |
1175 | |
1169 | /* ------------------------------------------------------------------------- */ |
1176 | /* ------------------------------------------------------------------------- */ |
1170 | /* |
1177 | /* |
1171 | * direction should be UP or DN |
1178 | * direction should be UP or DN |
1172 | */ |
1179 | */ |
1173 | void |
1180 | void |
1174 | rxvt_term::scr_index (enum page_dirn direction) |
1181 | rxvt_term::scr_index (enum page_dirn direction) |
1175 | { |
1182 | { |
1176 | int dirn; |
1183 | int dirn; |
1177 | |
1184 | |
1178 | want_refresh = 1; |
1185 | want_refresh = 1; |
|
|
1186 | ZERO_SCROLLBACK (); |
|
|
1187 | |
1179 | dirn = ((direction == UP) ? 1 : -1); |
1188 | dirn = ((direction == UP) ? 1 : -1); |
1180 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
|
|
1181 | |
|
|
1182 | ZERO_SCROLLBACK (); |
|
|
1183 | |
1189 | |
1184 | screen.flags &= ~Screen_WrapNext; |
1190 | screen.flags &= ~Screen_WrapNext; |
|
|
1191 | |
1185 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1192 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1186 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1193 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1187 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1194 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1188 | else |
1195 | else |
1189 | screen.cur.row += dirn; |
1196 | screen.cur.row += dirn; |
|
|
1197 | |
1190 | MAX_IT (screen.cur.row, 0); |
1198 | MAX_IT (screen.cur.row, 0); |
1191 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1199 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1192 | selection_check (0); |
1200 | selection_check (0); |
1193 | } |
1201 | } |
1194 | |
1202 | |
… | |
… | |
1203 | rxvt_term::scr_erase_line (int mode) |
1211 | rxvt_term::scr_erase_line (int mode) |
1204 | { |
1212 | { |
1205 | unsigned int row, col, num; |
1213 | unsigned int row, col, num; |
1206 | |
1214 | |
1207 | want_refresh = 1; |
1215 | want_refresh = 1; |
1208 | D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1209 | ZERO_SCROLLBACK (); |
1216 | ZERO_SCROLLBACK (); |
1210 | |
1217 | |
1211 | selection_check (1); |
1218 | selection_check (1); |
1212 | |
|
|
1213 | screen.flags &= ~Screen_WrapNext; |
|
|
1214 | |
1219 | |
1215 | row = TermWin.saveLines + screen.cur.row; |
1220 | row = TermWin.saveLines + screen.cur.row; |
1216 | switch (mode) |
1221 | switch (mode) |
1217 | { |
1222 | { |
1218 | case 0: /* erase to end of line */ |
1223 | case 0: /* erase to end of line */ |
… | |
… | |
1262 | int32_t row, row_offset; |
1267 | int32_t row, row_offset; |
1263 | rend_t ren; |
1268 | rend_t ren; |
1264 | XGCValues gcvalue; |
1269 | XGCValues gcvalue; |
1265 | |
1270 | |
1266 | want_refresh = 1; |
1271 | want_refresh = 1; |
1267 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1268 | ZERO_SCROLLBACK (); |
1272 | ZERO_SCROLLBACK (); |
|
|
1273 | |
1269 | row_offset = (int32_t)TermWin.saveLines; |
1274 | row_offset = (int32_t)TermWin.saveLines; |
1270 | |
1275 | |
1271 | switch (mode) |
1276 | switch (mode) |
1272 | { |
1277 | { |
1273 | case 0: /* erase to end of screen */ |
1278 | case 0: /* erase to end of screen */ |
… | |
… | |
1289 | break; |
1294 | break; |
1290 | default: |
1295 | default: |
1291 | return; |
1296 | return; |
1292 | } |
1297 | } |
1293 | |
1298 | |
1294 | refresh_type |= REFRESH_BOUNDS; |
|
|
1295 | |
|
|
1296 | if (selection.op && current_screen == selection.screen |
1299 | if (selection.op && current_screen == selection.screen |
1297 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1300 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1298 | || (selection.end.row >= row |
1301 | || (selection.end.row >= row |
1299 | && selection.end.row <= row + num))) |
1302 | && selection.end.row <= row + num))) |
1300 | CLEAR_SELECTION (); |
1303 | CLEAR_SELECTION (); |
… | |
… | |
1312 | CLEAR_ROWS (row, num); |
1315 | CLEAR_ROWS (row, num); |
1313 | } |
1316 | } |
1314 | else |
1317 | else |
1315 | { |
1318 | { |
1316 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1319 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1317 | gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; |
1320 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1318 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1321 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1319 | ERASE_ROWS (row, num); |
1322 | ERASE_ROWS (row, num); |
1320 | gcvalue.foreground = PixColors[Color_fg]; |
1323 | gcvalue.foreground = pix_colors[Color_fg]; |
1321 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1324 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1322 | } |
1325 | } |
1323 | |
1326 | |
1324 | for (; num--; row++) |
1327 | for (; num--; row++) |
1325 | { |
1328 | { |
… | |
… | |
1341 | { |
1344 | { |
1342 | int i, j, k; |
1345 | int i, j, k; |
1343 | rend_t *r1, fs; |
1346 | rend_t *r1, fs; |
1344 | |
1347 | |
1345 | want_refresh = 1; |
1348 | want_refresh = 1; |
|
|
1349 | ZERO_SCROLLBACK (); |
|
|
1350 | |
1346 | num_scr_allow = 0; |
1351 | num_scr_allow = 0; |
1347 | ZERO_SCROLLBACK (); |
|
|
1348 | selection_check (3); |
1352 | selection_check (3); |
1349 | |
1353 | |
1350 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1354 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1351 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1355 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1352 | { |
1356 | { |
… | |
… | |
1379 | if (insdel == DELETE) |
1383 | if (insdel == DELETE) |
1380 | return; |
1384 | return; |
1381 | else if (insdel == INSERT) |
1385 | else if (insdel == INSERT) |
1382 | count = end; |
1386 | count = end; |
1383 | } |
1387 | } |
1384 | screen.flags &= ~Screen_WrapNext; |
1388 | |
|
|
1389 | scr_do_wrap (); |
1385 | |
1390 | |
1386 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1391 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1387 | } |
1392 | } |
1388 | |
1393 | |
1389 | /* ------------------------------------------------------------------------- */ |
1394 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1403 | ZERO_SCROLLBACK (); |
1408 | ZERO_SCROLLBACK (); |
1404 | |
1409 | |
1405 | if (count <= 0) |
1410 | if (count <= 0) |
1406 | return; |
1411 | return; |
1407 | |
1412 | |
|
|
1413 | scr_do_wrap (); |
|
|
1414 | |
1408 | selection_check (1); |
1415 | selection_check (1); |
1409 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1416 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1410 | |
1417 | |
1411 | row = screen.cur.row + TermWin.saveLines; |
1418 | row = screen.cur.row + TermWin.saveLines; |
1412 | screen.flags &= ~Screen_WrapNext; |
|
|
1413 | |
1419 | |
1414 | stp = screen.text[row]; |
1420 | stp = screen.text[row]; |
1415 | srp = screen.rend[row]; |
1421 | srp = screen.rend[row]; |
1416 | slp = & (screen.tlen[row]); |
1422 | slp = &screen.tlen[row]; |
1417 | |
1423 | |
1418 | switch (insdel) |
1424 | switch (insdel) |
1419 | { |
1425 | { |
1420 | case INSERT: |
1426 | case INSERT: |
1421 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1427 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
… | |
… | |
1542 | rxvt_term::scr_autowrap (int mode) |
1548 | rxvt_term::scr_autowrap (int mode) |
1543 | { |
1549 | { |
1544 | if (mode) |
1550 | if (mode) |
1545 | screen.flags |= Screen_Autowrap; |
1551 | screen.flags |= Screen_Autowrap; |
1546 | else |
1552 | else |
1547 | screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); |
1553 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1548 | } |
1554 | } |
1549 | |
1555 | |
1550 | /* ------------------------------------------------------------------------- */ |
1556 | /* ------------------------------------------------------------------------- */ |
1551 | /* |
1557 | /* |
1552 | * Set/unset margin origin mode |
1558 | * Set/unset margin origin mode |
… | |
… | |
1591 | */ |
1597 | */ |
1592 | void |
1598 | void |
1593 | rxvt_term::scr_set_tab (int mode) |
1599 | rxvt_term::scr_set_tab (int mode) |
1594 | { |
1600 | { |
1595 | if (mode < 0) |
1601 | if (mode < 0) |
1596 | MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); |
1602 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1597 | else if (screen.cur.col < TermWin.ncol) |
1603 | else if (screen.cur.col < TermWin.ncol) |
1598 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1604 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1599 | } |
1605 | } |
1600 | |
1606 | |
1601 | /* ------------------------------------------------------------------------- */ |
1607 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1605 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1611 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1606 | */ |
1612 | */ |
1607 | void |
1613 | void |
1608 | rxvt_term::scr_rvideo_mode (int mode) |
1614 | rxvt_term::scr_rvideo_mode (int mode) |
1609 | { |
1615 | { |
1610 | XGCValues gcvalue; |
1616 | XGCValues gcvalue; |
1611 | |
1617 | |
1612 | if (rvideo != mode) |
1618 | if (rvideo != mode) |
1613 | { |
1619 | { |
1614 | rvideo = mode; |
1620 | rvideo = mode; |
1615 | SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); |
1621 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1616 | #if defined(XPM_BACKGROUND) |
1622 | #if defined(XPM_BACKGROUND) |
1617 | if (bgPixmap.pixmap == None) |
1623 | if (bgPixmap.pixmap == None) |
1618 | #endif |
1624 | #endif |
1619 | #if defined(TRANSPARENT) |
1625 | #if defined(TRANSPARENT) |
1620 | if (! (Options & Opt_transparent) || am_transparent == 0) |
1626 | if (! (options & Opt_transparent) || am_transparent == 0) |
1621 | #endif |
1627 | #endif |
1622 | XSetWindowBackground (display->display, TermWin.vt, |
1628 | XSetWindowBackground (display->display, TermWin.vt, |
1623 | PixColors[Color_bg]); |
1629 | pix_colors[Color_bg]); |
1624 | |
1630 | |
1625 | gcvalue.foreground = PixColors[Color_fg]; |
1631 | gcvalue.foreground = pix_colors[Color_fg]; |
1626 | gcvalue.background = PixColors[Color_bg]; |
1632 | gcvalue.background = pix_colors[Color_bg]; |
1627 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1633 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1628 | &gcvalue); |
1634 | &gcvalue); |
1629 | scr_clear (); |
1635 | scr_clear (); |
1630 | scr_touch (true); |
1636 | scr_touch (true); |
1631 | } |
1637 | } |
… | |
… | |
1747 | row_col_t rc[RC_COUNT]; |
1753 | row_col_t rc[RC_COUNT]; |
1748 | |
1754 | |
1749 | if (drawn_text == NULL) /* sanity check */ |
1755 | if (drawn_text == NULL) /* sanity check */ |
1750 | return; |
1756 | return; |
1751 | |
1757 | |
|
|
1758 | #ifndef NO_SLOW_LINK_SUPPORT |
|
|
1759 | if (refresh_type == FAST_REFRESH && !display->is_local) |
|
|
1760 | { |
|
|
1761 | y = 0; |
|
|
1762 | height = TermWin.height; |
|
|
1763 | } |
|
|
1764 | #endif |
|
|
1765 | |
1752 | #ifdef DEBUG_STRICT |
1766 | #ifdef DEBUG_STRICT |
1753 | x = max (x, 0); |
1767 | x = max (x, 0); |
1754 | x = min (x, (int)TermWin.width); |
1768 | x = min (x, (int)TermWin.width); |
1755 | y = max (y, 0); |
1769 | y = max (y, 0); |
1756 | y = min (y, (int)TermWin.height); |
1770 | y = min (y, (int)TermWin.height); |
… | |
… | |
1768 | { |
1782 | { |
1769 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1783 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1770 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1784 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1771 | } |
1785 | } |
1772 | |
1786 | |
1773 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
|
|
1774 | |
|
|
1775 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1787 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1776 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1788 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1777 | |
1789 | |
1778 | if (refresh) |
1790 | if (refresh) |
1779 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1791 | scr_refresh (SLOW_REFRESH); |
1780 | } |
1792 | } |
1781 | |
1793 | |
1782 | /* ------------------------------------------------------------------------- */ |
1794 | /* ------------------------------------------------------------------------- */ |
1783 | /* |
1795 | /* |
1784 | * Refresh the entire screen |
1796 | * Refresh the entire screen |
… | |
… | |
1799 | { |
1811 | { |
1800 | long p = 0; |
1812 | long p = 0; |
1801 | uint16_t oldviewstart; |
1813 | uint16_t oldviewstart; |
1802 | |
1814 | |
1803 | oldviewstart = TermWin.view_start; |
1815 | oldviewstart = TermWin.view_start; |
|
|
1816 | |
1804 | if (y < len) |
1817 | if (y < len) |
1805 | { |
1818 | { |
1806 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1819 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1807 | p -= (long) (TermWin.nrow - 1); |
1820 | p -= (long) (TermWin.nrow - 1); |
1808 | p = max (p, 0); |
1821 | p = max (p, 0); |
1809 | } |
1822 | } |
|
|
1823 | |
1810 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1824 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1811 | D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); |
|
|
1812 | |
1825 | |
1813 | return scr_changeview (oldviewstart); |
1826 | return scr_changeview (oldviewstart); |
1814 | } |
1827 | } |
1815 | |
1828 | |
1816 | /* ------------------------------------------------------------------------- */ |
1829 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1819 | * direction should be UP or DN |
1832 | * direction should be UP or DN |
1820 | */ |
1833 | */ |
1821 | int |
1834 | int |
1822 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1835 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1823 | { |
1836 | { |
1824 | int n; |
1837 | int n; |
1825 | uint16_t oldviewstart; |
1838 | uint16_t oldviewstart; |
1826 | |
1839 | |
1827 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
|
|
1828 | #ifdef DEBUG_STRICT |
1840 | #ifdef DEBUG_STRICT |
1829 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1841 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
1830 | #endif |
1842 | #endif |
1831 | oldviewstart = TermWin.view_start; |
1843 | oldviewstart = TermWin.view_start; |
1832 | if (direction == UP) |
1844 | if (direction == UP) |
… | |
… | |
1859 | rxvt_term::scr_bell () |
1871 | rxvt_term::scr_bell () |
1860 | { |
1872 | { |
1861 | #ifndef NO_BELL |
1873 | #ifndef NO_BELL |
1862 | # ifndef NO_MAPALERT |
1874 | # ifndef NO_MAPALERT |
1863 | # ifdef MAPALERT_OPTION |
1875 | # ifdef MAPALERT_OPTION |
1864 | if (Options & Opt_mapAlert) |
1876 | if (options & Opt_mapAlert) |
1865 | # endif |
1877 | # endif |
1866 | XMapWindow (display->display, TermWin.parent[0]); |
1878 | XMapWindow (display->display, TermWin.parent[0]); |
1867 | # endif |
1879 | # endif |
1868 | if (Options & Opt_visualBell) |
1880 | if (options & Opt_visualBell) |
1869 | { |
1881 | { |
1870 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1882 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1871 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1883 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1872 | } |
1884 | } |
1873 | else |
1885 | else |
… | |
… | |
1879 | /* ARGSUSED */ |
1891 | /* ARGSUSED */ |
1880 | void |
1892 | void |
1881 | rxvt_term::scr_printscreen (int fullhist) |
1893 | rxvt_term::scr_printscreen (int fullhist) |
1882 | { |
1894 | { |
1883 | #ifdef PRINTPIPE |
1895 | #ifdef PRINTPIPE |
1884 | int i, r1, nrows, row_offset; |
1896 | int i, r1, nrows, row_offset; |
1885 | text_t *t; |
1897 | FILE *fd; |
1886 | FILE *fd; |
|
|
1887 | |
1898 | |
1888 | if ((fd = popen_printer ()) == NULL) |
1899 | if ((fd = popen_printer ()) == NULL) |
1889 | return; |
1900 | return; |
|
|
1901 | |
1890 | nrows = TermWin.nrow; |
1902 | nrows = TermWin.nrow; |
1891 | row_offset = TermWin.saveLines; |
1903 | row_offset = TermWin.saveLines; |
|
|
1904 | |
1892 | if (!fullhist) |
1905 | if (!fullhist) |
1893 | row_offset -= TermWin.view_start; |
1906 | row_offset -= TermWin.view_start; |
1894 | else |
1907 | else |
1895 | { |
1908 | { |
1896 | nrows += TermWin.nscrolled; |
1909 | nrows += TermWin.nscrolled; |
1897 | row_offset -= TermWin.nscrolled; |
1910 | row_offset -= TermWin.nscrolled; |
1898 | } |
1911 | } |
1899 | |
1912 | |
|
|
1913 | wctomb (0, 0); |
|
|
1914 | |
1900 | for (r1 = 0; r1 < nrows; r1++) |
1915 | for (r1 = 0; r1 < nrows; r1++) |
1901 | { |
1916 | { |
1902 | t = screen.text[r1 + row_offset]; |
1917 | text_t *tp = screen.text[r1 + row_offset]; |
1903 | for (i = TermWin.ncol - 1; i >= 0; i--) |
1918 | int len = screen.tlen[r1 + row_offset]; |
1904 | if (!isspace (t[i])) |
1919 | |
1905 | break; |
1920 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1906 | fprintf (fd, "%.*s\n", (i + 1), t); |
1921 | { |
|
|
1922 | char mb[MB_LEN_MAX]; |
|
|
1923 | text_t t = *tp++; |
|
|
1924 | if (t == NOCHAR) |
|
|
1925 | continue; |
|
|
1926 | |
|
|
1927 | len = wctomb (mb, t); |
|
|
1928 | |
|
|
1929 | if (len <= 0) |
|
|
1930 | { |
|
|
1931 | mb[0] = ' '; |
|
|
1932 | len = 1; |
|
|
1933 | } |
|
|
1934 | |
|
|
1935 | fwrite (mb, 1, len, fd); |
|
|
1936 | } |
|
|
1937 | |
|
|
1938 | fputc ('\n', fd); |
1907 | } |
1939 | } |
|
|
1940 | |
1908 | pclose_printer (fd); |
1941 | pclose_printer (fd); |
1909 | #endif |
1942 | #endif |
1910 | } |
1943 | } |
1911 | |
1944 | |
1912 | /* ------------------------------------------------------------------------- */ |
1945 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1926 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1959 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
1927 | |
1960 | |
1928 | void |
1961 | void |
1929 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1962 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1930 | { |
1963 | { |
1931 | unsigned char clearfirst, /* first character writes before cell */ |
|
|
1932 | clearlast, /* last character writes beyond cell */ |
|
|
1933 | must_clear, /* use draw_string not draw_image_string */ |
1964 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1934 | rvid, /* reverse video this position */ |
1965 | rvid, /* reverse video this position */ |
1935 | showcursor; /* show the cursor */ |
1966 | showcursor; /* show the cursor */ |
1936 | int16_t col, row, /* column/row we're processing */ |
1967 | int16_t col, row, /* column/row we're processing */ |
1937 | ocrow; /* old cursor row */ |
1968 | ocrow; /* old cursor row */ |
1938 | int i, /* tmp */ |
1969 | int i, /* tmp */ |
1939 | row_offset; /* basic offset in screen structure */ |
1970 | row_offset; /* basic offset in screen structure */ |
1940 | #ifndef NO_CURSORCOLOR |
1971 | #ifndef NO_CURSORCOLOR |
1941 | rend_t cc1; /* store colours at cursor position (s) */ |
1972 | rend_t cc1; /* store colours at cursor position (s) */ |
1942 | #endif |
1973 | #endif |
1943 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
1974 | rend_t *crp; // cursor rendition pointer |
1944 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
1945 | |
1975 | |
1946 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1976 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1947 | return; |
1977 | return; |
1948 | |
1978 | |
1949 | /* |
1979 | /* |
1950 | * A: set up vars |
1980 | * A: set up vars |
1951 | */ |
1981 | */ |
1952 | clearfirst = clearlast = must_clear = 0; |
1982 | must_clear = 0; |
1953 | |
|
|
1954 | refresh_count = 0; |
1983 | refresh_count = 0; |
1955 | |
1984 | |
1956 | row_offset = TermWin.saveLines - TermWin.view_start; |
1985 | row_offset = TermWin.saveLines - TermWin.view_start; |
1957 | |
|
|
1958 | if ((refresh_type & REFRESH_BOUNDS)) |
|
|
1959 | { |
|
|
1960 | clearfirst = clearlast = 1; |
|
|
1961 | refresh_type &= ~REFRESH_BOUNDS; |
|
|
1962 | } |
|
|
1963 | |
1986 | |
1964 | #ifdef XPM_BACKGROUND |
1987 | #ifdef XPM_BACKGROUND |
1965 | must_clear |= (bgPixmap.pixmap != None); |
1988 | must_clear |= (bgPixmap.pixmap != None); |
1966 | #endif |
1989 | #endif |
1967 | #ifdef TRANSPARENT |
1990 | #ifdef TRANSPARENT |
1968 | must_clear |= ((Options & Opt_transparent) && am_transparent); |
1991 | must_clear |= ((options & Opt_transparent) && am_transparent); |
1969 | #endif |
1992 | #endif |
1970 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1993 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1971 | |
1994 | |
1972 | /* |
1995 | /* |
1973 | * B: reverse any characters which are selected |
1996 | * B: reverse any characters which are selected |
1974 | */ |
1997 | */ |
1975 | scr_reverse_selection (); |
1998 | scr_reverse_selection (); |
|
|
1999 | #if ENABLE_OVERLAY |
|
|
2000 | scr_swap_overlay (); |
|
|
2001 | #endif |
1976 | |
2002 | |
1977 | /* |
2003 | /* |
1978 | * C: set the cursor character (s) |
2004 | * C: set the cursor character (s) |
1979 | */ |
2005 | */ |
1980 | { |
2006 | { |
… | |
… | |
1988 | showcursor = 0; |
2014 | showcursor = 0; |
1989 | #endif |
2015 | #endif |
1990 | |
2016 | |
1991 | if (showcursor) |
2017 | if (showcursor) |
1992 | { |
2018 | { |
|
|
2019 | int col = screen.cur.col; |
|
|
2020 | |
|
|
2021 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2022 | col--; |
|
|
2023 | |
1993 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
2024 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
1994 | |
2025 | |
1995 | if (showcursor && TermWin.focus) |
2026 | if (showcursor && TermWin.focus) |
1996 | { |
2027 | { |
1997 | *srp ^= RS_RVid; |
2028 | *crp ^= RS_RVid; |
1998 | #ifndef NO_CURSORCOLOR |
2029 | #ifndef NO_CURSORCOLOR |
1999 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
2030 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2000 | if (ISSET_PIXCOLOR (Color_cursor)) |
2031 | if (ISSET_PIXCOLOR (Color_cursor)) |
2001 | ccol1 = Color_cursor; |
2032 | ccol1 = Color_cursor; |
2002 | else |
2033 | else |
2003 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2034 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2004 | ccol1 = GET_FGCOLOR (rstyle); |
2035 | ccol1 = GET_FGCOLOR (rstyle); |
… | |
… | |
2011 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2042 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2012 | ccol2 = GET_BGCOLOR (rstyle); |
2043 | ccol2 = GET_BGCOLOR (rstyle); |
2013 | #else |
2044 | #else |
2014 | ccol2 = Color_bg; |
2045 | ccol2 = Color_bg; |
2015 | #endif |
2046 | #endif |
2016 | *srp = SET_FGCOLOR (*srp, ccol1); |
2047 | *crp = SET_FGCOLOR (*crp, ccol1); |
2017 | *srp = SET_BGCOLOR (*srp, ccol2); |
2048 | *crp = SET_BGCOLOR (*crp, ccol2); |
2018 | #endif |
2049 | #endif |
2019 | } |
2050 | } |
2020 | } |
2051 | } |
2021 | |
2052 | |
2022 | /* make sure no outline cursor is left around */ |
2053 | /* make sure no outline cursor is left around */ |
… | |
… | |
2049 | oldcursor.col = screen.cur.col; |
2080 | oldcursor.col = screen.cur.col; |
2050 | } |
2081 | } |
2051 | } |
2082 | } |
2052 | } |
2083 | } |
2053 | |
2084 | |
|
|
2085 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2086 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
2054 | #ifndef NO_SLOW_LINK_SUPPORT |
2087 | #ifndef NO_SLOW_LINK_SUPPORT |
2055 | /* |
2088 | /* |
2056 | * D: CopyArea pass - very useful for slower links |
2089 | * D: CopyArea pass - very useful for slower links |
2057 | * This has been deliberately kept simple. |
2090 | * This has been deliberately kept simple. |
2058 | */ |
2091 | */ |
2059 | i = num_scr; |
2092 | i = num_scr; |
|
|
2093 | if (!display->is_local |
2060 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2094 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2061 | && abs (i) < TermWin.nrow && !must_clear) |
2095 | && abs (i) < TermWin.nrow && !must_clear) |
2062 | { |
2096 | { |
2063 | int16_t nits; |
2097 | int16_t nits; |
2064 | int j; |
2098 | int j; |
2065 | rend_t *drp2; |
|
|
2066 | text_t *dtp2; |
|
|
2067 | int len, wlen; |
2099 | int len, wlen; |
2068 | |
2100 | |
2069 | j = TermWin.nrow; |
2101 | j = TermWin.nrow; |
2070 | wlen = len = -1; |
2102 | wlen = len = -1; |
2071 | row = i > 0 ? 0 : j - 1; |
2103 | row = i > 0 ? 0 : j - 1; |
2072 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2104 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2073 | { |
2105 | { |
2074 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2106 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2075 | { |
2107 | { |
2076 | stp = screen.text[row + row_offset]; |
2108 | text_t *stp = screen.text[row + row_offset]; |
2077 | srp = screen.rend[row + row_offset]; |
2109 | rend_t *srp = screen.rend[row + row_offset]; |
2078 | dtp = drawn_text[row]; |
2110 | text_t *dtp = drawn_text[row]; |
2079 | dtp2 = drawn_text[row + i]; |
2111 | text_t *dtp2 = drawn_text[row + i]; |
2080 | drp = drawn_rend[row]; |
2112 | rend_t *drp = drawn_rend[row]; |
2081 | drp2 = drawn_rend[row + i]; |
2113 | rend_t *drp2 = drawn_rend[row + i]; |
2082 | |
2114 | |
2083 | for (nits = 0, col = TermWin.ncol; col--; ) |
2115 | for (nits = 0, col = TermWin.ncol; col--; ) |
2084 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2116 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2085 | nits--; |
2117 | nits--; |
2086 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2118 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
… | |
… | |
2106 | { |
2138 | { |
2107 | /* also comes here at end if needed because of >= above */ |
2139 | /* also comes here at end if needed because of >= above */ |
2108 | if (wlen < len) |
2140 | if (wlen < len) |
2109 | SWAP_IT (wlen, len, int); |
2141 | SWAP_IT (wlen, len, int); |
2110 | |
2142 | |
2111 | D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
|
|
2112 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2143 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2113 | TermWin.gc, 0, Row2Pixel (len + i), |
2144 | TermWin.gc, 0, Row2Pixel (len + i), |
2114 | (unsigned int)TermWin_TotalWidth (), |
2145 | (unsigned int)TermWin_TotalWidth (), |
2115 | (unsigned int)Height2Pixel (wlen - len + 1), |
2146 | (unsigned int)Height2Pixel (wlen - len + 1), |
2116 | 0, Row2Pixel (len)); |
2147 | 0, Row2Pixel (len)); |
… | |
… | |
2123 | /* |
2154 | /* |
2124 | * E: main pass across every character |
2155 | * E: main pass across every character |
2125 | */ |
2156 | */ |
2126 | for (row = 0; row < TermWin.nrow; row++) |
2157 | for (row = 0; row < TermWin.nrow; row++) |
2127 | { |
2158 | { |
2128 | stp = screen.text[row + row_offset]; |
2159 | text_t *stp = screen.text[row + row_offset]; |
2129 | srp = screen.rend[row + row_offset]; |
2160 | rend_t *srp = screen.rend[row + row_offset]; |
2130 | dtp = drawn_text[row]; |
2161 | text_t *dtp = drawn_text[row]; |
2131 | drp = drawn_rend[row]; |
2162 | rend_t *drp = drawn_rend[row]; |
2132 | |
2163 | |
2133 | /* |
2164 | /* |
2134 | * E2: OK, now the real pass |
2165 | * E2: OK, now the real pass |
2135 | */ |
2166 | */ |
2136 | int ypixel = (int)Row2Pixel (row); |
2167 | int ypixel = (int)Row2Pixel (row); |
… | |
… | |
2166 | if (stp[col] == NOCHAR) |
2197 | if (stp[col] == NOCHAR) |
2167 | { |
2198 | { |
2168 | dtp[col] = stp[col]; |
2199 | dtp[col] = stp[col]; |
2169 | drp[col] = rend; |
2200 | drp[col] = rend; |
2170 | count++; |
2201 | count++; |
2171 | |
|
|
2172 | if (i) // only possible skip if char unchanged |
|
|
2173 | i++; |
2202 | i++; |
2174 | |
2203 | |
2175 | continue; |
2204 | continue; |
2176 | } |
2205 | } |
2177 | |
2206 | |
2178 | if (rend != srp[col]) |
2207 | if (rend != srp[col]) |
… | |
… | |
2181 | count++; |
2210 | count++; |
2182 | |
2211 | |
2183 | if (stp[col] != dtp[col] |
2212 | if (stp[col] != dtp[col] |
2184 | || srp[col] != drp[col]) |
2213 | || srp[col] != drp[col]) |
2185 | { |
2214 | { |
2186 | if (must_clear && (i++ > (count / 2))) |
2215 | if (must_clear && (i++ > count / 2)) |
2187 | break; |
2216 | break; |
2188 | |
2217 | |
2189 | dtp[col] = stp[col]; |
2218 | dtp[col] = stp[col]; |
2190 | drp[col] = rend; |
2219 | drp[col] = rend; |
2191 | i = 0; |
2220 | i = 0; |
2192 | } |
2221 | } |
2193 | else if (must_clear || (stp[col] != ' ' && ++i >= 32)) |
2222 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2194 | break; |
2223 | break; |
2195 | } |
2224 | } |
2196 | |
2225 | |
2197 | col--; /* went one too far. move back */ |
2226 | col--; /* went one too far. move back */ |
2198 | count -= i; /* dump any matching trailing chars */ |
2227 | count -= i; /* dump any matching trailing chars */ |
|
|
2228 | |
|
|
2229 | // sometimes we optimize away the trailing NOCHAR's, add them back |
|
|
2230 | while (i && text[count] == NOCHAR) |
|
|
2231 | count++, i--; |
2199 | |
2232 | |
2200 | /* |
2233 | /* |
2201 | * Determine the attributes for the string |
2234 | * Determine the attributes for the string |
2202 | */ |
2235 | */ |
2203 | int fid = GET_FONT (rend); |
2236 | int fid = GET_FONT (rend); |
… | |
… | |
2207 | rend = GET_ATTR (rend); |
2240 | rend = GET_ATTR (rend); |
2208 | |
2241 | |
2209 | rvid = !!(rend & RS_RVid); |
2242 | rvid = !!(rend & RS_RVid); |
2210 | |
2243 | |
2211 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2244 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2212 | if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) |
2245 | if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold)) |
2213 | { |
2246 | { |
2214 | if (ISSET_PIXCOLOR (Color_BD)) |
2247 | if (ISSET_PIXCOLOR (Color_BD)) |
2215 | fore = Color_BD; |
2248 | fore = Color_BD; |
2216 | else |
2249 | else |
2217 | rvid = !rvid; |
2250 | rvid = !rvid; |
… | |
… | |
2235 | back = Color_RV; |
2268 | back = Color_RV; |
2236 | #endif |
2269 | #endif |
2237 | } |
2270 | } |
2238 | |
2271 | |
2239 | #ifdef TEXT_BLINK |
2272 | #ifdef TEXT_BLINK |
2240 | if (rend & RS_Blink && back == Color_bg) |
2273 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2241 | { |
2274 | { |
2242 | if (!text_blink_ev.active) |
2275 | if (!text_blink_ev.active) |
2243 | { |
2276 | { |
2244 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2277 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2245 | hidden_text = 0; |
2278 | hidden_text = 0; |
… | |
… | |
2275 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2308 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2276 | } |
2309 | } |
2277 | else |
2310 | else |
2278 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2311 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2279 | |
2312 | |
2280 | if ((rend & RS_Uline) && (font->descent > 1)) |
2313 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2281 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2314 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2282 | xpixel, ypixel + font->ascent + 1, |
2315 | xpixel, ypixel + font->ascent + 1, |
2283 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2316 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2284 | } /* for (col....) */ |
2317 | } /* for (col....) */ |
2285 | } /* for (row....) */ |
2318 | } /* for (row....) */ |
… | |
… | |
2289 | */ |
2322 | */ |
2290 | if (showcursor) |
2323 | if (showcursor) |
2291 | { |
2324 | { |
2292 | if (TermWin.focus) |
2325 | if (TermWin.focus) |
2293 | { |
2326 | { |
2294 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
|
|
2295 | [screen.cur.col]); |
|
|
2296 | *srp ^= RS_RVid; |
2327 | *crp ^= RS_RVid; |
2297 | #ifndef NO_CURSORCOLOR |
2328 | #ifndef NO_CURSORCOLOR |
2298 | *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2329 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2299 | #endif |
2330 | #endif |
2300 | } |
2331 | } |
2301 | else if (oldcursor.row >= 0) |
2332 | else if (oldcursor.row >= 0) |
2302 | { |
2333 | { |
2303 | #ifndef NO_CURSORCOLOR |
2334 | #ifndef NO_CURSORCOLOR |
2304 | if (ISSET_PIXCOLOR (Color_cursor)) |
2335 | if (ISSET_PIXCOLOR (Color_cursor)) |
2305 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2336 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2306 | #endif |
2337 | #endif |
2307 | int cursorwidth = 1; |
2338 | int cursorwidth = 1; |
2308 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2339 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2309 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2340 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2310 | cursorwidth++; |
2341 | cursorwidth++; |
… | |
… | |
2318 | } |
2349 | } |
2319 | |
2350 | |
2320 | /* |
2351 | /* |
2321 | * H: cleanup selection |
2352 | * H: cleanup selection |
2322 | */ |
2353 | */ |
|
|
2354 | #if ENABLE_OVERLAY |
|
|
2355 | scr_swap_overlay (); |
|
|
2356 | #endif |
2323 | scr_reverse_selection (); |
2357 | scr_reverse_selection (); |
2324 | |
2358 | |
2325 | /* |
|
|
2326 | * I: other general cleanup |
|
|
2327 | */ |
|
|
2328 | #if 0 |
|
|
2329 | if (clearfirst && TermWin.int_bwidth) |
|
|
2330 | /* |
|
|
2331 | * clear the whole screen height, note that width == 0 is treated |
|
|
2332 | * specially by XClearArea |
|
|
2333 | */ |
|
|
2334 | XClearArea (display->display, TermWin.vt, 0, 0, |
|
|
2335 | (unsigned int)TermWin.int_bwidth, |
|
|
2336 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2337 | |
|
|
2338 | if (clearlast && TermWin.int_bwidth) |
|
|
2339 | /* |
|
|
2340 | * clear the whole screen height, note that width == 0 is treated |
|
|
2341 | * specially by XClearArea |
|
|
2342 | */ |
|
|
2343 | XClearArea (display->display, TermWin.vt, |
|
|
2344 | TermWin.width + TermWin.int_bwidth, 0, |
|
|
2345 | (unsigned int)TermWin.int_bwidth, |
|
|
2346 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2347 | #endif |
|
|
2348 | |
|
|
2349 | if (refresh_type & SMOOTH_REFRESH) |
2359 | if (refresh_type & SMOOTH_REFRESH) |
2350 | XSync (display->display, False); |
2360 | XFlush (display->display); |
2351 | |
2361 | |
2352 | num_scr = 0; |
2362 | num_scr = 0; |
2353 | num_scr_allow = 1; |
2363 | num_scr_allow = 1; |
2354 | want_refresh = 0; /* screen is current */ |
2364 | want_refresh = 0; /* screen is current */ |
2355 | } |
2365 | } |
… | |
… | |
2386 | |
2396 | |
2387 | num_scr_allow = 0; |
2397 | num_scr_allow = 0; |
2388 | want_refresh = 1; |
2398 | want_refresh = 1; |
2389 | |
2399 | |
2390 | #ifdef TRANSPARENT |
2400 | #ifdef TRANSPARENT |
2391 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2401 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
2392 | { |
2402 | { |
2393 | int i; |
2403 | int i; |
2394 | |
2404 | |
2395 | if (! (Options & Opt_transparent_all)) |
2405 | if (! (options & Opt_transparent_all)) |
2396 | i = 0; |
2406 | i = 0; |
2397 | else |
2407 | else |
2398 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2408 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2399 | |
2409 | |
2400 | while (i--) |
2410 | while (i--) |
… | |
… | |
2477 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2487 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2478 | */ |
2488 | */ |
2479 | void |
2489 | void |
2480 | rxvt_term::selection_check (int check_more) |
2490 | rxvt_term::selection_check (int check_more) |
2481 | { |
2491 | { |
2482 | row_col_t pos; |
2492 | row_col_t pos; |
2483 | |
2493 | |
2484 | if (!selection.op) |
2494 | if (!selection.op) |
2485 | return; |
2495 | return; |
2486 | |
2496 | |
2487 | pos.row = pos.col = 0; |
2497 | pos.row = pos.col = 0; |
… | |
… | |
2514 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2524 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2515 | { |
2525 | { |
2516 | unsigned int i, j, n; |
2526 | unsigned int i, j, n; |
2517 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
2527 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
2518 | |
2528 | |
2519 | #if 0 |
|
|
2520 | /* a paste should act like the user is typing, so check scrollTtyKeypress */ |
|
|
2521 | ZERO_SCROLLBACK (r); |
|
|
2522 | #endif |
|
|
2523 | |
|
|
2524 | /* convert normal newline chars into common keyboard Return key sequence */ |
2529 | /* convert normal newline chars into common keyboard Return key sequence */ |
2525 | for (i = 0; i < len; i += PROP_SIZE) |
2530 | for (i = 0; i < len; i += PROP_SIZE) |
2526 | { |
2531 | { |
2527 | n = min (len - i, PROP_SIZE); |
2532 | n = min (len - i, PROP_SIZE); |
2528 | MEMCPY (ds, data + i, n); |
2533 | memcpy (ds, data + i, n); |
2529 | |
2534 | |
2530 | for (j = 0; j < n; j++) |
2535 | for (j = 0; j < n; j++) |
2531 | if (ds[j] == C0_LF) |
2536 | if (ds[j] == C0_LF) |
2532 | ds[j] = C0_CR; |
2537 | ds[j] = C0_CR; |
2533 | |
2538 | |
… | |
… | |
2546 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2551 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2547 | { |
2552 | { |
2548 | long nread = 0; |
2553 | long nread = 0; |
2549 | unsigned long bytes_after; |
2554 | unsigned long bytes_after; |
2550 | XTextProperty ct; |
2555 | XTextProperty ct; |
2551 | |
|
|
2552 | D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); |
|
|
2553 | |
2556 | |
2554 | if (prop == None) /* check for failed XConvertSelection */ |
2557 | if (prop == None) /* check for failed XConvertSelection */ |
2555 | { |
2558 | { |
2556 | if ((selection_type & Sel_CompoundText)) |
2559 | if ((selection_type & Sel_CompoundText)) |
2557 | { |
2560 | { |
… | |
… | |
2584 | &ct.nitems, &bytes_after, |
2587 | &ct.nitems, &bytes_after, |
2585 | &ct.value) != Success) |
2588 | &ct.value) != Success) |
2586 | break; |
2589 | break; |
2587 | |
2590 | |
2588 | if (ct.encoding == 0) |
2591 | if (ct.encoding == 0) |
|
|
2592 | break; |
|
|
2593 | |
|
|
2594 | if (ct.encoding == xa[XA_INCR]) |
2589 | { |
2595 | { |
2590 | D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); |
2596 | // INCR selection, start handshake |
|
|
2597 | XDeleteProperty (display->display, win, prop); |
|
|
2598 | selection_wait = Sel_incr; |
|
|
2599 | incr_ev.start (NOW + 10); |
2591 | break; |
2600 | break; |
2592 | } |
2601 | } |
2593 | |
2602 | |
2594 | if (ct.value == NULL) |
2603 | if (ct.value == NULL) |
2595 | { |
|
|
2596 | D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); |
|
|
2597 | continue; |
2604 | continue; |
2598 | } |
|
|
2599 | |
2605 | |
2600 | if (ct.nitems == 0) |
2606 | if (ct.nitems == 0) |
2601 | { |
2607 | { |
2602 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
|
|
2603 | |
|
|
2604 | if (selection_wait == Sel_normal && nread == 0 |
2608 | if (selection_wait == Sel_normal && nread == 0 |
2605 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2609 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2606 | { |
2610 | { |
2607 | /* |
2611 | /* |
2608 | * pass through again trying CUT_BUFFER0 if we've come from |
2612 | * pass through again trying CUT_BUFFER0 if we've come from |
2609 | * XConvertSelection () but nothing was presented |
2613 | * XConvertSelection () but nothing was presented |
2610 | */ |
2614 | */ |
2611 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2612 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2615 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2613 | } |
2616 | } |
2614 | |
2617 | |
2615 | nread = -1; /* discount any previous stuff */ |
2618 | nread = -1; /* discount any previous stuff */ |
2616 | break; |
2619 | break; |
… | |
… | |
2621 | char **cl; |
2624 | char **cl; |
2622 | int cr; |
2625 | int cr; |
2623 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2626 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2624 | { |
2627 | { |
2625 | for (int i = 0; i < cr; i++) |
2628 | for (int i = 0; i < cr; i++) |
2626 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2629 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2627 | |
2630 | |
2628 | XFreeStringList (cl); |
2631 | XFreeStringList (cl); |
2629 | } |
2632 | } |
2630 | else |
2633 | else |
2631 | paste (ct.value, ct.nitems); |
2634 | paste (ct.value, ct.nitems); |
… | |
… | |
2640 | XFree (ct.value); |
2643 | XFree (ct.value); |
2641 | |
2644 | |
2642 | if (selection_wait == Sel_normal) |
2645 | if (selection_wait == Sel_normal) |
2643 | selection_wait = Sel_none; |
2646 | selection_wait = Sel_none; |
2644 | |
2647 | |
2645 | D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
|
|
2646 | return (int)nread; |
2648 | return (int)nread; |
2647 | } |
2649 | } |
2648 | |
2650 | |
2649 | void |
2651 | void |
2650 | rxvt_term::incr_cb (time_watcher &w) |
2652 | rxvt_term::incr_cb (time_watcher &w) |
… | |
… | |
2658 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2660 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2659 | */ |
2661 | */ |
2660 | void |
2662 | void |
2661 | rxvt_term::selection_property (Window win, Atom prop) |
2663 | rxvt_term::selection_property (Window win, Atom prop) |
2662 | { |
2664 | { |
2663 | int reget_time = 0; |
2665 | if (prop == None || selection_wait != Sel_incr) |
2664 | |
|
|
2665 | if (prop == None) |
|
|
2666 | return; |
2666 | return; |
2667 | |
2667 | |
2668 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
|
|
2669 | if (selection_wait == Sel_normal) |
|
|
2670 | { |
|
|
2671 | int a, afmt; |
|
|
2672 | Atom atype; |
|
|
2673 | unsigned long bytes_after, nitems; |
|
|
2674 | unsigned char *s = NULL; |
|
|
2675 | |
|
|
2676 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
|
|
2677 | xa[XA_INCR], &atype, &afmt, &nitems, |
|
|
2678 | &bytes_after, &s); |
|
|
2679 | if (s) |
|
|
2680 | XFree (s); |
|
|
2681 | if (a != Success) |
|
|
2682 | return; |
|
|
2683 | |
|
|
2684 | #ifndef __CYGWIN32__ |
|
|
2685 | if (atype == xa[XA_INCR]) |
|
|
2686 | { /* start an INCR transfer */ |
|
|
2687 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
|
|
2688 | XDeleteProperty (display->display, win, prop); |
|
|
2689 | XFlush (display->display); |
|
|
2690 | reget_time = 1; |
|
|
2691 | selection_wait = Sel_incr; |
|
|
2692 | } |
|
|
2693 | #endif |
|
|
2694 | |
|
|
2695 | } |
|
|
2696 | else if (selection_wait == Sel_incr) |
|
|
2697 | { |
|
|
2698 | reget_time = 1; |
|
|
2699 | |
|
|
2700 | if (selection_paste (win, prop, True) == -1) |
2668 | if (selection_paste (win, prop, 1) > 0) |
2701 | { |
|
|
2702 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
|
|
2703 | selection_wait = Sel_none; |
|
|
2704 | incr_ev.stop (); |
|
|
2705 | } |
|
|
2706 | } |
|
|
2707 | if (reget_time) /* received more data so reget time */ |
|
|
2708 | incr_ev.start (NOW + 10); |
2669 | incr_ev.start (NOW + 10); |
|
|
2670 | else |
|
|
2671 | { |
|
|
2672 | selection_wait = Sel_none; |
|
|
2673 | incr_ev.stop (); |
|
|
2674 | } |
2709 | } |
2675 | } |
2710 | |
2676 | |
2711 | /* ------------------------------------------------------------------------- */ |
2677 | /* ------------------------------------------------------------------------- */ |
2712 | /* |
2678 | /* |
2713 | * Request the current selection: |
2679 | * Request the current selection: |
… | |
… | |
2719 | * EXT: button 2 release |
2685 | * EXT: button 2 release |
2720 | */ |
2686 | */ |
2721 | void |
2687 | void |
2722 | rxvt_term::selection_request (Time tm, int x, int y) |
2688 | rxvt_term::selection_request (Time tm, int x, int y) |
2723 | { |
2689 | { |
2724 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2725 | |
|
|
2726 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2690 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2727 | return; /* outside window */ |
2691 | return; /* outside window */ |
2728 | |
2692 | |
2729 | if (selection.text) |
2693 | if (selection.text) |
2730 | { /* internal selection */ |
2694 | { /* internal selection */ |
2731 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
|
|
2732 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2695 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2733 | paste ((unsigned char *)str, strlen (str)); |
2696 | paste ((unsigned char *)str, strlen (str)); |
2734 | free (str); |
2697 | free (str); |
2735 | return; |
2698 | return; |
2736 | } |
2699 | } |
… | |
… | |
2755 | |
2718 | |
2756 | } |
2719 | } |
2757 | } |
2720 | } |
2758 | |
2721 | |
2759 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2722 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2760 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2761 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2723 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2762 | } |
2724 | } |
2763 | |
2725 | |
2764 | int |
2726 | int |
2765 | rxvt_term::selection_request_other (Atom target, int selnum) |
2727 | rxvt_term::selection_request_other (Atom target, int selnum) |
… | |
… | |
2778 | else |
2740 | else |
2779 | sel = xa[XA_CLIPBOARD]; |
2741 | sel = xa[XA_CLIPBOARD]; |
2780 | |
2742 | |
2781 | if (XGetSelectionOwner (display->display, sel) != None) |
2743 | if (XGetSelectionOwner (display->display, sel) != None) |
2782 | { |
2744 | { |
2783 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
|
|
2784 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2745 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2785 | TermWin.vt, selection_request_time); |
2746 | TermWin.vt, selection_request_time); |
2786 | return 1; |
2747 | return 1; |
2787 | } |
2748 | } |
2788 | |
2749 | |
… | |
… | |
2795 | * EXT: SelectionClear |
2756 | * EXT: SelectionClear |
2796 | */ |
2757 | */ |
2797 | void |
2758 | void |
2798 | rxvt_term::selection_clear () |
2759 | rxvt_term::selection_clear () |
2799 | { |
2760 | { |
2800 | D_SELECT ((stderr, "rxvt_selection_clear ()")); |
|
|
2801 | |
|
|
2802 | want_refresh = 1; |
2761 | want_refresh = 1; |
2803 | free (selection.text); |
2762 | free (selection.text); |
2804 | selection.text = NULL; |
2763 | selection.text = NULL; |
2805 | selection.len = 0; |
2764 | selection.len = 0; |
2806 | CLEAR_SELECTION (); |
2765 | CLEAR_SELECTION (); |
… | |
… | |
2819 | { |
2778 | { |
2820 | int i, col, end_col, row, end_row; |
2779 | int i, col, end_col, row, end_row; |
2821 | wchar_t *new_selection_text; |
2780 | wchar_t *new_selection_text; |
2822 | text_t *t; |
2781 | text_t *t; |
2823 | |
2782 | |
2824 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
|
|
2825 | switch (selection.op) |
2783 | switch (selection.op) |
2826 | { |
2784 | { |
2827 | case SELECTION_CONT: |
2785 | case SELECTION_CONT: |
2828 | break; |
2786 | break; |
2829 | case SELECTION_INIT: |
2787 | case SELECTION_INIT: |
… | |
… | |
2851 | int ofs = 0; |
2809 | int ofs = 0; |
2852 | int extra = 0; |
2810 | int extra = 0; |
2853 | |
2811 | |
2854 | for (; row <= end_row; row++, col = 0) |
2812 | for (; row <= end_row; row++, col = 0) |
2855 | { |
2813 | { |
2856 | t = &(screen.text[row][col]); |
2814 | t = &screen.text[row][col]; |
2857 | |
2815 | |
2858 | end_col = screen.tlen[row]; |
2816 | end_col = screen.tlen[row]; |
2859 | |
2817 | |
2860 | if (end_col == -1) |
2818 | if (end_col == -1) |
2861 | end_col = TermWin.ncol; |
2819 | end_col = TermWin.ncol; |
… | |
… | |
2925 | XFree (ct.value); |
2883 | XFree (ct.value); |
2926 | } |
2884 | } |
2927 | #endif |
2885 | #endif |
2928 | |
2886 | |
2929 | selection_time = tm; |
2887 | selection_time = tm; |
2930 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
|
|
2931 | } |
2888 | } |
2932 | |
2889 | |
2933 | /* ------------------------------------------------------------------------- */ |
2890 | /* ------------------------------------------------------------------------- */ |
2934 | /* |
2891 | /* |
2935 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2892 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2936 | * EXT: button 1 press |
2893 | * EXT: button 1 press |
2937 | */ |
2894 | */ |
2938 | void |
2895 | void |
2939 | rxvt_term::selection_click (int clicks, int x, int y) |
2896 | rxvt_term::selection_click (int clicks, int x, int y) |
2940 | { |
2897 | { |
2941 | D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); |
|
|
2942 | |
|
|
2943 | clicks = ((clicks - 1) % 3) + 1; |
2898 | clicks = ((clicks - 1) % 3) + 1; |
2944 | selection.clicks = clicks; /* save clicks so extend will work */ |
2899 | selection.clicks = clicks; /* save clicks so extend will work */ |
2945 | |
2900 | |
2946 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2901 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2947 | |
2902 | |
… | |
… | |
2989 | * We now only find out the boundary in one direction |
2944 | * We now only find out the boundary in one direction |
2990 | */ |
2945 | */ |
2991 | |
2946 | |
2992 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2947 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2993 | #define DELIMIT_TEXT(x) \ |
2948 | #define DELIMIT_TEXT(x) \ |
2994 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
2949 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
2995 | #define DELIMIT_REND(x) 1 |
2950 | #define DELIMIT_REND(x) 1 |
2996 | |
2951 | |
2997 | void |
2952 | void |
2998 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2953 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2999 | { |
2954 | { |
… | |
… | |
3017 | |
2972 | |
3018 | row = mark->row + TermWin.saveLines; |
2973 | row = mark->row + TermWin.saveLines; |
3019 | col = mark->col; |
2974 | col = mark->col; |
3020 | MAX_IT (col, 0); |
2975 | MAX_IT (col, 0); |
3021 | /* find the edge of a word */ |
2976 | /* find the edge of a word */ |
3022 | stp = & (screen.text[row][col]); |
2977 | stp = &screen.text[row][col]; |
3023 | w1 = DELIMIT_TEXT (*stp); |
2978 | w1 = DELIMIT_TEXT (*stp); |
3024 | |
2979 | |
3025 | srp = (&screen.rend[row][col]); |
2980 | srp = &screen.rend[row][col]; |
3026 | w2 = DELIMIT_REND (*srp); |
2981 | w2 = DELIMIT_REND (*srp); |
3027 | |
2982 | |
3028 | for (;;) |
2983 | for (;;) |
3029 | { |
2984 | { |
3030 | for (; col != bound.col; col += dirnadd) |
2985 | for (; col != bound.col; col += dirnadd) |
… | |
… | |
3064 | } |
3019 | } |
3065 | break; |
3020 | break; |
3066 | } |
3021 | } |
3067 | |
3022 | |
3068 | Old_Word_Selection_You_Die: |
3023 | Old_Word_Selection_You_Die: |
3069 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
|
|
3070 | |
|
|
3071 | if (dirn == DN) |
3024 | if (dirn == DN) |
3072 | col++; /* put us on one past the end */ |
3025 | col++; /* put us on one past the end */ |
3073 | |
3026 | |
3074 | /* Poke the values back in */ |
3027 | /* Poke the values back in */ |
3075 | ret->row = row - TermWin.saveLines; |
3028 | ret->row = row - TermWin.saveLines; |
… | |
… | |
3109 | /* select nothing */ |
3062 | /* select nothing */ |
3110 | selection.beg.row = selection.end.row = 0; |
3063 | selection.beg.row = selection.end.row = 0; |
3111 | selection.beg.col = selection.end.col = 0; |
3064 | selection.beg.col = selection.end.col = 0; |
3112 | selection.clicks = 4; |
3065 | selection.clicks = 4; |
3113 | want_refresh = 1; |
3066 | want_refresh = 1; |
3114 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
|
|
3115 | return; |
3067 | return; |
3116 | } |
3068 | } |
3117 | |
3069 | |
3118 | if (selection.clicks == 4) |
3070 | if (selection.clicks == 4) |
3119 | selection.clicks = 1; |
3071 | selection.clicks = 1; |
… | |
… | |
3134 | int end_col; |
3086 | int end_col; |
3135 | row_col_t pos; |
3087 | row_col_t pos; |
3136 | enum { |
3088 | enum { |
3137 | LEFT, RIGHT |
3089 | LEFT, RIGHT |
3138 | } closeto = RIGHT; |
3090 | } closeto = RIGHT; |
3139 | |
|
|
3140 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
|
|
3141 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3142 | |
3091 | |
3143 | want_refresh = 1; |
3092 | want_refresh = 1; |
3144 | switch (selection.op) |
3093 | switch (selection.op) |
3145 | { |
3094 | { |
3146 | case SELECTION_INIT: |
3095 | case SELECTION_INIT: |
… | |
… | |
3168 | && selection.beg.row == selection.end.row |
3117 | && selection.beg.row == selection.end.row |
3169 | && selection.beg.row != selection.mark.row) |
3118 | && selection.beg.row != selection.mark.row) |
3170 | { |
3119 | { |
3171 | selection.beg.col = selection.end.col = selection.mark.col; |
3120 | selection.beg.col = selection.end.col = selection.mark.col; |
3172 | selection.beg.row = selection.end.row = selection.mark.row; |
3121 | selection.beg.row = selection.end.row = selection.mark.row; |
3173 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3174 | } |
3122 | } |
3175 | |
3123 | |
3176 | pos.col = col; |
3124 | pos.col = col; |
3177 | pos.row = row; |
3125 | pos.row = row; |
3178 | |
3126 | |
… | |
… | |
3271 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3219 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3272 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3220 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3273 | } |
3221 | } |
3274 | else if (selection.clicks == 3) |
3222 | else if (selection.clicks == 3) |
3275 | { |
3223 | { |
3276 | #ifndef NO_FRILLS |
3224 | #if ENABLE_FRILLS |
3277 | if ((Options & Opt_tripleclickwords)) |
3225 | if ((options & Opt_tripleclickwords)) |
3278 | { |
3226 | { |
3279 | int end_row; |
3227 | int end_row; |
3280 | |
3228 | |
3281 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3229 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3282 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3230 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
… | |
… | |
3307 | if (button3 && buttonpress) |
3255 | if (button3 && buttonpress) |
3308 | { /* mark may need to be changed */ |
3256 | { /* mark may need to be changed */ |
3309 | if (closeto == LEFT) |
3257 | if (closeto == LEFT) |
3310 | { |
3258 | { |
3311 | selection.mark.row = selection.end.row; |
3259 | selection.mark.row = selection.end.row; |
3312 | selection.mark.col = selection.end.col |
3260 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3313 | - (selection.clicks == 2); |
|
|
3314 | } |
3261 | } |
3315 | else |
3262 | else |
3316 | { |
3263 | { |
3317 | selection.mark.row = selection.beg.row; |
3264 | selection.mark.row = selection.beg.row; |
3318 | selection.mark.col = selection.beg.col; |
3265 | selection.mark.col = selection.beg.col; |
3319 | } |
3266 | } |
3320 | } |
3267 | } |
3321 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3322 | } |
3268 | } |
3323 | |
3269 | |
3324 | #ifndef NO_FRILLS |
3270 | #if ENABLE_FRILLS |
3325 | void |
3271 | void |
3326 | rxvt_term::selection_remove_trailing_spaces () |
3272 | rxvt_term::selection_remove_trailing_spaces () |
3327 | { |
3273 | { |
3328 | int32_t end_col, end_row; |
3274 | int32_t end_col, end_row; |
3329 | text_t *stp; |
3275 | text_t *stp; |
… | |
… | |
3418 | (8 * sizeof (target_list[0])), PropModeReplace, |
3364 | (8 * sizeof (target_list[0])), PropModeReplace, |
3419 | (unsigned char *)target_list, |
3365 | (unsigned char *)target_list, |
3420 | target - target_list); |
3366 | target - target_list); |
3421 | ev.property = rq.property; |
3367 | ev.property = rq.property; |
3422 | } |
3368 | } |
|
|
3369 | #if TODO // TODO |
3423 | else if (rq.target == xa[XA_MULTIPLE]) |
3370 | else if (rq.target == xa[XA_MULTIPLE]) |
3424 | { |
3371 | { |
3425 | /* TODO: Handle MULTIPLE */ |
3372 | /* TODO: Handle MULTIPLE */ |
3426 | } |
3373 | } |
|
|
3374 | #endif |
3427 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3375 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3428 | { |
3376 | { |
3429 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3377 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3430 | (8 * sizeof (Time)), PropModeReplace, |
3378 | (8 * sizeof (Time)), PropModeReplace, |
3431 | (unsigned char *)&selection_time, 1); |
3379 | (unsigned char *)&selection_time, 1); |
… | |
… | |
3512 | } |
3460 | } |
3513 | |
3461 | |
3514 | /* ------------------------------------------------------------------------- */ |
3462 | /* ------------------------------------------------------------------------- */ |
3515 | #ifdef USE_XIM |
3463 | #ifdef USE_XIM |
3516 | void |
3464 | void |
3517 | rxvt_term::im_set_position (XPoint *pos) |
3465 | rxvt_term::im_set_position (XPoint &pos) |
3518 | { |
3466 | { |
3519 | XWindowAttributes xwa; |
3467 | XWindowAttributes xwa; |
3520 | |
3468 | |
3521 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3469 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
|
|
3470 | |
3522 | pos->x = Col2Pixel (screen.cur.col) + xwa.x; |
3471 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3523 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3472 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3524 | } |
3473 | } |
3525 | |
|
|
3526 | #endif |
3474 | #endif |
|
|
3475 | |
|
|
3476 | #if ENABLE_OVERLAY |
|
|
3477 | void |
|
|
3478 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
|
|
3479 | { |
|
|
3480 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
|
|
3481 | return; |
|
|
3482 | |
|
|
3483 | want_refresh = 1; |
|
|
3484 | |
|
|
3485 | scr_overlay_off (); |
|
|
3486 | |
|
|
3487 | if (x < 0) x = TermWin.ncol - w; |
|
|
3488 | if (y < 0) y = TermWin.nrow - h; |
|
|
3489 | |
|
|
3490 | // make space for border |
|
|
3491 | w += 2; MIN_IT (w, TermWin.ncol); |
|
|
3492 | h += 2; MIN_IT (h, TermWin.nrow); |
|
|
3493 | |
|
|
3494 | x -= 1; MAX_IT (x, 0); |
|
|
3495 | y -= 1; MAX_IT (y, 0); |
|
|
3496 | |
|
|
3497 | MIN_IT (x, TermWin.ncol - w); |
|
|
3498 | MIN_IT (y, TermWin.nrow - h); |
|
|
3499 | |
|
|
3500 | ov_x = x; ov_y = y; |
|
|
3501 | ov_w = w; ov_h = h; |
|
|
3502 | |
|
|
3503 | ov_text = new text_t *[h]; |
|
|
3504 | ov_rend = new rend_t *[h]; |
|
|
3505 | |
|
|
3506 | for (y = 0; y < h; y++) |
|
|
3507 | { |
|
|
3508 | text_t *tp = ov_text[y] = new text_t[w]; |
|
|
3509 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
|
|
3510 | |
|
|
3511 | text_t t0, t1, t2; |
|
|
3512 | rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg); |
|
|
3513 | |
|
|
3514 | if (y == 0) |
|
|
3515 | t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; |
|
|
3516 | else if (y < h - 1) |
|
|
3517 | t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; |
|
|
3518 | else |
|
|
3519 | t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; |
|
|
3520 | |
|
|
3521 | *tp++ = t0; |
|
|
3522 | *rp++ = r; |
|
|
3523 | |
|
|
3524 | for (x = w - 2; x > 0; --x) |
|
|
3525 | { |
|
|
3526 | *tp++ = t1; |
|
|
3527 | *rp++ = r; |
|
|
3528 | } |
|
|
3529 | |
|
|
3530 | *tp = t2; |
|
|
3531 | *rp = r; |
|
|
3532 | } |
|
|
3533 | } |
|
|
3534 | |
|
|
3535 | void |
|
|
3536 | rxvt_term::scr_overlay_off () |
|
|
3537 | { |
|
|
3538 | if (!ov_text) |
|
|
3539 | return; |
|
|
3540 | |
|
|
3541 | want_refresh = 1; |
|
|
3542 | |
|
|
3543 | for (int y = 0; y < ov_h; y++) |
|
|
3544 | { |
|
|
3545 | delete [] ov_text[y]; |
|
|
3546 | delete [] ov_rend[y]; |
|
|
3547 | } |
|
|
3548 | |
|
|
3549 | delete [] ov_text; ov_text = 0; |
|
|
3550 | delete [] ov_rend; ov_rend = 0; |
|
|
3551 | } |
|
|
3552 | |
|
|
3553 | void |
|
|
3554 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
|
|
3555 | { |
|
|
3556 | if (!ov_text || x >= ov_w - 2 || y >= ov_h) |
|
|
3557 | return; |
|
|
3558 | |
|
|
3559 | x++, y++; |
|
|
3560 | |
|
|
3561 | ov_text[y][x] = text; |
|
|
3562 | ov_rend[y][x] = rend; |
|
|
3563 | } |
|
|
3564 | |
|
|
3565 | void |
|
|
3566 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
|
|
3567 | { |
|
|
3568 | while (*s) |
|
|
3569 | scr_overlay_set (x++, y, *s++); |
|
|
3570 | } |
|
|
3571 | |
|
|
3572 | void |
|
|
3573 | rxvt_term::scr_swap_overlay () |
|
|
3574 | { |
|
|
3575 | if (!ov_text) |
|
|
3576 | return; |
|
|
3577 | |
|
|
3578 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3579 | |
|
|
3580 | // swap screen mem with overlay |
|
|
3581 | for (int y = ov_h; y--; ) |
|
|
3582 | { |
|
|
3583 | text_t *t1 = ov_text[y]; |
|
|
3584 | rend_t *r1 = ov_rend[y]; |
|
|
3585 | |
|
|
3586 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
|
|
3587 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
|
|
3588 | |
|
|
3589 | for (int x = ov_w; x--; ) |
|
|
3590 | { |
|
|
3591 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
|
|
3592 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false)); |
|
|
3593 | } |
|
|
3594 | } |
|
|
3595 | } |
|
|
3596 | |
|
|
3597 | #endif |
3527 | /* ------------------------------------------------------------------------- */ |
3598 | /* ------------------------------------------------------------------------- */ |