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.327 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.410 by sf-exg, Thu Nov 24 18:09:54 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
198 term_start = 0; 203 term_start = 0;
199 204
200 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202 207
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 211
207 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
208 { 213 {
… …
231 selection.text = NULL; 236 selection.text = NULL;
232 selection.len = 0; 237 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
235 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
236 } 243 }
237 else 244 else
238 { 245 {
239 /* 246 /*
240 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 } 277 }
271 278
272 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
274 281
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
278 285
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 294
288 do 295 do
289 { 296 {
290 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 299 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 301
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 303 {
… …
397 } 402 }
398 403
399 free (tabs); 404 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
401 406
402 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
510 } 515 }
511 516
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
518#endif
519} 522}
520 523
521void 524void
522rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
523{ 526{
… …
546 return; 549 return;
547 550
548 want_refresh = 1; 551 want_refresh = 1;
549 view_start = 0; 552 view_start = 0;
550 553
551 selection_check (2); /* check for boundary cross */ 554 /* check for boundary cross */
555 row_col_t pos;
556 pos.row = pos.col = 0;
557 if (ROWCOL_IS_BEFORE (selection.beg, pos)
558 && ROWCOL_IS_AFTER (selection.end, pos))
559 CLEAR_SELECTION ();
552 560
553 int i = current_screen; current_screen = scrn; scrn = i; 561 current_screen = scrn;
554 562
555#if NSCREENS 563#if NSCREENS
556 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
557 { 565 {
558 num_scr = 0; 566 num_scr = 0;
… …
635 643
636 if (count > 0 644 if (count > 0
637 && row1 == 0 645 && row1 == 0
638 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 646 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639 { 647 {
648 min_it (count, total_rows - (nrow - (row2 + 1)));
649
640 top_row = max (top_row - count, -saveLines); 650 top_row = max (top_row - count, -saveLines);
641
642 // scroll everything up 'count' lines
643 term_start = (term_start + count) % total_rows;
644 651
645 // sever bottommost line 652 // sever bottommost line
646 { 653 {
647 line_t &l = ROW(row2 - count); 654 line_t &l = ROW(row2);
648 l.is_longer (0); 655 l.is_longer (0);
649 l.touch (); 656 l.touch ();
650 } 657 }
651 658
659 // scroll everything up 'count' lines
660 term_start = (term_start + count) % total_rows;
661
662 // now copy lines below the scroll region bottom to the
663 // bottom of the screen again, so they look as if they
664 // hadn't moved.
665 for (int i = nrow; --i > row2; )
666 {
667 line_t &l1 = ROW(i - count);
668 line_t &l2 = ROW(i);
669
670 ::swap (l1, l2);
671 l2.touch ();
672 }
673
652 // erase newly scrolled-in lines 674 // erase newly scrolled-in lines
653 for (int i = count; i--; ) 675 for (int i = count; i--; )
654 { 676 {
655 line_t &l = ROW(nrow - 1 - i); 677 line_t &l = ROW(row2 - i);
656 678
657 // optimize if already cleared, can be significant on slow machines 679 // optimise if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem 680 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 681 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 { 682 {
661 scr_blank_line (l, 0, l.l, rstyle); 683 scr_blank_line (l, 0, l.l, rstyle);
662 l.l = 0; 684 l.l = 0;
… …
664 } 686 }
665 else 687 else
666 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
667 } 689 }
668 690
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 }
680
681 // move and/or clear selection, if any 691 // move and/or clear selection, if any
682 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
683 { 694 {
684 selection.beg.row -= count; 695 selection.beg.row -= count;
685 selection.end.row -= count; 696 selection.end.row -= count;
686 selection.mark.row -= count; 697 selection.mark.row -= count;
687 698
688 if (selection.beg.row < top_row 699 selection_check (0);
689 || selection.end.row < top_row
690 || selection.mark.row < top_row)
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 } 700 }
696 701
697 // finally move the view window, if desired 702 // finally move the view window, if desired
698 if (option (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
699 && view_start != 0 704 && view_start != 0
… …
729 } 734 }
730 735
731 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
732 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
733 738
739 // sever line above scroll region
740 if (row1)
741 {
742 line_t &l = ROW(row1 - 1);
743 l.is_longer (0);
744 l.touch ();
745 }
746
734 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
735 748
736 min_it (count, rows); 749 min_it (count, rows);
737 750
738 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739 752
740 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
741 { 754 {
742 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743 756
… …
745 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
746 } 759 }
747 760
748 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
749 ROW(row1 + row) = temp_buf [row]; 762 ROW(row1 + row) = temp_buf [row];
763
764 // sever bottommost line
765 {
766 line_t &l = ROW(row2);
767 l.is_longer (0);
768 l.touch ();
769 }
750 } 770 }
751 771
752 return count; 772 return count;
753} 773}
754 774
… …
760rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
761{ 781{
762 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
763 return; 783 return;
764 784
765 unsigned char checksel; 785 bool checksel;
766 unicode_t c; 786 unicode_t c;
767 int ncol = this->ncol; 787 int ncol = this->ncol;
768 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
769 789
770 want_refresh = 1; 790 want_refresh = 1;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 803 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 804 screen.cur.row -= minlines;
785 } 805 }
786 } 806 }
787 807
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 808 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 809 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 810 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 811 int row = screen.cur.row;
794 812
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 813 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 814
797 line_t *line = &ROW(row); 815 line_t *line = &ROW(row);
798 816
799 while (str < strend) 817 while (str < strend)
800 { 818 {
801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802 820
803 if (expect_false (c < 0x20)) 821 if (ecb_unlikely (c < 0x20))
804 if (c == C0_LF) 822 if (c == C0_LF)
805 { 823 {
806 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
807 825
808 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
827 { 845 {
828 scr_tab (1, true); 846 scr_tab (1, true);
829 continue; 847 continue;
830 } 848 }
831 849
832 if (expect_false ( 850 if (ecb_unlikely (
833 checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 )) 854 ))
837 { 855 {
… …
842 * should be a similar check. 860 * should be a similar check.
843 */ 861 */
844 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
845 } 863 }
846 864
847 if (expect_false (screen.flags & Screen_WrapNext)) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
848 { 866 {
849 scr_do_wrap (); 867 scr_do_wrap ();
850 868
851 line->l = ncol; 869 line->l = ncol;
852 line->is_longer (1); 870 line->is_longer (1);
… …
854 row = screen.cur.row; 872 row = screen.cur.row;
855 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
856 } 874 }
857 875
858 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860 c = 0xfffd; 878 c = 0xfffd;
861 879
862 // rely on wcwidth to tell us the character width, do wcwidth before 880 // rely on wcwidth to tell us the character width, do wcwidth before
863 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
864 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
865 // locale. 883 // locale.
866 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
867 885
868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869 { 887 {
870 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
871 // 5f-7e standard vt100 889 // 5f-7e standard vt100
872 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
887 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
888 } 906 }
889 } 907 }
890 908
891 if (expect_false (screen.flags & Screen_Insert)) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
892 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
893 911
894 if (width != 0) 912 if (width != 0)
895 { 913 {
896#if !UNICODE_3 914#if !UNICODE_3
… …
901# else 919# else
902 c = 0xfffd; 920 c = 0xfffd;
903# endif 921# endif
904#endif 922#endif
905 923
924 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
925
926 // if the character doesn't fit into the remaining columns...
927 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
928 {
929 if (screen.flags & Screen_Autowrap)
930 {
931 // ... artificially enlargen the previous one
932 c = NOCHAR;
933 // and try the same character next loop iteration
934 --str;
935 }
936 else
937 screen.cur.col = ncol - width;
938 }
939
906 // nuke the character at this position, if required 940 // nuke the character at this position, if required
907 if (expect_false ( 941 // due to wonderful coincidences everywhere else in this loop
942 // we never have to check for overwriting a wide char itself,
943 // only its tail.
908 line->t[screen.cur.col] == NOCHAR 944 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col); 945 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 {
919 // ... artificially enlargen the previous one
920 c = NOCHAR;
921 // and try the same character next loop iteration
922 --str;
923 }
924 946
925 line->touch (); 947 line->touch ();
926 948
927 do 949 do
928 { 950 {
929 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
931 953
932 if (expect_true (screen.cur.col < ncol - 1)) 954 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 955 screen.cur.col++;
934 else 956 else
935 { 957 {
936 line->l = ncol; 958 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
939 break; 961
962 goto end_of_line;
940 } 963 }
941 964
942 c = NOCHAR; 965 c = NOCHAR;
943 } 966 }
944 while (expect_false (--width > 0)); 967 while (ecb_unlikely (--width > 0));
945 968
946 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 971 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 972 line->t[c] = ' ';
954 line->r[c] = rend; 973 line->r[c] = rend;
955 }
956 } 974 }
975
976end_of_line:
977 ;
957 } 978 }
958#if ENABLE_COMBINING 979#if ENABLE_COMBINING
959 else // width == 0 980 else // width == 0
960 { 981 {
961 if (c != 0xfeff) // ignore BOM 982 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1022#endif
1002 } 1023 }
1003 1024
1004 max_it (line->l, screen.cur.col); 1025 max_it (line->l, screen.cur.col);
1005 1026
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
1008#endif
1009} 1028}
1010 1029
1011/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1012/* 1031/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1032 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1045
1027 want_refresh = 1; 1046 want_refresh = 1;
1028#endif 1047#endif
1029 } 1048 }
1030 } 1049 }
1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1031 else 1052 else
1032 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1033} 1054}
1034 1055
1035/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
… …
1291 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1292} 1313}
1293 1314
1294/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1295/* 1316/*
1296 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1321 */
1301void 1322void
… …
1310 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1311 1332
1312 switch (mode) 1333 switch (mode)
1313 { 1334 {
1314 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1336 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1338 num = nrow - row;
1319 break; 1339 break;
1320 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1341 scr_erase_line (1);
1323 row = 0; 1342 row = 0;
1324 num = screen.cur.row; 1343 num = screen.cur.row;
1325 break; 1344 break;
1326 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1346 row = 0;
1329 num = nrow; 1347 num = nrow;
1330 break; 1348 break;
1331 default: 1349 default:
1332 return; 1350 return;
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1359 if (row >= nrow) /* Out Of Bounds */
1342 return; 1360 return;
1343 1361
1344 min_it (num, nrow - row); 1362 min_it (num, nrow - row);
1345 1363
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1364 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1365 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1366 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1367 {
1353 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1354 1369
1355 if (mapped && !view_start) 1370 if (mapped)
1356 XClearArea (dpy, vt, 0, 1371 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1372 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1373 (unsigned int)Height2Pixel (num), False);
1359 } 1374 }
1360 else 1375 else
1361 { 1376 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1378
1364 if (mapped && !view_start) 1379 if (mapped)
1365 { 1380 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1383 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1384 0, Row2Pixel (row - view_start),
… …
1376 1391
1377 for (; num--; row++) 1392 for (; num--; row++)
1378 { 1393 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1394 scr_blank_screen_mem (ROW(row), rstyle);
1380 1395
1381 if (!view_start) 1396 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1397 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1398 }
1384} 1399}
1385 1400
1386#if !ENABLE_MINIMAL 1401#if !ENABLE_MINIMAL
1387void 1402void
… …
1406 1421
1407 want_refresh = 1; 1422 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1409 1424
1410 num_scr_allow = 0; 1425 num_scr_allow = 0;
1411 selection_check (3); 1426
1427 row_col_t pos;
1428 pos.row = pos.col = 0;
1429 if (ROWCOL_IS_AFTER (selection.end, pos))
1430 CLEAR_SELECTION ();
1412 1431
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1415 { 1434 {
1416 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1686 { 1705 {
1687 rvideo_state = on; 1706 rvideo_state = on;
1688 1707
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1692#endif 1711#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1713
1695 XGCValues gcvalue; 1714 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1860 {
1842 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1844 } 1863 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1865 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1866 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1867
1849 num_scr_allow = 0; 1868 num_scr_allow = 0;
1850 1869
… …
1923 1942
1924# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1927# endif 1946# endif
1928 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1929# endif 1948# endif
1930 1949
1931# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1952 set_urgency (1);
… …
1941 1960
1942 bell_ev.start (VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1962 }
1944 else 1963 else
1945 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1966#endif
1947} 1967}
1948 1968
1949/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */
1951void 1970void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1972{
1954#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1955 int nrows, row_start; 1974 int nrows, row_start;
… …
1969 row_start = view_start; 1988 row_start = view_start;
1970 } 1989 }
1971 1990
1972 wctomb (0, 0); 1991 wctomb (0, 0);
1973 1992
1974 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1994 {
1976 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1978 1997
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1998 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2029 * A: set up vars 2048 * A: set up vars
2030 */ 2049 */
2031 refresh_count = 0; 2050 refresh_count = 0;
2032 2051
2033 unsigned int old_screen_flags = screen.flags; 2052 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2053 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2037#endif 2056#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2058
2040 /* 2059 /*
2041 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2066 scr_swap_overlay ();
2048#endif 2067#endif
2049 2068
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2069 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2070
2052 /* 2071 /*
2053 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2054 */ 2073 */
2055 { 2074 {
2056 unsigned char setoldcursor; 2075 bool setoldcursor;
2057 2076
2058#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2078 if (hidden_cursor)
2060 showcursor = 0; 2079 showcursor = 0;
2061#endif 2080#endif
… …
2090 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2091#else 2110#else
2092 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2093#endif 2112#endif
2094 2113
2095 if (showcursor && focus) 2114 if (focus)
2096 { 2115 {
2097 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2099 else 2118 else
2100 { 2119 {
… …
2148 { 2167 {
2149 int16_t nits; 2168 int16_t nits;
2150 int i = num_scr; 2169 int i = num_scr;
2151 int j; 2170 int j;
2152 int len, wlen; 2171 int len, wlen;
2153 dLocal (int, num_scr);
2154 2172
2155 j = nrow; 2173 j = nrow;
2156 wlen = len = -1; 2174 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2175 row = i > 0 ? 0 : j - 1;
2158 2176
… …
2233 continue; 2251 continue;
2234 2252
2235 // redraw one or more characters 2253 // redraw one or more characters
2236 2254
2237 // seek to the beginning of wide characters 2255 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2256 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2257 --col;
2240 2258
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2259 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2260 text_t *text = stp + col;
2243 int count = 1; 2261 int count = 1;
2244 2262
2245 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2246 drp[col] = rend; 2264 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2268 for (i = 0; ++col < ncol; )
2251 { 2269 {
2252 if (stp[col] == NOCHAR) 2270 if (stp[col] == NOCHAR)
2253 { 2271 {
2254 dtp[col] = stp[col]; 2272 dtp[col] = stp[col];
2255 drp[col] = rend; 2273 drp[col] = srp[col];
2274
2256 count++; 2275 count++;
2257 i++; 2276 i++;
2258 2277
2259 continue; 2278 continue;
2260 } 2279 }
… …
2280 2299
2281 col--; /* went one too far. move back */ 2300 col--; /* went one too far. move back */
2282 count -= i; /* dump any matching trailing chars */ 2301 count -= i; /* dump any matching trailing chars */
2283 2302
2284 // sometimes we optimize away the trailing NOCHAR's, add them back 2303 // sometimes we optimize away the trailing NOCHAR's, add them back
2285 while (expect_false (i && text[count] == NOCHAR)) 2304 while (ecb_unlikely (i && text[count] == NOCHAR))
2286 count++, i--; 2305 count++, i--;
2287 2306
2288 /* 2307 /*
2289 * Determine the attributes for the string 2308 * Determine the attributes for the string
2290 */ 2309 */
2291 int fore = fgcolor_of (rend); // desired foreground 2310 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2311 int back = bgcolor_of (rend); // desired background
2293 2312
2294 // only do special processing if any attributes are set, which is unlikely 2313 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2314 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2315 {
2297 bool invert = rend & RS_RVid; 2316 bool invert = rend & RS_RVid;
2298 2317
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2318#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2319 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2338
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2339 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2340 fore = Color_UL;
2322#endif 2341#endif
2323 2342
2343#ifdef OPTION_HC
2344 if (rend & RS_Sel)
2345 {
2346 /* invert the column if no highlightColor is set or it is the
2347 * current cursor column */
2348 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2349 && ISSET_PIXCOLOR (Color_HC))
2350 {
2351 if (ISSET_PIXCOLOR (Color_HTC))
2352 fore = Color_HTC;
2353 // if invert is 0 reverse video is set so we use bg color as fg color
2354 else if (!invert)
2355 fore = back;
2356
2357 back = Color_HC;
2358 invert = 0;
2359 }
2360 }
2361#endif
2362
2324 if (invert) 2363 if (invert)
2325 { 2364 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2365 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2366
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2368 if (fore == back)
2344 { 2369 {
2345 fore = Color_bg; 2370 fore = Color_bg;
2346 back = Color_fg; 2371 back = Color_fg;
2347 } 2372 }
… …
2383 /* 2408 /*
2384 * Actually do the drawing of the string here 2409 * Actually do the drawing of the string here
2385 */ 2410 */
2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2411 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387 2412
2388 if (expect_true (have_bg && back == Color_bg)) 2413 if (ecb_likely (have_bg && back == Color_bg))
2389 { 2414 {
2390 // this is very ugly, maybe push it into ->draw? 2415 // this is very ugly, maybe push it into ->draw?
2391 2416
2392 for (i = 0; i < count; i++) /* don't draw empty strings */ 2417 for (i = 0; i < count; i++) /* don't draw empty strings */
2393 if (text[i] != ' ') 2418 if (text[i] != ' ')
… …
2400 did_clear: ; 2425 did_clear: ;
2401 } 2426 }
2402 else 2427 else
2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2428 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404 2429
2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2430 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406 { 2431 {
2407#if ENABLE_FRILLS 2432#if ENABLE_FRILLS
2408 if (ISSET_PIXCOLOR (Color_underline)) 2433 if (ISSET_PIXCOLOR (Color_underline))
2409 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2434 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410 else 2435 else
… …
2501 scr_remap_chars (swap_buf [i]); 2526 scr_remap_chars (swap_buf [i]);
2502 } 2527 }
2503} 2528}
2504 2529
2505void 2530void
2506rxvt_term::scr_recolour () NOTHROW 2531rxvt_term::scr_recolour (bool refresh) NOTHROW
2507{ 2532{
2533 bool transparent = false;
2534
2508#ifdef HAVE_BG_PIXMAP 2535#ifdef HAVE_BG_PIXMAP
2509 bgPixmap.apply (); 2536 if (bg_pixmap != None)
2510#else 2537 {
2538# ifdef ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT)
2540 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2511 2543
2544 transparent = true;
2545 }
2546 else
2547# endif
2548 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2551 }
2552 }
2553 else
2554#endif
2555 {
2512 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2513 XClearWindow (dpy, parent[0]);
2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2557 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2558 }
2559
2560 XClearWindow (dpy, parent);
2515 2561
2516 if (scrollBar.win) 2562 if (scrollBar.win)
2517 { 2563 {
2564 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else
2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2519 scrollBar.state = STATE_IDLE; 2568 scrollBar.state = SB_STATE_IDLE;
2520 scrollBar.show (0); 2569 scrollBar.show (0);
2521 } 2570 }
2522 2571
2523#endif 2572 if (refresh)
2524 2573 {
2525 /* bgPixmap.apply () does not do the following : */
2526 scr_clear (); 2574 scr_clear ();
2527 scr_touch (true); 2575 scr_touch (true);
2576 }
2528 want_refresh = 1; 2577 want_refresh = 1;
2529} 2578}
2530 2579
2531/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2532void 2581void
… …
2600 { 2649 {
2601#if !ENABLE_MINIMAL 2650#if !ENABLE_MINIMAL
2602 if (selection.rect) 2651 if (selection.rect)
2603 scr_xor_rect (selection.beg.row, selection.beg.col, 2652 scr_xor_rect (selection.beg.row, selection.beg.col,
2604 selection.end.row, selection.end.col, 2653 selection.end.row, selection.end.col,
2605 RS_RVid, RS_RVid | RS_Uline); 2654 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2606 else 2655 else
2607#endif 2656#endif
2608 scr_xor_span (selection.beg.row, selection.beg.col, 2657 scr_xor_span (selection.beg.row, selection.beg.col,
2609 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2610 RS_RVid); 2659 RS_Sel | RS_RVid);
2611 } 2660 }
2612} 2661}
2613 2662
2614/* ------------------------------------------------------------------------- */ 2663/* ------------------------------------------------------------------------- */
2615/* 2664/*
… …
2618 */ 2667 */
2619#if 0 2668#if 0
2620void 2669void
2621rxvt_term::scr_dump (int fd) NOTHROW 2670rxvt_term::scr_dump (int fd) NOTHROW
2622{ 2671{
2623 int row, wrote; 2672 // if this method is needed, it can be implemented by factoring the
2624 unsigned int width, towrite; 2673 // relevant code in scr_printscreen
2625 char r1[] = "\n";
2626
2627 for (row = saveLines + top_row;
2628 row < saveLines + nrow - 1; row++)
2629 {
2630 width = row_buf[row].l >= 0 ? row_buf[row].l
2631 : ncol;
2632 for (towrite = width; towrite; towrite -= wrote)
2633 {
2634 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2635 towrite);
2636 if (wrote < 0)
2637 return; /* XXX: death, no report */
2638 }
2639 if (row_buf[row].l >= 0)
2640 if (write (fd, r1, 1) <= 0)
2641 return; /* XXX: death, no report */
2642 }
2643} 2674}
2644#endif 2675#endif
2645 2676
2646/* ------------------------------------------------------------------------- * 2677/* ------------------------------------------------------------------------- *
2647 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2648 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2649void 2680void
2650rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2651{ 2682{
2652 row_col_t pos;
2653
2654 if (!selection.op) 2683 if (!selection.op)
2655 return; 2684 return;
2656 2685
2657 pos.row = pos.col = 0;
2658 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2686 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2659 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2687 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2660 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2661 || (check_more == 1 2689 || (check_more == 1
2662 && current_screen == selection.screen 2690 && current_screen == selection.screen
2663 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2691 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2664 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2692 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2665 || (check_more == 2
2666 && ROWCOL_IS_BEFORE (selection.beg, pos)
2667 && ROWCOL_IS_AFTER (selection.end, pos))
2668 || (check_more == 3
2669 && ROWCOL_IS_AFTER (selection.end, pos))
2670 || (check_more == 4 /* screen width change */
2671 && (selection.beg.row != selection.end.row
2672 || selection.end.col > ncol)))
2673 CLEAR_SELECTION (); 2693 CLEAR_ALL_SELECTION ();
2674} 2694}
2675 2695
2676/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2677/* 2697/*
2678 * Paste a selection direct to the command fd 2698 * Paste a selection direct to the command fd
2679 */ 2699 */
2680void 2700void
2681rxvt_term::paste (char *data, unsigned int len) NOTHROW 2701rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2682{ 2702{
2683 /* convert normal newline chars into common keyboard Return key sequence */ 2703 /* convert normal newline chars into common keyboard Return key sequence */
2684 for (unsigned int i = 0; i < len; i++) 2704 for (unsigned int i = 0; i < len; i++)
2685 if (data[i] == C0_LF) 2705 if (data[i] == C0_LF)
2686 data[i] = C0_CR; 2706 data[i] = C0_CR;
… …
2692 2712
2693 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[201~"); 2714 tt_printf ("\e[201~");
2695} 2715}
2696 2716
2697/* ------------------------------------------------------------------------- */
2698/*
2699 * Respond to a notification that a primary selection has been sent
2700 * EXT: SelectionNotify
2701 */
2702void 2717void
2703rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2718rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{ 2719{
2705 if (prop == None) /* check for failed XConvertSelection */ 2720 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2706 {
2707 if ((selection_type & Sel_CompoundText))
2708 {
2709 int selnum = selection_type & Sel_whereMask;
2710
2711 selection_type = 0;
2712 if (selnum != Sel_direct)
2713 selection_request_other (XA_STRING, selnum);
2714 }
2715
2716 if ((selection_type & Sel_UTF8String))
2717 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = Sel_CompoundText;
2721 if (selnum != Sel_direct)
2722 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2723 else
2724 selection_type = 0;
2725 }
2726
2727 return;
2728 }
2729
2730 unsigned long bytes_after;
2731 XTextProperty ct;
2732
2733 if (XGetWindowProperty (dpy, win, prop,
2734 0, PROP_SIZE / 4,
2735 delete_prop, AnyPropertyType,
2736 &ct.encoding, &ct.format,
2737 &ct.nitems, &bytes_after,
2738 &ct.value) != Success)
2739 {
2740 ct.value = 0;
2741 goto bailout;
2742 }
2743
2744 if (ct.encoding == None)
2745 goto bailout;
2746
2747 if (bytes_after)
2748 {
2749 // fetch and append remaining data
2750 XTextProperty ct2;
2751
2752 if (XGetWindowProperty (dpy, win, prop,
2753 ct.nitems / 4, (bytes_after + 3) / 4,
2754 delete_prop, AnyPropertyType,
2755 &ct2.encoding, &ct2.format,
2756 &ct2.nitems, &bytes_after,
2757 &ct2.value) != Success)
2758 goto bailout;
2759
2760 // realloc should be compatible to XFree, here, and elsewhere, too
2761 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2762 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2763 ct.nitems += ct2.nitems;
2764
2765 XFree (ct2.value);
2766 }
2767
2768 if (ct.value == 0)
2769 goto bailout;
2770
2771 if (ct.encoding == xa[XA_INCR])
2772 {
2773 // INCR selection, start handshake
2774 if (!delete_prop)
2775 XDeleteProperty (dpy, win, prop);
2776
2777 selection_wait = Sel_incr;
2778 incr_buf_fill = 0;
2779 incr_ev.start (10);
2780
2781 goto bailout;
2782 }
2783
2784 if (ct.nitems == 0)
2785 {
2786 if (selection_wait == Sel_incr)
2787 {
2788 XFree (ct.value);
2789
2790 // finally complete, now paste the whole thing
2791 selection_wait = Sel_normal;
2792 ct.value = (unsigned char *)incr_buf;
2793 ct.nitems = incr_buf_fill;
2794 incr_buf = 0;
2795 incr_buf_size = 0;
2796 incr_ev.stop ();
2797 }
2798 else
2799 {
2800 if (selection_wait == Sel_normal
2801 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2802 {
2803 /*
2804 * pass through again trying CUT_BUFFER0 if we've come from
2805 * XConvertSelection () but nothing was presented
2806 */
2807 selection_paste (display->root, XA_CUT_BUFFER0, False);
2808 }
2809
2810 goto bailout;
2811 }
2812 }
2813 else if (selection_wait == Sel_incr)
2814 {
2815 incr_ev.start (10);
2816
2817 while (incr_buf_fill + ct.nitems > incr_buf_size)
2818 {
2819 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2820 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2821 }
2822
2823 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2824 incr_buf_fill += ct.nitems;
2825
2826 goto bailout;
2827 }
2828
2829 char **cl;
2830 int cr;
2831
2832#if !ENABLE_MINIMAL
2833 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2834 // so recode it manually
2835 if (ct.encoding == xa[XA_UTF8_STRING])
2836 {
2837 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2838 char *s = rxvt_wcstombs (w);
2839 free (w);
2840 // TODO: strlen == only the first element will be converted. well...
2841 paste (s, strlen (s));
2842 free (s);
2843 }
2844 else
2845#endif
2846 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2847 && cl)
2848 {
2849 for (int i = 0; i < cr; i++)
2850 paste (cl[i], strlen (cl[i]));
2851
2852 XFreeStringList (cl);
2853 }
2854 else
2855 paste ((char *)ct.value, ct.nitems); // paste raw
2856
2857bailout:
2858 XFree (ct.value);
2859
2860 if (selection_wait == Sel_normal)
2861 selection_wait = Sel_none;
2862}
2863
2864void
2865rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2866{
2867 selection_wait = Sel_none;
2868
2869 incr_buf_size = 0;
2870 free (incr_buf);
2871
2872 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2873}
2874
2875void
2876rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2877{
2878 if (prop == None || selection_wait != Sel_incr)
2879 return; 2721 return;
2880 2722
2881 selection_paste (win, prop, true); 2723 tt_paste (data, len);
2882} 2724}
2883 2725
2884/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2885/* 2727/*
2886 * Request the current selection: 2728 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2887 * Order: > internal selection if available 2729 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2888 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2730 * as fallback
2889 * > CUT_BUFFER0
2890 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2891 * will auto fallback to CUT_BUFFER0
2892 * EXT: button 2 release 2731 * EXT: button 2 release
2893 */ 2732 */
2894void 2733void
2895rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2734rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2896{ 2735{
2897 if (selection.text && selnum == Sel_Primary) 2736 if (!selection_req)
2898 {
2899 /* internal selection */
2900 char *str = rxvt_wcstombs (selection.text, selection.len);
2901 paste (str, strlen (str));
2902 free (str);
2903 return;
2904 } 2737 {
2905 else 2738 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2739 selection_req->run ();
2906 { 2740 }
2907 selection_request_time = tm;
2908 selection_wait = Sel_normal;
2909
2910#if X_HAVE_UTF8_STRING
2911 selection_type = Sel_UTF8String;
2912 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2913 return;
2914#else
2915 selection_type = Sel_CompoundText;
2916 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2917 return;
2918#endif
2919 }
2920
2921 selection_wait = Sel_none; /* don't loop in selection_paste () */
2922 selection_paste (display->root, XA_CUT_BUFFER0, false);
2923}
2924
2925int
2926rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2927{
2928 Atom sel;
2929
2930 selection_type |= selnum;
2931
2932 if (selnum == Sel_Primary)
2933 sel = XA_PRIMARY;
2934 else if (selnum == Sel_Secondary)
2935 sel = XA_SECONDARY;
2936 else
2937 sel = xa[XA_CLIPBOARD];
2938
2939 if (XGetSelectionOwner (dpy, sel) != None)
2940 {
2941 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2942 vt, selection_request_time);
2943 return 1;
2944 }
2945
2946 return 0;
2947} 2741}
2948 2742
2949/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2950/* 2744/*
2951 * Clear all selected text 2745 * Clear all selected text
2952 * EXT: SelectionClear 2746 * EXT: SelectionClear
2953 */ 2747 */
2954void 2748void
2955rxvt_term::selection_clear () NOTHROW 2749rxvt_term::selection_clear (bool clipboard) NOTHROW
2956{ 2750{
2751 if (!clipboard)
2752 {
2957 want_refresh = 1; 2753 want_refresh = 1;
2958 free (selection.text); 2754 free (selection.text);
2959 selection.text = NULL; 2755 selection.text = NULL;
2960 selection.len = 0; 2756 selection.len = 0;
2961 CLEAR_SELECTION (); 2757 CLEAR_SELECTION ();
2962 2758
2963 if (display->selection_owner == this) 2759 if (display->selection_owner == this)
2964 display->selection_owner = 0; 2760 display->selection_owner = 0;
2761 }
2762 else
2763 {
2764 free (selection.clip_text);
2765 selection.clip_text = NULL;
2766 selection.clip_len = 0;
2767
2768 if (display->clipboard_owner == this)
2769 display->clipboard_owner = 0;
2770 }
2965} 2771}
2966 2772
2967/* ------------------------------------------------------------------------- */ 2773/* ------------------------------------------------------------------------- */
2968/* 2774/*
2969 * Copy a selection into the cut buffer 2775 * Copy a selection into the cut buffer
2970 * EXT: button 1 or 3 release 2776 * EXT: button 1 or 3 release
2971 */ 2777 */
2972void 2778void
2973rxvt_term::selection_make (Time tm) 2779rxvt_term::selection_make (Time tm)
2974{ 2780{
2975 int i; 2781 int size;
2976 wchar_t *new_selection_text; 2782 wchar_t *new_selection_text;
2977 text_t *t; 2783 text_t *t;
2978 2784
2979 switch (selection.op) 2785 switch (selection.op)
2980 { 2786 {
… …
2996 return; /* nothing selected, go away */ 2802 return; /* nothing selected, go away */
2997 2803
2998 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2804 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2999 return; 2805 return;
3000 2806
3001 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2807 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3002 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2808 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3003 2809
3004 int ofs = 0; 2810 int ofs = 0;
3005 int extra = 0; 2811 int extra = 0;
3006 2812
3007 int col = selection.beg.col; 2813 int col = selection.beg.col;
… …
3013 { 2819 {
3014#if !ENABLE_MINIMAL 2820#if !ENABLE_MINIMAL
3015 if (selection.rect) 2821 if (selection.rect)
3016 { 2822 {
3017 col = selection.beg.col; 2823 col = selection.beg.col;
3018 end_col = ncol + 1; 2824 end_col = selection.end.col;
3019 } 2825 }
3020 else 2826 else
3021#endif 2827#endif
3022 end_col = ROW(row).l; 2828 end_col = ROW(row).l;
3023 2829
3024 col = max (col, 0); 2830 col = max (col, 0);
3025 2831
3026 if (row == selection.end.row 2832 if (row == selection.end.row)
3027#if !ENABLE_MINIMAL
3028 || selection.rect
3029#endif
3030 )
3031 min_it (end_col, selection.end.col); 2833 min_it (end_col, selection.end.col);
3032 2834
3033 t = ROW(row).t + col; 2835 t = ROW(row).t + col;
3034 2836
3035 for (; col < end_col; col++) 2837 for (; col < end_col; col++)
… …
3043 2845
3044 extra -= (len - 1); 2846 extra -= (len - 1);
3045 2847
3046 if (extra < 0) 2848 if (extra < 0)
3047 { 2849 {
3048 extra += i; 2850 extra += size;
3049 i += i; 2851 size += size;
3050 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2852 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3051 } 2853 }
3052 2854
3053 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2855 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3054 } 2856 }
3055#endif 2857#endif
… …
3067 2869
3068 new_selection_text[ofs++] = C0_LF; 2870 new_selection_text[ofs++] = C0_LF;
3069 } 2871 }
3070 else 2872 else
3071#endif 2873#endif
3072 if (!ROW(row).is_longer () && row != selection.end.row) 2874 if (!ROW(row).is_longer ()
2875 && (row != selection.end.row || end_col != selection.end.col)
2876 && (row != selection.beg.row || selection.beg.col < ncol))
3073 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3074 } 2878 }
3075
3076 if (end_col != selection.end.col)
3077 new_selection_text[ofs++] = C0_LF;
3078 2879
3079 new_selection_text[ofs] = 0; 2880 new_selection_text[ofs] = 0;
3080 2881
3081 if (ofs == 0) 2882 if (ofs == 0)
3082 { 2883 {
… …
3095 2896
3096 selection_grab (tm); 2897 selection_grab (tm);
3097} 2898}
3098 2899
3099bool 2900bool
3100rxvt_term::selection_grab (Time tm) NOTHROW 2901rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3101{ 2902{
2903 Atom sel;
2904
2905 if (!clipboard)
2906 {
3102 selection_time = tm; 2907 selection_time = tm;
2908 sel = XA_PRIMARY;
2909 }
2910 else
2911 {
2912 clipboard_time = tm;
2913 sel = xa[XA_CLIPBOARD];
2914 }
3103 2915
3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2916 XSetSelectionOwner (dpy, sel, vt, tm);
3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2917 if (XGetSelectionOwner (dpy, sel) == vt)
3106 { 2918 {
3107 display->set_selection_owner (this); 2919 display->set_selection_owner (this, clipboard);
3108 return true; 2920 return true;
3109 } 2921 }
3110 else 2922 else
3111 { 2923 {
3112 selection_clear (); 2924 selection_clear (clipboard);
3113 return false; 2925 return false;
3114 } 2926 }
3115 2927
3116#if 0 2928#if 0
3117 XTextProperty ct; 2929 XTextProperty ct;
… …
3577 * EXT: SelectionRequest 3389 * EXT: SelectionRequest
3578 */ 3390 */
3579void 3391void
3580rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3581{ 3393{
3394 Atom property = rq.property == None ? rq.target : rq.property;
3582 XSelectionEvent ev; 3395 XSelectionEvent ev;
3583 3396
3584 ev.type = SelectionNotify; 3397 ev.type = SelectionNotify;
3585 ev.property = None; 3398 ev.property = None;
3586 ev.display = rq.display; 3399 ev.display = rq.display;
… …
3601 *target++ = xa[XA_COMPOUND_TEXT]; 3414 *target++ = xa[XA_COMPOUND_TEXT];
3602#if X_HAVE_UTF8_STRING 3415#if X_HAVE_UTF8_STRING
3603 *target++ = xa[XA_UTF8_STRING]; 3416 *target++ = xa[XA_UTF8_STRING];
3604#endif 3417#endif
3605 3418
3606 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3419 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3607 32, PropModeReplace, 3420 32, PropModeReplace,
3608 (unsigned char *)target_list, target - target_list); 3421 (unsigned char *)target_list, target - target_list);
3609 ev.property = rq.property; 3422 ev.property = property;
3610 } 3423 }
3611#if TODO // TODO 3424#if TODO // TODO
3612 else if (rq.target == xa[XA_MULTIPLE]) 3425 else if (rq.target == xa[XA_MULTIPLE])
3613 { 3426 {
3614 /* TODO: Handle MULTIPLE */ 3427 /* TODO: Handle MULTIPLE */
3615 } 3428 }
3616#endif 3429#endif
3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3430 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3618 { 3431 {
3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3432 XChangeProperty (dpy, rq.requestor, property, rq.target,
3620 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3433 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3621 ev.property = rq.property; 3434 ev.property = property;
3435 }
3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3437 {
3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3439 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3440 ev.property = property;
3622 } 3441 }
3623 else if (rq.target == XA_STRING 3442 else if (rq.target == XA_STRING
3624 || rq.target == xa[XA_TEXT] 3443 || rq.target == xa[XA_TEXT]
3625 || rq.target == xa[XA_COMPOUND_TEXT] 3444 || rq.target == xa[XA_COMPOUND_TEXT]
3626 || rq.target == xa[XA_UTF8_STRING] 3445 || rq.target == xa[XA_UTF8_STRING]
… …
3658 { 3477 {
3659 target = xa[XA_COMPOUND_TEXT]; 3478 target = xa[XA_COMPOUND_TEXT];
3660 style = enc_compound_text; 3479 style = enc_compound_text;
3661 } 3480 }
3662 3481
3663 if (selection.text) 3482 if (rq.selection == XA_PRIMARY && selection.text)
3664 { 3483 {
3665 cl = selection.text; 3484 cl = selection.text;
3666 selectlen = selection.len; 3485 selectlen = selection.len;
3486 }
3487 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3488 {
3489 cl = selection.clip_text;
3490 selectlen = selection.clip_len;
3667 } 3491 }
3668 else 3492 else
3669 { 3493 {
3670 cl = L""; 3494 cl = L"";
3671 selectlen = 0; 3495 selectlen = 0;
… …
3692 ct.value = (unsigned char *)cl; 3516 ct.value = (unsigned char *)cl;
3693 ct.nitems = selectlen; 3517 ct.nitems = selectlen;
3694 ct.encoding = target; 3518 ct.encoding = target;
3695 } 3519 }
3696 3520
3697 XChangeProperty (dpy, rq.requestor, rq.property, 3521 XChangeProperty (dpy, rq.requestor, property,
3698 ct.encoding, 8, PropModeReplace, 3522 ct.encoding, 8, PropModeReplace,
3699 ct.value, (int)ct.nitems); 3523 ct.value, (int)ct.nitems);
3700 ev.property = rq.property; 3524 ev.property = property;
3701 3525
3702 if (freect) 3526 if (freect)
3703 XFree (ct.value); 3527 XFree (ct.value);
3704 } 3528 }
3705 3529

Diff Legend

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