ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC

… …
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() \
… …
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 */
473void 482void
474rxvt_term::scr_poweron () 483rxvt_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 */
494void 501void
495rxvt_term::scr_cursor (int mode) 502rxvt_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
607void
608rxvt_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 */
767void 778void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 779rxvt_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 */
… …
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, 918 rend_t rend = SET_FONT (rstyle,
904 c > 0x7f || bold || c < 0x20 919 c > 0x7f || bold || c < 0x20
905 ? TermWin.fontset->find_font (c, bold) 920 ? TermWin.fontset->find_font (c, bold)
906 : TermWin.ascii_map [c - 0x20]); 921 : TermWin.ascii_map [c - 0x20]);
907 922
… …
972 } 987 }
973 988
974 if (screen.tlen[row] != -1) /* XXX: think about this */ 989 if (screen.tlen[row] != -1) /* XXX: think about this */
975 MAX_IT (screen.tlen[row], screen.cur.col); 990 MAX_IT (screen.tlen[row], screen.cur.col);
976 991
977 /*
978 * If we wrote anywhere in the selected area, kill the selection
979 * XXX: should we kill the mark too? Possibly, but maybe that
980 * should be a similar check.
981 */
982 if (clearsel)
983 CLEAR_SELECTION ();
984
985#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
986 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
987#else /* drive with your eyes closed */ 994#else /* drive with your eyes closed */
988 MAX_IT (screen.cur.row, 0); 995 MAX_IT (screen.cur.row, 0);
989#endif 996#endif
… …
1006#ifdef TERMCAP_HAS_BW 1013#ifdef TERMCAP_HAS_BW
1007 screen.cur.col = TermWin.ncol - 1; 1014 screen.cur.col = TermWin.ncol - 1;
1008 screen.cur.row--; 1015 screen.cur.row--;
1009 return; 1016 return;
1010#endif 1017#endif
1011
1012 } 1018 }
1013 } 1019 }
1014 else if ((screen.flags & Screen_WrapNext) == 0) 1020 else if (!(screen.flags & Screen_WrapNext))
1015 scr_gotorc (0, -1, RELATIVE); 1021 scr_gotorc (0, -1, RELATIVE);
1016 1022
1017 screen.flags &= ~Screen_WrapNext; 1023 screen.flags &= ~Screen_WrapNext;
1018} 1024}
1019 1025
… …
1026void 1032void
1027rxvt_term::scr_tab (int count) 1033rxvt_term::scr_tab (int count)
1028{ 1034{
1029 int i, x; 1035 int i, x;
1030 1036
1031 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1032 want_refresh = 1; 1037 want_refresh = 1;
1033 i = x = screen.cur.col; 1038 i = x = screen.cur.col;
1034 1039
1035 if (count == 0) 1040 if (count == 0)
1036 return; 1041 return;
… …
1070 * Process DEC Back Index 1075 * Process DEC Back Index
1071 * XTERM_SEQ: ESC 6 1076 * XTERM_SEQ: ESC 6
1072 * 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
1073 * in that row right. Clear left column. 1078 * in that row right. Clear left column.
1074 */ 1079 */
1075#ifndef NO_FRILLS 1080#if ENABLE_FRILLS
1076void 1081void
1077rxvt_term::scr_backindex () 1082rxvt_term::scr_backindex ()
1078{ 1083{
1079 if (screen.cur.col > 0) 1084 if (screen.cur.col > 0)
1080 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1081 else 1086 else
1082 { 1087 {
1083 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1088 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1084 return; /* um, yeah? */ 1089 return; /* um, yeah? */
1090
1085 scr_insdel_chars (1, INSERT); 1091 scr_insdel_chars (1, INSERT);
1086 } 1092 }
1087} 1093}
1088#endif 1094#endif
1089/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
… …
1091 * Process DEC Forward Index 1097 * Process DEC Forward Index
1092 * XTERM_SEQ: ESC 9 1098 * XTERM_SEQ: ESC 9
1093 * 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
1094 * in that row left. Clear right column. 1100 * in that row left. Clear right column.
1095 */ 1101 */
1096#ifndef NO_FRILLS 1102#if ENABLE_FRILLS
1097void 1103void
1098rxvt_term::scr_forwardindex () 1104rxvt_term::scr_forwardindex ()
1099{ 1105{
1100 int row; 1106 int row;
1101 1107
1102 if (screen.cur.col < TermWin.ncol - 1) 1108 if (screen.cur.col < TermWin.ncol - 1)
1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1109 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1104 else 1110 else
1105 { 1111 {
1106 row = screen.cur.row + TermWin.saveLines; 1112 row = screen.cur.row + TermWin.saveLines;
1113
1107 if (screen.tlen[row] == 0) 1114 if (screen.tlen[row] == 0)
1108 return; /* um, yeah? */ 1115 return; /* um, yeah? */
1109 else if (screen.tlen[row] == -1) 1116 else if (screen.tlen[row] == -1)
1110 screen.tlen[row] = TermWin.ncol; 1117 screen.tlen[row] = TermWin.ncol;
1118
1111 scr_gotorc (0, 0, R_RELATIVE); 1119 scr_gotorc (0, 0, R_RELATIVE);
1112 scr_insdel_chars (1, DELETE); 1120 scr_insdel_chars (1, DELETE);
1113 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1121 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1114 } 1122 }
1115} 1123}
… …
1123rxvt_term::scr_gotorc (int row, int col, int relative) 1131rxvt_term::scr_gotorc (int row, int col, int relative)
1124{ 1132{
1125 want_refresh = 1; 1133 want_refresh = 1;
1126 ZERO_SCROLLBACK (); 1134 ZERO_SCROLLBACK ();
1127 1135
1128 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));
1129
1130 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1136 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1131 MAX_IT (screen.cur.col, 0); 1137 MAX_IT (screen.cur.col, 0);
1132 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1138 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1133 1139
1134 screen.flags &= ~Screen_WrapNext; 1140 screen.flags &= ~Screen_WrapNext;
1141
1135 if (relative & R_RELATIVE) 1142 if (relative & R_RELATIVE)
1136 { 1143 {
1137 if (row > 0) 1144 if (row > 0)
1138 { 1145 {
1139 if (screen.cur.row <= screen.bscroll 1146 if (screen.cur.row <= screen.bscroll
… …
1159 MIN_IT (screen.cur.row, screen.bscroll); 1166 MIN_IT (screen.cur.row, screen.bscroll);
1160 } 1167 }
1161 else 1168 else
1162 screen.cur.row = row; 1169 screen.cur.row = row;
1163 } 1170 }
1171
1164 MAX_IT (screen.cur.row, 0); 1172 MAX_IT (screen.cur.row, 0);
1165 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1173 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1166
1167 while (screen.cur.col > 0
1168 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1169 screen.cur.col--;
1170} 1174}
1171 1175
1172/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1173/* 1177/*
1174 * direction should be UP or DN 1178 * direction should be UP or DN
1175 */ 1179 */
1176void 1180void
1177rxvt_term::scr_index (enum page_dirn direction) 1181rxvt_term::scr_index (enum page_dirn direction)
1178{ 1182{
1179 int dirn; 1183 int dirn;
1180 1184
1181 want_refresh = 1; 1185 want_refresh = 1;
1186 ZERO_SCROLLBACK ();
1187
1182 dirn = ((direction == UP) ? 1 : -1); 1188 dirn = ((direction == UP) ? 1 : -1);
1183 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1184
1185 ZERO_SCROLLBACK ();
1186 1189
1187 screen.flags &= ~Screen_WrapNext; 1190 screen.flags &= ~Screen_WrapNext;
1191
1188 if ((screen.cur.row == screen.bscroll && direction == UP) 1192 if ((screen.cur.row == screen.bscroll && direction == UP)
1189 || (screen.cur.row == screen.tscroll && direction == DN)) 1193 || (screen.cur.row == screen.tscroll && direction == DN))
1190 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1194 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1191 else 1195 else
1192 screen.cur.row += dirn; 1196 screen.cur.row += dirn;
1197
1193 MAX_IT (screen.cur.row, 0); 1198 MAX_IT (screen.cur.row, 0);
1194 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1199 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1195 selection_check (0); 1200 selection_check (0);
1196} 1201}
1197 1202
… …
1206rxvt_term::scr_erase_line (int mode) 1211rxvt_term::scr_erase_line (int mode)
1207{ 1212{
1208 unsigned int row, col, num; 1213 unsigned int row, col, num;
1209 1214
1210 want_refresh = 1; 1215 want_refresh = 1;
1211 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1212 ZERO_SCROLLBACK (); 1216 ZERO_SCROLLBACK ();
1213 1217
1214 selection_check (1); 1218 selection_check (1);
1215
1216 screen.flags &= ~Screen_WrapNext;
1217 1219
1218 row = TermWin.saveLines + screen.cur.row; 1220 row = TermWin.saveLines + screen.cur.row;
1219 switch (mode) 1221 switch (mode)
1220 { 1222 {
1221 case 0: /* erase to end of line */ 1223 case 0: /* erase to end of line */
… …
1265 int32_t row, row_offset; 1267 int32_t row, row_offset;
1266 rend_t ren; 1268 rend_t ren;
1267 XGCValues gcvalue; 1269 XGCValues gcvalue;
1268 1270
1269 want_refresh = 1; 1271 want_refresh = 1;
1270 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1271 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1273
1272 row_offset = (int32_t)TermWin.saveLines; 1274 row_offset = (int32_t)TermWin.saveLines;
1273 1275
1274 switch (mode) 1276 switch (mode)
1275 { 1277 {
1276 case 0: /* erase to end of screen */ 1278 case 0: /* erase to end of screen */
… …
1292 break; 1294 break;
1293 default: 1295 default:
1294 return; 1296 return;
1295 } 1297 }
1296 1298
1297 refresh_type |= REFRESH_BOUNDS;
1298
1299 if (selection.op && current_screen == selection.screen 1299 if (selection.op && current_screen == selection.screen
1300 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1300 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1301 || (selection.end.row >= row 1301 || (selection.end.row >= row
1302 && selection.end.row <= row + num))) 1302 && selection.end.row <= row + num)))
1303 CLEAR_SELECTION (); 1303 CLEAR_SELECTION ();
… …
1315 CLEAR_ROWS (row, num); 1315 CLEAR_ROWS (row, num);
1316 } 1316 }
1317 else 1317 else
1318 { 1318 {
1319 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1319 ren = (rstyle & (RS_fgMask | RS_bgMask));
1320 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1322 ERASE_ROWS (row, num); 1322 ERASE_ROWS (row, num);
1323 gcvalue.foreground = PixColors[Color_fg]; 1323 gcvalue.foreground = pix_colors[Color_fg];
1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1325 } 1325 }
1326 1326
1327 for (; num--; row++) 1327 for (; num--; row++)
1328 { 1328 {
… …
1344{ 1344{
1345 int i, j, k; 1345 int i, j, k;
1346 rend_t *r1, fs; 1346 rend_t *r1, fs;
1347 1347
1348 want_refresh = 1; 1348 want_refresh = 1;
1349 ZERO_SCROLLBACK ();
1350
1349 num_scr_allow = 0; 1351 num_scr_allow = 0;
1350 ZERO_SCROLLBACK ();
1351 selection_check (3); 1352 selection_check (3);
1352 1353
1353 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1354 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1354 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1355 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1355 { 1356 {
… …
1382 if (insdel == DELETE) 1383 if (insdel == DELETE)
1383 return; 1384 return;
1384 else if (insdel == INSERT) 1385 else if (insdel == INSERT)
1385 count = end; 1386 count = end;
1386 } 1387 }
1387 screen.flags &= ~Screen_WrapNext; 1388
1389 scr_do_wrap ();
1388 1390
1389 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1390} 1392}
1391 1393
1392/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
… …
1406 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1407 1409
1408 if (count <= 0) 1410 if (count <= 0)
1409 return; 1411 return;
1410 1412
1413 scr_do_wrap ();
1414
1411 selection_check (1); 1415 selection_check (1);
1412 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1416 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1413 1417
1414 row = screen.cur.row + TermWin.saveLines; 1418 row = screen.cur.row + TermWin.saveLines;
1415 screen.flags &= ~Screen_WrapNext;
1416 1419
1417 stp = screen.text[row]; 1420 stp = screen.text[row];
1418 srp = screen.rend[row]; 1421 srp = screen.rend[row];
1419 slp = & (screen.tlen[row]); 1422 slp = &screen.tlen[row];
1420 1423
1421 switch (insdel) 1424 switch (insdel)
1422 { 1425 {
1423 case INSERT: 1426 case INSERT:
1424 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1427 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
… …
1545rxvt_term::scr_autowrap (int mode) 1548rxvt_term::scr_autowrap (int mode)
1546{ 1549{
1547 if (mode) 1550 if (mode)
1548 screen.flags |= Screen_Autowrap; 1551 screen.flags |= Screen_Autowrap;
1549 else 1552 else
1550 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1553 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1551} 1554}
1552 1555
1553/* ------------------------------------------------------------------------- */ 1556/* ------------------------------------------------------------------------- */
1554/* 1557/*
1555 * Set/unset margin origin mode 1558 * Set/unset margin origin mode
… …
1594 */ 1597 */
1595void 1598void
1596rxvt_term::scr_set_tab (int mode) 1599rxvt_term::scr_set_tab (int mode)
1597{ 1600{
1598 if (mode < 0) 1601 if (mode < 0)
1599 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1602 memset (tabs, 0, TermWin.ncol * sizeof (char));
1600 else if (screen.cur.col < TermWin.ncol) 1603 else if (screen.cur.col < TermWin.ncol)
1601 tabs[screen.cur.col] = (mode ? 1 : 0); 1604 tabs[screen.cur.col] = (mode ? 1 : 0);
1602} 1605}
1603 1606
1604/* ------------------------------------------------------------------------- */ 1607/* ------------------------------------------------------------------------- */
… …
1608 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1611 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1609 */ 1612 */
1610void 1613void
1611rxvt_term::scr_rvideo_mode (int mode) 1614rxvt_term::scr_rvideo_mode (int mode)
1612{ 1615{
1613 XGCValues gcvalue; 1616 XGCValues gcvalue;
1614 1617
1615 if (rvideo != mode) 1618 if (rvideo != mode)
1616 { 1619 {
1617 rvideo = mode; 1620 rvideo = mode;
1618 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1621 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1619#if defined(XPM_BACKGROUND) 1622#if defined(XPM_BACKGROUND)
1620 if (bgPixmap.pixmap == None) 1623 if (bgPixmap.pixmap == None)
1621#endif 1624#endif
1622#if defined(TRANSPARENT) 1625#if defined(TRANSPARENT)
1623 if (! (Options & Opt_transparent) || am_transparent == 0) 1626 if (! (options & Opt_transparent) || am_transparent == 0)
1624#endif 1627#endif
1625 XSetWindowBackground (display->display, TermWin.vt, 1628 XSetWindowBackground (display->display, TermWin.vt,
1626 PixColors[Color_bg]); 1629 pix_colors[Color_bg]);
1627 1630
1628 gcvalue.foreground = PixColors[Color_fg]; 1631 gcvalue.foreground = pix_colors[Color_fg];
1629 gcvalue.background = PixColors[Color_bg]; 1632 gcvalue.background = pix_colors[Color_bg];
1630 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1633 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1631 &gcvalue); 1634 &gcvalue);
1632 scr_clear (); 1635 scr_clear ();
1633 scr_touch (true); 1636 scr_touch (true);
1634 } 1637 }
… …
1779 { 1782 {
1780 MIN_IT (rc[i].col, TermWin.ncol - 1); 1783 MIN_IT (rc[i].col, TermWin.ncol - 1);
1781 MIN_IT (rc[i].row, TermWin.nrow - 1); 1784 MIN_IT (rc[i].row, TermWin.nrow - 1);
1782 } 1785 }
1783 1786
1784 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));
1785
1786 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++)
1787 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);
1788 1789
1789 if (refresh) 1790 if (refresh)
1790 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1791 scr_refresh (SLOW_REFRESH);
1791} 1792}
1792 1793
1793/* ------------------------------------------------------------------------- */ 1794/* ------------------------------------------------------------------------- */
1794/* 1795/*
1795 * Refresh the entire screen 1796 * Refresh the entire screen
… …
1810{ 1811{
1811 long p = 0; 1812 long p = 0;
1812 uint16_t oldviewstart; 1813 uint16_t oldviewstart;
1813 1814
1814 oldviewstart = TermWin.view_start; 1815 oldviewstart = TermWin.view_start;
1816
1815 if (y < len) 1817 if (y < len)
1816 { 1818 {
1817 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1819 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1818 p -= (long) (TermWin.nrow - 1); 1820 p -= (long) (TermWin.nrow - 1);
1819 p = max (p, 0); 1821 p = max (p, 0);
1820 } 1822 }
1823
1821 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1824 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1822 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1823 1825
1824 return scr_changeview (oldviewstart); 1826 return scr_changeview (oldviewstart);
1825} 1827}
1826 1828
1827/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
… …
1830 * direction should be UP or DN 1832 * direction should be UP or DN
1831 */ 1833 */
1832int 1834int
1833rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines)
1834{ 1836{
1835 int n; 1837 int n;
1836 uint16_t oldviewstart; 1838 uint16_t oldviewstart;
1837 1839
1838 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1839#ifdef DEBUG_STRICT 1840#ifdef DEBUG_STRICT
1840 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1841 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1841#endif 1842#endif
1842 oldviewstart = TermWin.view_start; 1843 oldviewstart = TermWin.view_start;
1843 if (direction == UP) 1844 if (direction == UP)
… …
1870rxvt_term::scr_bell () 1871rxvt_term::scr_bell ()
1871{ 1872{
1872#ifndef NO_BELL 1873#ifndef NO_BELL
1873# ifndef NO_MAPALERT 1874# ifndef NO_MAPALERT
1874# ifdef MAPALERT_OPTION 1875# ifdef MAPALERT_OPTION
1875 if (Options & Opt_mapAlert) 1876 if (options & Opt_mapAlert)
1876# endif 1877# endif
1877 XMapWindow (display->display, TermWin.parent[0]); 1878 XMapWindow (display->display, TermWin.parent[0]);
1878# endif 1879# endif
1879 if (Options & Opt_visualBell) 1880 if (options & Opt_visualBell)
1880 { 1881 {
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1882 scr_rvideo_mode (!rvideo); /* refresh also done */
1882 scr_rvideo_mode (!rvideo); /* refresh also done */ 1883 scr_rvideo_mode (!rvideo); /* refresh also done */
1883 } 1884 }
1884 else 1885 else
… …
1890/* ARGSUSED */ 1891/* ARGSUSED */
1891void 1892void
1892rxvt_term::scr_printscreen (int fullhist) 1893rxvt_term::scr_printscreen (int fullhist)
1893{ 1894{
1894#ifdef PRINTPIPE 1895#ifdef PRINTPIPE
1895 int i, r1, nrows, row_offset; 1896 int i, r1, nrows, row_offset;
1896 text_t *t; 1897 FILE *fd;
1897 FILE *fd;
1898 1898
1899 if ((fd = popen_printer ()) == NULL) 1899 if ((fd = popen_printer ()) == NULL)
1900 return; 1900 return;
1901
1901 nrows = TermWin.nrow; 1902 nrows = TermWin.nrow;
1902 row_offset = TermWin.saveLines; 1903 row_offset = TermWin.saveLines;
1904
1903 if (!fullhist) 1905 if (!fullhist)
1904 row_offset -= TermWin.view_start; 1906 row_offset -= TermWin.view_start;
1905 else 1907 else
1906 { 1908 {
1907 nrows += TermWin.nscrolled; 1909 nrows += TermWin.nscrolled;
1908 row_offset -= TermWin.nscrolled; 1910 row_offset -= TermWin.nscrolled;
1909 } 1911 }
1910 1912
1913 wctomb (0, 0);
1914
1911 for (r1 = 0; r1 < nrows; r1++) 1915 for (r1 = 0; r1 < nrows; r1++)
1912 { 1916 {
1913 t = screen.text[r1 + row_offset]; 1917 text_t *tp = screen.text[r1 + row_offset];
1914 for (i = TermWin.ncol - 1; i >= 0; i--) 1918 int len = screen.tlen[r1 + row_offset];
1915 if (!isspace (t[i])) 1919
1916 break; 1920 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1917 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);
1918 } 1939 }
1940
1919 pclose_printer (fd); 1941 pclose_printer (fd);
1920#endif 1942#endif
1921} 1943}
1922 1944
1923/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
… …
1937 ((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)
1938 1960
1939void 1961void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1962rxvt_term::scr_refresh (unsigned char refresh_type)
1941{ 1963{
1942 unsigned char clearfirst, /* first character writes before cell */
1943 clearlast, /* last character writes beyond cell */
1944 must_clear, /* use draw_string not draw_image_string */ 1964 unsigned char must_clear, /* use draw_string not draw_image_string */
1945 rvid, /* reverse video this position */ 1965 rvid, /* reverse video this position */
1946 showcursor; /* show the cursor */ 1966 showcursor; /* show the cursor */
1947 int16_t col, row, /* column/row we're processing */ 1967 int16_t col, row, /* column/row we're processing */
1948 ocrow; /* old cursor row */ 1968 ocrow; /* old cursor row */
1949 int i, /* tmp */ 1969 int i, /* tmp */
1950 row_offset; /* basic offset in screen structure */ 1970 row_offset; /* basic offset in screen structure */
1951#ifndef NO_CURSORCOLOR 1971#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1972 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1973#endif
1954 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1974 rend_t *crp; // cursor rendition pointer
1955 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1956 1975
1957 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1976 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1958 return; 1977 return;
1959 1978
1960 /* 1979 /*
1961 * A: set up vars 1980 * A: set up vars
1962 */ 1981 */
1963 clearfirst = clearlast = must_clear = 0; 1982 must_clear = 0;
1964
1965 refresh_count = 0; 1983 refresh_count = 0;
1966 1984
1967 row_offset = TermWin.saveLines - TermWin.view_start; 1985 row_offset = TermWin.saveLines - TermWin.view_start;
1968
1969 if ((refresh_type & REFRESH_BOUNDS))
1970 {
1971 clearfirst = clearlast = 1;
1972 refresh_type &= ~REFRESH_BOUNDS;
1973 }
1974 1986
1975#ifdef XPM_BACKGROUND 1987#ifdef XPM_BACKGROUND
1976 must_clear |= (bgPixmap.pixmap != None); 1988 must_clear |= (bgPixmap.pixmap != None);
1977#endif 1989#endif
1978#ifdef TRANSPARENT 1990#ifdef TRANSPARENT
1979 must_clear |= ((Options & Opt_transparent) && am_transparent); 1991 must_clear |= ((options & Opt_transparent) && am_transparent);
1980#endif 1992#endif
1981 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1993 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1982 1994
1983 /* 1995 /*
1984 * B: reverse any characters which are selected 1996 * B: reverse any characters which are selected
1985 */ 1997 */
1986 scr_reverse_selection (); 1998 scr_reverse_selection ();
1999#if ENABLE_OVERLAY
2000 scr_swap_overlay ();
2001#endif
1987 2002
1988 /* 2003 /*
1989 * C: set the cursor character (s) 2004 * C: set the cursor character (s)
1990 */ 2005 */
1991 { 2006 {
… …
1999 showcursor = 0; 2014 showcursor = 0;
2000#endif 2015#endif
2001 2016
2002 if (showcursor) 2017 if (showcursor)
2003 { 2018 {
2019 int col = screen.cur.col;
2020
2021 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2022 col--;
2023
2004 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2024 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2005 2025
2006 if (showcursor && TermWin.focus) 2026 if (showcursor && TermWin.focus)
2007 { 2027 {
2008 *srp ^= RS_RVid; 2028 *crp ^= RS_RVid;
2009#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
2010 cc1 = *srp & (RS_fgMask | RS_bgMask); 2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
2011 if (ISSET_PIXCOLOR (Color_cursor)) 2031 if (ISSET_PIXCOLOR (Color_cursor))
2012 ccol1 = Color_cursor; 2032 ccol1 = Color_cursor;
2013 else 2033 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol1 = GET_FGCOLOR (rstyle); 2035 ccol1 = GET_FGCOLOR (rstyle);
… …
2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2023 ccol2 = GET_BGCOLOR (rstyle); 2043 ccol2 = GET_BGCOLOR (rstyle);
2024#else 2044#else
2025 ccol2 = Color_bg; 2045 ccol2 = Color_bg;
2026#endif 2046#endif
2027 *srp = SET_FGCOLOR (*srp, ccol1); 2047 *crp = SET_FGCOLOR (*crp, ccol1);
2028 *srp = SET_BGCOLOR (*srp, ccol2); 2048 *crp = SET_BGCOLOR (*crp, ccol2);
2029#endif 2049#endif
2030 } 2050 }
2031 } 2051 }
2032 2052
2033 /* make sure no outline cursor is left around */ 2053 /* make sure no outline cursor is left around */
… …
2060 oldcursor.col = screen.cur.col; 2080 oldcursor.col = screen.cur.col;
2061 } 2081 }
2062 } 2082 }
2063 } 2083 }
2064 2084
2085 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2065#ifndef NO_SLOW_LINK_SUPPORT 2087#ifndef NO_SLOW_LINK_SUPPORT
2066 /* 2088 /*
2067 * D: CopyArea pass - very useful for slower links 2089 * D: CopyArea pass - very useful for slower links
2068 * This has been deliberately kept simple. 2090 * This has been deliberately kept simple.
2069 */ 2091 */
… …
2072 && refresh_type == FAST_REFRESH && num_scr_allow && i 2094 && refresh_type == FAST_REFRESH && num_scr_allow && i
2073 && abs (i) < TermWin.nrow && !must_clear) 2095 && abs (i) < TermWin.nrow && !must_clear)
2074 { 2096 {
2075 int16_t nits; 2097 int16_t nits;
2076 int j; 2098 int j;
2077 rend_t *drp2;
2078 text_t *dtp2;
2079 int len, wlen; 2099 int len, wlen;
2080 2100
2081 j = TermWin.nrow; 2101 j = TermWin.nrow;
2082 wlen = len = -1; 2102 wlen = len = -1;
2083 row = i > 0 ? 0 : j - 1; 2103 row = i > 0 ? 0 : j - 1;
2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2104 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2085 { 2105 {
2086 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2106 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2087 { 2107 {
2088 stp = screen.text[row + row_offset]; 2108 text_t *stp = screen.text[row + row_offset];
2089 srp = screen.rend[row + row_offset]; 2109 rend_t *srp = screen.rend[row + row_offset];
2090 dtp = drawn_text[row]; 2110 text_t *dtp = drawn_text[row];
2091 dtp2 = drawn_text[row + i]; 2111 text_t *dtp2 = drawn_text[row + i];
2092 drp = drawn_rend[row]; 2112 rend_t *drp = drawn_rend[row];
2093 drp2 = drawn_rend[row + i]; 2113 rend_t *drp2 = drawn_rend[row + i];
2094 2114
2095 for (nits = 0, col = TermWin.ncol; col--; ) 2115 for (nits = 0, col = TermWin.ncol; col--; )
2096 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2116 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2097 nits--; 2117 nits--;
2098 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2118 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2118 { 2138 {
2119 /* also comes here at end if needed because of >= above */ 2139 /* also comes here at end if needed because of >= above */
2120 if (wlen < len) 2140 if (wlen < len)
2121 SWAP_IT (wlen, len, int); 2141 SWAP_IT (wlen, len, int);
2122 2142
2123 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2124 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2143 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2125 TermWin.gc, 0, Row2Pixel (len + i), 2144 TermWin.gc, 0, Row2Pixel (len + i),
2126 (unsigned int)TermWin_TotalWidth (), 2145 (unsigned int)TermWin_TotalWidth (),
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2146 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2147 0, Row2Pixel (len));
… …
2135 /* 2154 /*
2136 * E: main pass across every character 2155 * E: main pass across every character
2137 */ 2156 */
2138 for (row = 0; row < TermWin.nrow; row++) 2157 for (row = 0; row < TermWin.nrow; row++)
2139 { 2158 {
2140 stp = screen.text[row + row_offset]; 2159 text_t *stp = screen.text[row + row_offset];
2141 srp = screen.rend[row + row_offset]; 2160 rend_t *srp = screen.rend[row + row_offset];
2142 dtp = drawn_text[row]; 2161 text_t *dtp = drawn_text[row];
2143 drp = drawn_rend[row]; 2162 rend_t *drp = drawn_rend[row];
2144 2163
2145 /* 2164 /*
2146 * E2: OK, now the real pass 2165 * E2: OK, now the real pass
2147 */ 2166 */
2148 int ypixel = (int)Row2Pixel (row); 2167 int ypixel = (int)Row2Pixel (row);
… …
2178 if (stp[col] == NOCHAR) 2197 if (stp[col] == NOCHAR)
2179 { 2198 {
2180 dtp[col] = stp[col]; 2199 dtp[col] = stp[col];
2181 drp[col] = rend; 2200 drp[col] = rend;
2182 count++; 2201 count++;
2183
2184 if (i) // only possible skip if char unchanged
2185 i++; 2202 i++;
2186 2203
2187 continue; 2204 continue;
2188 } 2205 }
2189 2206
2190 if (rend != srp[col]) 2207 if (rend != srp[col])
… …
2193 count++; 2210 count++;
2194 2211
2195 if (stp[col] != dtp[col] 2212 if (stp[col] != dtp[col]
2196 || srp[col] != drp[col]) 2213 || srp[col] != drp[col])
2197 { 2214 {
2198 if (must_clear && (i++ > (count / 2))) 2215 if (must_clear && (i++ > count / 2))
2199 break; 2216 break;
2200 2217
2201 dtp[col] = stp[col]; 2218 dtp[col] = stp[col];
2202 drp[col] = rend; 2219 drp[col] = rend;
2203 i = 0; 2220 i = 0;
2204 } 2221 }
2205 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2222 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2206 break; 2223 break;
2207 } 2224 }
2208 2225
2209 col--; /* went one too far. move back */ 2226 col--; /* went one too far. move back */
2210 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--;
2211 2232
2212 /* 2233 /*
2213 * Determine the attributes for the string 2234 * Determine the attributes for the string
2214 */ 2235 */
2215 int fid = GET_FONT (rend); 2236 int fid = GET_FONT (rend);
… …
2219 rend = GET_ATTR (rend); 2240 rend = GET_ATTR (rend);
2220 2241
2221 rvid = !!(rend & RS_RVid); 2242 rvid = !!(rend & RS_RVid);
2222 2243
2223#ifndef NO_BOLD_UNDERLINE_REVERSE 2244#ifndef NO_BOLD_UNDERLINE_REVERSE
2224 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2245 if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold))
2225 { 2246 {
2226 if (ISSET_PIXCOLOR (Color_BD)) 2247 if (ISSET_PIXCOLOR (Color_BD))
2227 fore = Color_BD; 2248 fore = Color_BD;
2228 else 2249 else
2229 rvid = !rvid; 2250 rvid = !rvid;
… …
2301 */ 2322 */
2302 if (showcursor) 2323 if (showcursor)
2303 { 2324 {
2304 if (TermWin.focus) 2325 if (TermWin.focus)
2305 { 2326 {
2306 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2307 [screen.cur.col]);
2308 *srp ^= RS_RVid; 2327 *crp ^= RS_RVid;
2309#ifndef NO_CURSORCOLOR 2328#ifndef NO_CURSORCOLOR
2310 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2329 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2311#endif 2330#endif
2312 } 2331 }
2313 else if (oldcursor.row >= 0) 2332 else if (oldcursor.row >= 0)
2314 { 2333 {
2315#ifndef NO_CURSORCOLOR 2334#ifndef NO_CURSORCOLOR
2316 if (ISSET_PIXCOLOR (Color_cursor)) 2335 if (ISSET_PIXCOLOR (Color_cursor))
2317 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2336 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2318#endif 2337#endif
2319 int cursorwidth = 1; 2338 int cursorwidth = 1;
2320 while (oldcursor.col + cursorwidth < TermWin.ncol 2339 while (oldcursor.col + cursorwidth < TermWin.ncol
2321 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2340 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2322 cursorwidth++; 2341 cursorwidth++;
… …
2330 } 2349 }
2331 2350
2332 /* 2351 /*
2333 * H: cleanup selection 2352 * H: cleanup selection
2334 */ 2353 */
2354#if ENABLE_OVERLAY
2355 scr_swap_overlay ();
2356#endif
2335 scr_reverse_selection (); 2357 scr_reverse_selection ();
2336
2337 /*
2338 * I: other general cleanup
2339 */
2340#if 0
2341 if (clearfirst && TermWin.int_bwidth)
2342 /*
2343 * clear the whole screen height, note that width == 0 is treated
2344 * specially by XClearArea
2345 */
2346 XClearArea (display->display, TermWin.vt, 0, 0,
2347 (unsigned int)TermWin.int_bwidth,
2348 (unsigned int)TermWin_TotalHeight (), False);
2349
2350 if (clearlast && TermWin.int_bwidth)
2351 /*
2352 * clear the whole screen height, note that width == 0 is treated
2353 * specially by XClearArea
2354 */
2355 XClearArea (display->display, TermWin.vt,
2356 TermWin.width + TermWin.int_bwidth, 0,
2357 (unsigned int)TermWin.int_bwidth,
2358 (unsigned int)TermWin_TotalHeight (), False);
2359#endif
2360 2358
2361 if (refresh_type & SMOOTH_REFRESH) 2359 if (refresh_type & SMOOTH_REFRESH)
2362 XFlush (display->display); 2360 XFlush (display->display);
2363 2361
2364 num_scr = 0; 2362 num_scr = 0;
… …
2398 2396
2399 num_scr_allow = 0; 2397 num_scr_allow = 0;
2400 want_refresh = 1; 2398 want_refresh = 1;
2401 2399
2402#ifdef TRANSPARENT 2400#ifdef TRANSPARENT
2403 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2401 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2404 { 2402 {
2405 int i; 2403 int i;
2406 2404
2407 if (! (Options & Opt_transparent_all)) 2405 if (! (options & Opt_transparent_all))
2408 i = 0; 2406 i = 0;
2409 else 2407 else
2410 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2408 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2411 2409
2412 while (i--) 2410 while (i--)
… …
2489 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2487 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2490 */ 2488 */
2491void 2489void
2492rxvt_term::selection_check (int check_more) 2490rxvt_term::selection_check (int check_more)
2493{ 2491{
2494 row_col_t pos; 2492 row_col_t pos;
2495 2493
2496 if (!selection.op) 2494 if (!selection.op)
2497 return; 2495 return;
2498 2496
2499 pos.row = pos.col = 0; 2497 pos.row = pos.col = 0;
… …
2526rxvt_term::paste (const unsigned char *data, unsigned int len) 2524rxvt_term::paste (const unsigned char *data, unsigned int len)
2527{ 2525{
2528 unsigned int i, j, n; 2526 unsigned int i, j, n;
2529 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2527 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2530 2528
2531#if 0
2532 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2533 ZERO_SCROLLBACK (r);
2534#endif
2535
2536 /* convert normal newline chars into common keyboard Return key sequence */ 2529 /* convert normal newline chars into common keyboard Return key sequence */
2537 for (i = 0; i < len; i += PROP_SIZE) 2530 for (i = 0; i < len; i += PROP_SIZE)
2538 { 2531 {
2539 n = min (len - i, PROP_SIZE); 2532 n = min (len - i, PROP_SIZE);
2540 MEMCPY (ds, data + i, n); 2533 memcpy (ds, data + i, n);
2541 2534
2542 for (j = 0; j < n; j++) 2535 for (j = 0; j < n; j++)
2543 if (ds[j] == C0_LF) 2536 if (ds[j] == C0_LF)
2544 ds[j] = C0_CR; 2537 ds[j] = C0_CR;
2545 2538
… …
2558rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2559{ 2552{
2560 long nread = 0; 2553 long nread = 0;
2561 unsigned long bytes_after; 2554 unsigned long bytes_after;
2562 XTextProperty ct; 2555 XTextProperty ct;
2563
2564 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2565 2556
2566 if (prop == None) /* check for failed XConvertSelection */ 2557 if (prop == None) /* check for failed XConvertSelection */
2567 { 2558 {
2568 if ((selection_type & Sel_CompoundText)) 2559 if ((selection_type & Sel_CompoundText))
2569 { 2560 {
… …
2596 &ct.nitems, &bytes_after, 2587 &ct.nitems, &bytes_after,
2597 &ct.value) != Success) 2588 &ct.value) != Success)
2598 break; 2589 break;
2599 2590
2600 if (ct.encoding == 0) 2591 if (ct.encoding == 0)
2592 break;
2593
2594 if (ct.encoding == xa[XA_INCR])
2601 { 2595 {
2602 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);
2603 break; 2600 break;
2604 } 2601 }
2605 2602
2606 if (ct.value == NULL) 2603 if (ct.value == NULL)
2607 {
2608 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2609 continue; 2604 continue;
2610 }
2611 2605
2612 if (ct.nitems == 0) 2606 if (ct.nitems == 0)
2613 { 2607 {
2614 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2615
2616 if (selection_wait == Sel_normal && nread == 0 2608 if (selection_wait == Sel_normal && nread == 0
2617 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2609 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2618 { 2610 {
2619 /* 2611 /*
2620 * pass through again trying CUT_BUFFER0 if we've come from 2612 * pass through again trying CUT_BUFFER0 if we've come from
2621 * XConvertSelection () but nothing was presented 2613 * XConvertSelection () but nothing was presented
2622 */ 2614 */
2623 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2624 selection_paste (display->root, XA_CUT_BUFFER0, False); 2615 selection_paste (display->root, XA_CUT_BUFFER0, False);
2625 } 2616 }
2626 2617
2627 nread = -1; /* discount any previous stuff */ 2618 nread = -1; /* discount any previous stuff */
2628 break; 2619 break;
… …
2633 char **cl; 2624 char **cl;
2634 int cr; 2625 int cr;
2635 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2626 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2636 { 2627 {
2637 for (int i = 0; i < cr; i++) 2628 for (int i = 0; i < cr; i++)
2638 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2629 paste ((unsigned char *)cl[i], strlen (cl[i]));
2639 2630
2640 XFreeStringList (cl); 2631 XFreeStringList (cl);
2641 } 2632 }
2642 else 2633 else
2643 paste (ct.value, ct.nitems); 2634 paste (ct.value, ct.nitems);
… …
2652 XFree (ct.value); 2643 XFree (ct.value);
2653 2644
2654 if (selection_wait == Sel_normal) 2645 if (selection_wait == Sel_normal)
2655 selection_wait = Sel_none; 2646 selection_wait = Sel_none;
2656 2647
2657 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2658 return (int)nread; 2648 return (int)nread;
2659} 2649}
2660 2650
2661void 2651void
2662rxvt_term::incr_cb (time_watcher &w) 2652rxvt_term::incr_cb (time_watcher &w)
… …
2670 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2660 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2671 */ 2661 */
2672void 2662void
2673rxvt_term::selection_property (Window win, Atom prop) 2663rxvt_term::selection_property (Window win, Atom prop)
2674{ 2664{
2675 int reget_time = 0; 2665 if (prop == None || selection_wait != Sel_incr)
2676
2677 if (prop == None)
2678 return; 2666 return;
2679 2667
2680 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2681 if (selection_wait == Sel_normal)
2682 {
2683 int a, afmt;
2684 Atom atype;
2685 unsigned long bytes_after, nitems;
2686 unsigned char *s = NULL;
2687
2688 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2689 xa[XA_INCR], &atype, &afmt, &nitems,
2690 &bytes_after, &s);
2691 if (s)
2692 XFree (s);
2693 if (a != Success)
2694 return;
2695
2696#ifndef __CYGWIN32__
2697 if (atype == xa[XA_INCR])
2698 { /* start an INCR transfer */
2699 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2700 XDeleteProperty (display->display, win, prop);
2701 XFlush (display->display);
2702 reget_time = 1;
2703 selection_wait = Sel_incr;
2704 }
2705#endif
2706
2707 }
2708 else if (selection_wait == Sel_incr)
2709 {
2710 reget_time = 1;
2711
2712 if (selection_paste (win, prop, True) == -1) 2668 if (selection_paste (win, prop, 1) > 0)
2713 {
2714 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2715 selection_wait = Sel_none;
2716 incr_ev.stop ();
2717 }
2718 }
2719 if (reget_time) /* received more data so reget time */
2720 incr_ev.start (NOW + 10); 2669 incr_ev.start (NOW + 10);
2670 else
2671 {
2672 selection_wait = Sel_none;
2673 incr_ev.stop ();
2674 }
2721} 2675}
2722 2676
2723/* ------------------------------------------------------------------------- */ 2677/* ------------------------------------------------------------------------- */
2724/* 2678/*
2725 * Request the current selection: 2679 * Request the current selection:
… …
2731 * EXT: button 2 release 2685 * EXT: button 2 release
2732 */ 2686 */
2733void 2687void
2734rxvt_term::selection_request (Time tm, int x, int y) 2688rxvt_term::selection_request (Time tm, int x, int y)
2735{ 2689{
2736 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2737
2738 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2690 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2739 return; /* outside window */ 2691 return; /* outside window */
2740 2692
2741 if (selection.text) 2693 if (selection.text)
2742 { /* internal selection */ 2694 { /* internal selection */
2743 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2744 char *str = rxvt_wcstombs (selection.text, selection.len); 2695 char *str = rxvt_wcstombs (selection.text, selection.len);
2745 paste ((unsigned char *)str, strlen (str)); 2696 paste ((unsigned char *)str, strlen (str));
2746 free (str); 2697 free (str);
2747 return; 2698 return;
2748 } 2699 }
… …
2767 2718
2768 } 2719 }
2769 } 2720 }
2770 2721
2771 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2722 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2772 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2773 selection_paste (display->root, XA_CUT_BUFFER0, False); 2723 selection_paste (display->root, XA_CUT_BUFFER0, False);
2774} 2724}
2775 2725
2776int 2726int
2777rxvt_term::selection_request_other (Atom target, int selnum) 2727rxvt_term::selection_request_other (Atom target, int selnum)
… …
2790 else 2740 else
2791 sel = xa[XA_CLIPBOARD]; 2741 sel = xa[XA_CLIPBOARD];
2792 2742
2793 if (XGetSelectionOwner (display->display, sel) != None) 2743 if (XGetSelectionOwner (display->display, sel) != None)
2794 { 2744 {
2795 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2796 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2745 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2797 TermWin.vt, selection_request_time); 2746 TermWin.vt, selection_request_time);
2798 return 1; 2747 return 1;
2799 } 2748 }
2800 2749
… …
2807 * EXT: SelectionClear 2756 * EXT: SelectionClear
2808 */ 2757 */
2809void 2758void
2810rxvt_term::selection_clear () 2759rxvt_term::selection_clear ()
2811{ 2760{
2812 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2813
2814 want_refresh = 1; 2761 want_refresh = 1;
2815 free (selection.text); 2762 free (selection.text);
2816 selection.text = NULL; 2763 selection.text = NULL;
2817 selection.len = 0; 2764 selection.len = 0;
2818 CLEAR_SELECTION (); 2765 CLEAR_SELECTION ();
… …
2831{ 2778{
2832 int i, col, end_col, row, end_row; 2779 int i, col, end_col, row, end_row;
2833 wchar_t *new_selection_text; 2780 wchar_t *new_selection_text;
2834 text_t *t; 2781 text_t *t;
2835 2782
2836 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2837 switch (selection.op) 2783 switch (selection.op)
2838 { 2784 {
2839 case SELECTION_CONT: 2785 case SELECTION_CONT:
2840 break; 2786 break;
2841 case SELECTION_INIT: 2787 case SELECTION_INIT:
… …
2863 int ofs = 0; 2809 int ofs = 0;
2864 int extra = 0; 2810 int extra = 0;
2865 2811
2866 for (; row <= end_row; row++, col = 0) 2812 for (; row <= end_row; row++, col = 0)
2867 { 2813 {
2868 t = &(screen.text[row][col]); 2814 t = &screen.text[row][col];
2869 2815
2870 end_col = screen.tlen[row]; 2816 end_col = screen.tlen[row];
2871 2817
2872 if (end_col == -1) 2818 if (end_col == -1)
2873 end_col = TermWin.ncol; 2819 end_col = TermWin.ncol;
… …
2937 XFree (ct.value); 2883 XFree (ct.value);
2938 } 2884 }
2939#endif 2885#endif
2940 2886
2941 selection_time = tm; 2887 selection_time = tm;
2942 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2943} 2888}
2944 2889
2945/* ------------------------------------------------------------------------- */ 2890/* ------------------------------------------------------------------------- */
2946/* 2891/*
2947 * 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
2948 * EXT: button 1 press 2893 * EXT: button 1 press
2949 */ 2894 */
2950void 2895void
2951rxvt_term::selection_click (int clicks, int x, int y) 2896rxvt_term::selection_click (int clicks, int x, int y)
2952{ 2897{
2953 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2954
2955 clicks = ((clicks - 1) % 3) + 1; 2898 clicks = ((clicks - 1) % 3) + 1;
2956 selection.clicks = clicks; /* save clicks so extend will work */ 2899 selection.clicks = clicks; /* save clicks so extend will work */
2957 2900
2958 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2901 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2959 2902
… …
3001 * We now only find out the boundary in one direction 2944 * We now only find out the boundary in one direction
3002 */ 2945 */
3003 2946
3004/* 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 */
3005#define DELIMIT_TEXT(x) \ 2948#define DELIMIT_TEXT(x) \
3006 (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)))
3007#define DELIMIT_REND(x) 1 2950#define DELIMIT_REND(x) 1
3008 2951
3009void 2952void
3010rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2953rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
3011{ 2954{
… …
3029 2972
3030 row = mark->row + TermWin.saveLines; 2973 row = mark->row + TermWin.saveLines;
3031 col = mark->col; 2974 col = mark->col;
3032 MAX_IT (col, 0); 2975 MAX_IT (col, 0);
3033 /* find the edge of a word */ 2976 /* find the edge of a word */
3034 stp = & (screen.text[row][col]); 2977 stp = &screen.text[row][col];
3035 w1 = DELIMIT_TEXT (*stp); 2978 w1 = DELIMIT_TEXT (*stp);
3036 2979
3037 srp = (&screen.rend[row][col]); 2980 srp = &screen.rend[row][col];
3038 w2 = DELIMIT_REND (*srp); 2981 w2 = DELIMIT_REND (*srp);
3039 2982
3040 for (;;) 2983 for (;;)
3041 { 2984 {
3042 for (; col != bound.col; col += dirnadd) 2985 for (; col != bound.col; col += dirnadd)
… …
3076 } 3019 }
3077 break; 3020 break;
3078 } 3021 }
3079 3022
3080Old_Word_Selection_You_Die: 3023Old_Word_Selection_You_Die:
3081 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));
3082
3083 if (dirn == DN) 3024 if (dirn == DN)
3084 col++; /* put us on one past the end */ 3025 col++; /* put us on one past the end */
3085 3026
3086 /* Poke the values back in */ 3027 /* Poke the values back in */
3087 ret->row = row - TermWin.saveLines; 3028 ret->row = row - TermWin.saveLines;
… …
3121 /* select nothing */ 3062 /* select nothing */
3122 selection.beg.row = selection.end.row = 0; 3063 selection.beg.row = selection.end.row = 0;
3123 selection.beg.col = selection.end.col = 0; 3064 selection.beg.col = selection.end.col = 0;
3124 selection.clicks = 4; 3065 selection.clicks = 4;
3125 want_refresh = 1; 3066 want_refresh = 1;
3126 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3127 return; 3067 return;
3128 } 3068 }
3129 3069
3130 if (selection.clicks == 4) 3070 if (selection.clicks == 4)
3131 selection.clicks = 1; 3071 selection.clicks = 1;
… …
3146 int end_col; 3086 int end_col;
3147 row_col_t pos; 3087 row_col_t pos;
3148 enum { 3088 enum {
3149 LEFT, RIGHT 3089 LEFT, RIGHT
3150 } closeto = RIGHT; 3090 } closeto = RIGHT;
3151
3152 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));
3153 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));
3154 3091
3155 want_refresh = 1; 3092 want_refresh = 1;
3156 switch (selection.op) 3093 switch (selection.op)
3157 { 3094 {
3158 case SELECTION_INIT: 3095 case SELECTION_INIT:
… …
3180 && selection.beg.row == selection.end.row 3117 && selection.beg.row == selection.end.row
3181 && selection.beg.row != selection.mark.row) 3118 && selection.beg.row != selection.mark.row)
3182 { 3119 {
3183 selection.beg.col = selection.end.col = selection.mark.col; 3120 selection.beg.col = selection.end.col = selection.mark.col;
3184 selection.beg.row = selection.end.row = selection.mark.row; 3121 selection.beg.row = selection.end.row = selection.mark.row;
3185 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));
3186 } 3122 }
3187 3123
3188 pos.col = col; 3124 pos.col = col;
3189 pos.row = row; 3125 pos.row = row;
3190 3126
… …
3283 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3219 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3284 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3220 selection_delimit_word (DN, & (selection.end), & (selection.end));
3285 } 3221 }
3286 else if (selection.clicks == 3) 3222 else if (selection.clicks == 3)
3287 { 3223 {
3288#ifndef NO_FRILLS 3224#if ENABLE_FRILLS
3289 if ((Options & Opt_tripleclickwords)) 3225 if ((options & Opt_tripleclickwords))
3290 { 3226 {
3291 int end_row; 3227 int end_row;
3292 3228
3293 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3229 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3294 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3230 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3319 if (button3 && buttonpress) 3255 if (button3 && buttonpress)
3320 { /* mark may need to be changed */ 3256 { /* mark may need to be changed */
3321 if (closeto == LEFT) 3257 if (closeto == LEFT)
3322 { 3258 {
3323 selection.mark.row = selection.end.row; 3259 selection.mark.row = selection.end.row;
3324 selection.mark.col = selection.end.col 3260 selection.mark.col = selection.end.col - (selection.clicks == 2);
3325 - (selection.clicks == 2);
3326 } 3261 }
3327 else 3262 else
3328 { 3263 {
3329 selection.mark.row = selection.beg.row; 3264 selection.mark.row = selection.beg.row;
3330 selection.mark.col = selection.beg.col; 3265 selection.mark.col = selection.beg.col;
3331 } 3266 }
3332 } 3267 }
3333 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));
3334} 3268}
3335 3269
3336#ifndef NO_FRILLS 3270#if ENABLE_FRILLS
3337void 3271void
3338rxvt_term::selection_remove_trailing_spaces () 3272rxvt_term::selection_remove_trailing_spaces ()
3339{ 3273{
3340 int32_t end_col, end_row; 3274 int32_t end_col, end_row;
3341 text_t *stp; 3275 text_t *stp;
… …
3430 (8 * sizeof (target_list[0])), PropModeReplace, 3364 (8 * sizeof (target_list[0])), PropModeReplace,
3431 (unsigned char *)target_list, 3365 (unsigned char *)target_list,
3432 target - target_list); 3366 target - target_list);
3433 ev.property = rq.property; 3367 ev.property = rq.property;
3434 } 3368 }
3369#if TODO // TODO
3435 else if (rq.target == xa[XA_MULTIPLE]) 3370 else if (rq.target == xa[XA_MULTIPLE])
3436 { 3371 {
3437 /* TODO: Handle MULTIPLE */ 3372 /* TODO: Handle MULTIPLE */
3438 } 3373 }
3374#endif
3439 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3375 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3440 { 3376 {
3441 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3377 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3442 (8 * sizeof (Time)), PropModeReplace, 3378 (8 * sizeof (Time)), PropModeReplace,
3443 (unsigned char *)&selection_time, 1); 3379 (unsigned char *)&selection_time, 1);
… …
3524} 3460}
3525 3461
3526/* ------------------------------------------------------------------------- */ 3462/* ------------------------------------------------------------------------- */
3527#ifdef USE_XIM 3463#ifdef USE_XIM
3528void 3464void
3529rxvt_term::im_set_position (XPoint *pos) 3465rxvt_term::im_set_position (XPoint &pos)
3530{ 3466{
3531 XWindowAttributes xwa; 3467 XWindowAttributes xwa;
3532 3468
3533 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3469 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3470
3534 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3471 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3535 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3472 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3536} 3473}
3537
3538#endif 3474#endif
3475
3476#if ENABLE_OVERLAY
3477void
3478rxvt_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
3535void
3536rxvt_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
3553void
3554rxvt_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
3565void
3566rxvt_term::scr_overlay_set (int x, int y, const char *s)
3567{
3568 while (*s)
3569 scr_overlay_set (x++, y, *s++);
3570}
3571
3572void
3573rxvt_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
3539/* ------------------------------------------------------------------------- */ 3598/* ------------------------------------------------------------------------- */

Diff Legend

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