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.300 by ayin, Sun Jan 27 22:48:33 2008 UTC vs.
Revision 1.363 by sf-exg, Thu Jan 20 14:02:35 2011 UTC

… …
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
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 87
87/* 88/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 90 */
92#define CLEAR_ROWS(row, num) \
93 if (mapped) \
94 XClearArea (dpy, vt, 0, \
95 Row2Pixel (row), (unsigned int)width, \
96 (unsigned int)Height2Pixel (num), False)
97
98#define CLEAR_CHARS(x, y, num) \ 91#define CLEAR_CHARS(x, y, num) \
99 if (mapped) \ 92 if (mapped) \
100 XClearArea (dpy, vt, x, y, \ 93 XClearArea (dpy, vt, x, y, \
101 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
102 (unsigned int)Height2Pixel (1), False) 95 (unsigned int)Height2Pixel (1), False)
103 96
104#define ERASE_ROWS(row, num) \
105 XFillRectangle (dpy, vt, gc, \
106 0, Row2Pixel (row), \
107 (unsigned int)width, \
108 (unsigned int)Height2Pixel (num))
109
110/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
111 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
112 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
113 100
114/* Fill part/all of a line with blanks. */ 101/* Fill part/all of a line with blanks. */
… …
146 133
147 l.l = 0; 134 l.l = 0;
148 l.f = 0; 135 l.f = 0;
149} 136}
150 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
157}
158
151/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
152 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
153 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
154 162
155void 163void
156rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
157{ 165{
158#if ENABLE_OVERLAY
159 scr_overlay_off ();
160#endif
161
162 rvideo_mode = false;
163 view_start = 0; 166 view_start = 0;
164 num_scr = 0; 167 num_scr = 0;
165 168
166 if (ncol == 0) 169 if (ncol == 0)
167 ncol = 80; 170 ncol = 80;
… …
169 if (nrow == 0) 172 if (nrow == 0)
170 nrow = 24; 173 nrow = 24;
171 174
172 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 176 return;
174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177 177
178 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
179 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
180 { 180 {
181 //TODO//FIXME 181 //TODO//FIXME
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
239 } 241 }
240 else 242 else
241 { 243 {
242 /* 244 /*
243 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
281 283
282 if (top_row) 284 if (top_row)
283 { 285 {
284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
285 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
286 289
287 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 292
290 do 293 do
291 { 294 {
292 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
293#ifdef DEBUG_STRICT
294 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
295#endif
296 int plines = 1; 297 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 299
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 301 {
… …
394 delete old_ta; 395 delete old_ta;
395 delete old_ra; 396 delete old_ra;
396 397
397 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
398 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
399 401
400 free (tabs); 402 free (tabs);
401 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0;
402 407
403 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
404 409
405 prev_nrow = nrow; 410 prev_nrow = nrow;
406 prev_ncol = ncol; 411 prev_ncol = ncol;
407
408 tabs = (char *)rxvt_malloc (ncol);
409
410 for (int col = ncol; --col; )
411 tabs [col] = col % TABSIZE == 0;
412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415 412
416 tt_winch (); 413 tt_winch ();
417 414
418 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419} 416}
… …
431 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
432 429
433 free (row_buf); 430 free (row_buf);
434 free (swap_buf); 431 free (swap_buf);
435 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
436 free (tabs); 435 free (tabs);
437 436 tabs = 0;
438 row_buf = 0; // signal that we freed all the arrays
439 } 437 }
440} 438}
441 439
442/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
443/* 441/*
444 * Hard reset 442 * Hard/Soft reset
445 */ 443 */
446void 444void
447rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
448{ 446{
449 scr_release (); 447 scr_release ();
450 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
451 scr_reset (); 451 scr_reset ();
452 452
453 scr_clear (true); 453 scr_clear (true);
454 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
455} 471}
456 472
457/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
497 } 513 }
498 514
499 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
500 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
501 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
502#ifdef DEBUG_STRICT
503 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
505#endif
506} 520}
507 521
508void 522void
509rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
510{ 524{
… …
535 want_refresh = 1; 549 want_refresh = 1;
536 view_start = 0; 550 view_start = 0;
537 551
538 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
539 553
540 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
541 555
542#if NSCREENS 556#if NSCREENS
543 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
544 { 558 {
545 num_scr = 0; 559 num_scr = 0;
… …
770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
772 } 786 }
773 } 787 }
774 788
775#ifdef DEBUG_STRICT
776 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
777 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
778 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
779#endif
780 int row = screen.cur.row; 792 int row = screen.cur.row;
781 793
782 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783 795
784 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
785 797
786 while (str < strend) 798 while (str < strend)
787 { 799 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 801
790 if (c < 0x20) 802 if (expect_false (c < 0x20))
791 if (c == C0_LF) 803 if (c == C0_LF)
792 { 804 {
793 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
794 806
795 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
814 { 826 {
815 scr_tab (1, true); 827 scr_tab (1, true);
816 continue; 828 continue;
817 } 829 }
818 830
831 if (expect_false (
819 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
822 { 836 {
823 checksel = 0; 837 checksel = 0;
824 /* 838 /*
825 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 841 * should be a similar check.
828 */ 842 */
829 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
830 } 844 }
831 845
832 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
833 { 847 {
834 scr_do_wrap (); 848 scr_do_wrap ();
835 849
836 line->l = ncol; 850 line->l = ncol;
837 line->is_longer (1); 851 line->is_longer (1);
… …
839 row = screen.cur.row; 853 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
841 } 855 }
842 856
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 859 c = 0xfffd;
846 860
847 // rely on wcwidth to tell us the character width, do wcwidth before 861 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 862 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
850 // locale. 864 // locale.
851 int width = WCWIDTH (c); 865 int width = WCWIDTH (c);
852 866
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 868 {
855 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 870 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
873 } 887 }
874 } 888 }
875 889
876 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
878 892
879 if (width != 0) 893 if (width != 0)
880 { 894 {
881#if !UNICODE_3 895#if !UNICODE_3
… …
886# else 900# else
887 c = 0xfffd; 901 c = 0xfffd;
888# endif 902# endif
889#endif 903#endif
890 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
891 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
892 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
893 || (screen.cur.col < ncol - 1 926 scr_kill_char (*line, screen.cur.col);
894 && line->t[screen.cur.col + 1] == NOCHAR))
895 {
896 int col = screen.cur.col;
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' ';
919 // and try the same character next loop iteration
920 --str;
921 }
922 927
923 line->touch (); 928 line->touch ();
924 929
925 do 930 do
926 { 931 {
927 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
929 934
930 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
931 screen.cur.col++; 936 screen.cur.col++;
932 else 937 else
933 { 938 {
934 line->l = ncol; 939 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
936 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
937 break; 942
943 goto end_of_line;
938 } 944 }
939 945
940 c = NOCHAR; 946 c = NOCHAR;
941 } 947 }
942 while (--width > 0); 948 while (expect_false (--width > 0));
943 949
944 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
946 { 952 {
947 line->touch (); 953 line->t[c] = ' ';
954 line->r[c] = rend;
955 }
948 956
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 957end_of_line:
958 ;
959 }
960#if ENABLE_COMBINING
961 else // width == 0
962 {
963 if (c != 0xfeff) // ignore BOM
964 {
965 // handle combining characters
966 // we just tag the accent on the previous on-screen character.
967 // this is arguably not correct, but also arguably not wrong.
968 // we don't handle double-width characters nicely yet.
969 line_t *linep;
970 text_t *tp;
971 rend_t *rp;
972
973 if (screen.cur.col > 0)
950 { 974 {
951 line->t[c] = ' ';
952 line->r[c] = rend; 975 linep = line;
976 tp = line->t + screen.cur.col - 1;
977 rp = line->r + screen.cur.col - 1;
953 } 978 }
979 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ())
981 {
982 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1;
984 rp = line->r + ncol - 1;
985 }
986 else
987 continue;
988
989 linep->touch ();
990
991 while (*tp == NOCHAR && tp > linep->t)
992 tp--, rp--;
993
994 // first try to find a precomposed character
995 unicode_t n = rxvt_compose (*tp, c);
996 if (n == NOCHAR)
997 n = rxvt_composite.compose (*tp, c);
998
999 *tp = n;
1000 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954 } 1001 }
955 } 1002 }
956 else // width == 0
957 {
958#if ENABLE_COMBINING
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
969 linep = line;
970 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 1003#endif
996 }
997 } 1004 }
998 1005
999 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1000 1007
1001#ifdef DEBUG_STRICT
1002 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1003#endif
1004} 1009}
1005 1010
1006/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1007/* 1012/*
1008 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1021 1026
1022 want_refresh = 1; 1027 want_refresh = 1;
1023#endif 1028#endif
1024 } 1029 }
1025 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1026 else 1033 else
1027 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1028} 1035}
1029 1036
1030/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1225/* 1232/*
1226 * Erase part or whole of a line 1233 * Erase part or whole of a line
1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1236 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1237 * extension: clear to right unless wrapped: ESC [ 3 K
1230 */ 1238 */
1231void 1239void
1232rxvt_term::scr_erase_line (int mode) NOTHROW 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1233{ 1241{
1234 unsigned int col, num; 1242 unsigned int col, num;
… …
1243 line.touch (); 1251 line.touch ();
1244 line.is_longer (0); 1252 line.is_longer (0);
1245 1253
1246 switch (mode) 1254 switch (mode)
1247 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1248 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1249 col = screen.cur.col; 1263 col = screen.cur.col;
1250 num = ncol - col; 1264 num = ncol - col;
1251 min_it (line.l, col); 1265 min_it (line.l, col);
1266
1252 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1255 break; 1270 break;
1271
1256 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1257 col = 0; 1273 col = 0;
1258 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1259 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1262 break; 1279 break;
1280
1263 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1264 col = 0; 1282 col = 0;
1265 num = ncol; 1283 num = ncol;
1266 line.l = 0; 1284 line.l = 0;
1267 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
… …
1325 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1326 return; 1344 return;
1327 1345
1328 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1329 1347
1330 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1331 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1332 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1333 { 1351 {
1334 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1335 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1336 } 1358 }
1337 else 1359 else
1338 { 1360 {
1339 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1343 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1345 } 1374 }
1346 1375
1347 for (; num--; row++) 1376 for (; num--; row++)
1348 { 1377 {
1349 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1350 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1351 } 1382 }
1352} 1383}
1353 1384
1354#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1355void 1386void
… …
1429 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1430 */ 1461 */
1431void 1462void
1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433{ 1464{
1434 int col, row;
1435 rend_t tr;
1436
1437 want_refresh = 1; 1465 want_refresh = 1;
1438 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1439 1467
1440 if (count <= 0) 1468 if (count <= 0)
1441 return; 1469 return;
… …
1443 scr_do_wrap (); 1471 scr_do_wrap ();
1444 1472
1445 selection_check (1); 1473 selection_check (1);
1446 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1447 1475
1448 row = screen.cur.row; 1476 int row = screen.cur.row;
1449 1477
1450 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1451 1479
1452 line->touch (); 1480 line->touch ();
1453 line->is_longer (0); 1481 line->is_longer (0);
1454 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1455 switch (insdel) 1487 switch (insdel)
1456 { 1488 {
1457 case INSERT: 1489 case INSERT:
1458 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1490 line->l = min (line->l + count, ncol);
1491
1492 if (line->t[screen.cur.col] == NOCHAR)
1493 scr_kill_char (*line, screen.cur.col);
1494
1495 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1459 { 1496 {
1460 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1461 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1462 } 1499 }
1463
1464 line->l = min (line->l + count, ncol);
1465 1500
1466 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468 { 1503 {
1469 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
… …
1484 case ERASE: 1519 case ERASE:
1485 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1486 selection_check (1); 1521 selection_check (1);
1487 screen.cur.col -= count; 1522 screen.cur.col -= count;
1488 1523
1489 line->l = max (line->l - count, 0); 1524 // nuke wide char after the end
1525 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col + count);
1527
1490 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1491 break; 1529 break;
1492 1530
1493 case DELETE: 1531 case DELETE:
1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1495 1533
1534 // nuke wide char spanning the end
1535 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1536 scr_kill_char (*line, screen.cur.col + count);
1537
1496 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1497 { 1539 {
1498 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1499 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1500 } 1542 }
1501 1543
1502 line->l = max (line->l - count, 0);
1503 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1504 1545
1505 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507 { 1548 {
1508 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1798 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1799 { 1840 {
1800 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1801 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1802 } 1843 }
1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1804 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1805 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1806 1847
1807 num_scr_allow = 0; 1848 num_scr_allow = 0;
1808 1849
… …
1886 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1887# endif 1928# endif
1888 1929
1889# if ENABLE_FRILLS 1930# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell)) 1931 if (option (Opt_urgentOnBell))
1891 { 1932 set_urgency (1);
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1897 }
1898# endif 1933# endif
1899 1934
1900 if (option (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1901 { 1936 {
1902 rvideo_bell = true; 1937 rvideo_bell = true;
… …
1905 1940
1906 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1907 } 1942 }
1908 else 1943 else
1909 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1910#endif 1946#endif
1911} 1947}
1912 1948
1913/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1914/* ARGSUSED */ 1950/* ARGSUSED */
1915void 1951void
1916rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917{ 1953{
1918#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1919 int nrows, row_start; 1955 int nrows, row_start;
1920 FILE *fd; 1956 FILE *fd = popen_printer ();
1921 1957
1922 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1923 return; 1959 return;
1924 1960
1925 if (fullhist) 1961 if (fullhist)
1926 { 1962 {
1927 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1933 row_start = view_start; 1969 row_start = view_start;
1934 } 1970 }
1935 1971
1936 wctomb (0, 0); 1972 wctomb (0, 0);
1937 1973
1938 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1939 { 1975 {
1940 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1941 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1942 1978
1943 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1972 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1973 */ 2009 */
1974void 2010void
1975rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1976{ 2012{
1977 unsigned char have_bg,
1978 showcursor; /* show the cursor */
1979 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1980 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1981 int i; /* tmp */ 2015 int i; /* tmp */
1982#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1983 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
1992 return; 2026 return;
1993 2027
1994 /* 2028 /*
1995 * A: set up vars 2029 * A: set up vars
1996 */ 2030 */
1997 have_bg = 0;
1998 refresh_count = 0; 2031 refresh_count = 0;
1999 2032
2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2000#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2001 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2002#endif 2037#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2039
2005 /* 2040 /*
2006 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2007 */ 2042 */
2008 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2009 2051
2010 /* 2052 /*
2011 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2012 */ 2054 */
2013 { 2055 {
2014 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2015 2057
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2059 if (hidden_cursor)
2019 showcursor = 0; 2060 showcursor = 0;
2020#endif 2061#endif
2021 2062
… …
2049 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2050#else 2091#else
2051 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2052#endif 2093#endif
2053 2094
2054 if (showcursor && focus) 2095 if (focus)
2055 { 2096 {
2056 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2058 else 2099 else
2059 { 2100 {
… …
2094 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2095 } 2136 }
2096 } 2137 }
2097 } 2138 }
2098 2139
2099 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100#if ENABLE_OVERLAY
2101 scr_swap_overlay ();
2102#endif
2103
2104#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2105 /* 2141 /*
2106 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2107 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2108 */ 2144 */
… …
2197 continue; 2233 continue;
2198 2234
2199 // redraw one or more characters 2235 // redraw one or more characters
2200 2236
2201 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2203 --col; 2239 --col;
2204 2240
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206 text_t *text = stp + col; 2242 text_t *text = stp + col;
2207 int count = 1; 2243 int count = 1;
2208 2244
2209 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2210 drp[col] = rend; 2246 drp[col] = rend;
… …
2214 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2215 { 2251 {
2216 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2217 { 2253 {
2218 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2219 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2220 count++; 2257 count++;
2221 i++; 2258 i++;
2222 2259
2223 continue; 2260 continue;
2224 } 2261 }
… …
2244 2281
2245 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2247 2284
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2250 count++, i--; 2287 count++, i--;
2251 2288
2252 /* 2289 /*
2253 * Determine the attributes for the string 2290 * Determine the attributes for the string
2254 */ 2291 */
2255 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2257 2294
2258 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2260 { 2297 {
2261 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2262 2299
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2283 2320
2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 fore = Color_UL; 2322 fore = Color_UL;
2286#endif 2323#endif
2287 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2288 if (invert) 2345 if (invert)
2289 { 2346 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2296 ::swap (fore, back); 2347 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2301 2348
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV;
2306# endif
2307 if (fore == back) 2350 if (fore == back)
2308 { 2351 {
2309 fore = Color_bg; 2352 fore = Color_bg;
2310 back = Color_fg; 2353 back = Color_fg;
2311 } 2354 }
… …
2347 /* 2390 /*
2348 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2349 */ 2392 */
2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351 2394
2352 if (have_bg && back == Color_bg) 2395 if (expect_true (have_bg && back == Color_bg))
2353 { 2396 {
2354 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2355 2398
2356 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2357 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2364 did_clear: ; 2407 did_clear: ;
2365 } 2408 }
2366 else 2409 else
2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368 2411
2369 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2370 { 2413 {
2371#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2372 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2373 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374 else 2417 else
… …
2379 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2381 } 2424 }
2382 } /* for (col....) */ 2425 } /* for (col....) */
2383 } /* for (row....) */ 2426 } /* for (row....) */
2384
2385#if ENABLE_OVERLAY
2386 scr_swap_overlay ();
2387#endif
2388 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2389 2427
2390 /* 2428 /*
2391 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2392 */ 2430 */
2393 if (showcursor) 2431 if (showcursor)
… …
2432 } 2470 }
2433 2471
2434 /* 2472 /*
2435 * H: cleanup selection 2473 * H: cleanup selection
2436 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2437 scr_reverse_selection (); 2480 scr_reverse_selection ();
2438 2481
2482 screen.flags = old_screen_flags;
2439 num_scr = 0; 2483 num_scr = 0;
2440 num_scr_allow = 1; 2484 num_scr_allow = 1;
2441} 2485}
2442 2486
2443void 2487void
… …
2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2476 XClearWindow (dpy, parent[0]); 2520 XClearWindow (dpy, parent[0]);
2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2478 2522
2479 if (scrollBar.win) 2523 if (scrollBar.win)
2480 { 2524 {
2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482 scrollBar.setIdle (); 2526 scrollBar.state = STATE_IDLE;
2483 scrollbar_show (0); 2527 scrollBar.show (0);
2484 } 2528 }
2485 2529
2530#endif
2531
2532 /* bgPixmap.apply () does not do the following : */
2486 scr_clear (); 2533 scr_clear ();
2487 scr_touch (true); 2534 scr_touch (true);
2488 want_refresh = 1; 2535 want_refresh = 1;
2489
2490#endif
2491} 2536}
2492 2537
2493/* ------------------------------------------------------------------------- */ 2538/* ------------------------------------------------------------------------- */
2494void 2539void
2495rxvt_term::scr_clear (bool really) NOTHROW 2540rxvt_term::scr_clear (bool really) NOTHROW
… …
2562 { 2607 {
2563#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2564 if (selection.rect) 2609 if (selection.rect)
2565 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2566 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2567 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2568 else 2613 else
2569#endif 2614#endif
2570 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2571 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2572 RS_RVid); 2617 RS_Sel | RS_RVid);
2573 } 2618 }
2574} 2619}
2575 2620
2576/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2577/* 2622/*
… …
2582void 2627void
2583rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2584{ 2629{
2585 int row, wrote; 2630 int row, wrote;
2586 unsigned int width, towrite; 2631 unsigned int width, towrite;
2587 char r1[] = "\n"; 2632 const char r1[] = "\n";
2588 2633
2589 for (row = saveLines - nsaved; 2634 for (row = saveLines + top_row;
2590 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2591 { 2636 {
2592 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
2593 : ncol; 2638 : ncol;
2594 for (towrite = width; towrite; towrite -= wrote) 2639 for (towrite = width; towrite; towrite -= wrote)
… …
2638/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2639/* 2684/*
2640 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2641 */ 2686 */
2642void 2687void
2643rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2644{ 2689{
2645 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2646 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2647 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2648 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2652 2697
2653 tt_write (data, len); 2698 tt_write (data, len);
2654 2699
2655 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2656 tt_printf ("\e[201~"); 2701 tt_printf ("\e[201~");
2702}
2703
2704void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{
2707 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 return;
2709
2710 tt_paste (data, len);
2657} 2711}
2658 2712
2659/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2660/* 2714/*
2661 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2718 &ct2.nitems, &bytes_after, 2772 &ct2.nitems, &bytes_after,
2719 &ct2.value) != Success) 2773 &ct2.value) != Success)
2720 goto bailout; 2774 goto bailout;
2721 2775
2722 // realloc should be compatible to XFree, here, and elsewhere, too 2776 // realloc should be compatible to XFree, here, and elsewhere, too
2723 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2777 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2724 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2725 ct.nitems += ct2.nitems; 2779 ct.nitems += ct2.nitems;
2726 2780
2727 XFree (ct2.value); 2781 XFree (ct2.value);
2728 } 2782 }
… …
2777 incr_ev.start (10); 2831 incr_ev.start (10);
2778 2832
2779 while (incr_buf_fill + ct.nitems > incr_buf_size) 2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2780 { 2834 {
2781 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2782 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2836 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2783 } 2837 }
2784 2838
2785 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2786 incr_buf_fill += ct.nitems; 2840 incr_buf_fill += ct.nitems;
2787 2841
… …
2870 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2871 2925
2872#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2873 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2875 return; 2929 return;
2876#else 2930#else
2877 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2879 return; 2933 return;
2880#endif 2934#endif
2881 } 2935 }
2882 2936
2883 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2884 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2912/* 2966/*
2913 * Clear all selected text 2967 * Clear all selected text
2914 * EXT: SelectionClear 2968 * EXT: SelectionClear
2915 */ 2969 */
2916void 2970void
2917rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2918{ 2972{
2973 if (!clipboard)
2974 {
2919 want_refresh = 1; 2975 want_refresh = 1;
2920 free (selection.text); 2976 free (selection.text);
2921 selection.text = NULL; 2977 selection.text = NULL;
2922 selection.len = 0; 2978 selection.len = 0;
2923 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2924 2980
2925 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2926 display->selection_owner = 0; 2982 display->selection_owner = 0;
2983 }
2984 else
2985 {
2986 free (selection.clip_text);
2987 selection.clip_text = NULL;
2988 selection.clip_len = 0;
2989
2990 if (display->clipboard_owner == this)
2991 display->clipboard_owner = 0;
2992 }
2927} 2993}
2928 2994
2929/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2930/* 2996/*
2931 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
2932 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
2933 */ 2999 */
2934void 3000void
2935rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
2936{ 3002{
2937 int i; 3003 int size;
2938 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
2939 text_t *t; 3005 text_t *t;
2940 3006
2941 switch (selection.op) 3007 switch (selection.op)
2942 { 3008 {
… …
2958 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
2959 3025
2960 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2961 return; 3027 return;
2962 3028
2963 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2964 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3030 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2965 3031
2966 int ofs = 0; 3032 int ofs = 0;
2967 int extra = 0; 3033 int extra = 0;
2968 3034
2969 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
2975 { 3041 {
2976#if !ENABLE_MINIMAL 3042#if !ENABLE_MINIMAL
2977 if (selection.rect) 3043 if (selection.rect)
2978 { 3044 {
2979 col = selection.beg.col; 3045 col = selection.beg.col;
2980 end_col = ncol + 1; 3046 end_col = selection.end.col;
2981 } 3047 }
2982 else 3048 else
2983#endif 3049#endif
2984 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
2985 3051
2986 col = max (col, 0); 3052 col = max (col, 0);
2987 3053
2988 if (row == selection.end.row 3054 if (row == selection.end.row)
2989#if !ENABLE_MINIMAL
2990 || selection.rect
2991#endif
2992 )
2993 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
2994 3056
2995 t = ROW(row).t + col; 3057 t = ROW(row).t + col;
2996 3058
2997 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
… …
3005 3067
3006 extra -= (len - 1); 3068 extra -= (len - 1);
3007 3069
3008 if (extra < 0) 3070 if (extra < 0)
3009 { 3071 {
3010 extra += i; 3072 extra += size;
3011 i += i; 3073 size += size;
3012 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3013 } 3075 }
3014 3076
3015 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3016 } 3078 }
3017#endif 3079#endif
… …
3029 3091
3030 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3031 } 3093 }
3032 else 3094 else
3033#endif 3095#endif
3034 if (!ROW(row).is_longer () && row != selection.end.row) 3096 if (!ROW(row).is_longer ()
3097 && (row != selection.end.row || end_col != selection.end.col)
3098 && (row != selection.beg.row || selection.beg.col < ncol))
3035 new_selection_text[ofs++] = C0_LF; 3099 new_selection_text[ofs++] = C0_LF;
3036 } 3100 }
3037
3038 if (end_col != selection.end.col)
3039 new_selection_text[ofs++] = C0_LF;
3040 3101
3041 new_selection_text[ofs] = 0; 3102 new_selection_text[ofs] = 0;
3042 3103
3043 if (ofs == 0) 3104 if (ofs == 0)
3044 { 3105 {
… …
3057 3118
3058 selection_grab (tm); 3119 selection_grab (tm);
3059} 3120}
3060 3121
3061bool 3122bool
3062rxvt_term::selection_grab (Time tm) NOTHROW 3123rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3063{ 3124{
3125 Atom sel;
3126
3127 if (!clipboard)
3128 {
3064 selection_time = tm; 3129 selection_time = tm;
3130 sel = XA_PRIMARY;
3131 }
3132 else
3133 {
3134 clipboard_time = tm;
3135 sel = xa[XA_CLIPBOARD];
3136 }
3065 3137
3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3138 XSetSelectionOwner (dpy, sel, vt, tm);
3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3139 if (XGetSelectionOwner (dpy, sel) == vt)
3068 { 3140 {
3069 display->set_selection_owner (this); 3141 display->set_selection_owner (this, clipboard);
3070 return true; 3142 return true;
3071 } 3143 }
3072 else 3144 else
3073 { 3145 {
3074 selection_clear (); 3146 selection_clear (clipboard);
3075 return false; 3147 return false;
3076 } 3148 }
3077 3149
3078#if 0 3150#if 0
3079 XTextProperty ct; 3151 XTextProperty ct;
… …
3574 else if (rq.target == xa[XA_MULTIPLE]) 3646 else if (rq.target == xa[XA_MULTIPLE])
3575 { 3647 {
3576 /* TODO: Handle MULTIPLE */ 3648 /* TODO: Handle MULTIPLE */
3577 } 3649 }
3578#endif 3650#endif
3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3651 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3580 { 3652 {
3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3653 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3582 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3654 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3655 ev.property = rq.property;
3656 }
3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3658 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3583 ev.property = rq.property; 3661 ev.property = rq.property;
3584 } 3662 }
3585 else if (rq.target == XA_STRING 3663 else if (rq.target == XA_STRING
3586 || rq.target == xa[XA_TEXT] 3664 || rq.target == xa[XA_TEXT]
3587 || rq.target == xa[XA_COMPOUND_TEXT] 3665 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3620 { 3698 {
3621 target = xa[XA_COMPOUND_TEXT]; 3699 target = xa[XA_COMPOUND_TEXT];
3622 style = enc_compound_text; 3700 style = enc_compound_text;
3623 } 3701 }
3624 3702
3625 if (selection.text) 3703 if (rq.selection == XA_PRIMARY && selection.text)
3626 { 3704 {
3627 cl = selection.text; 3705 cl = selection.text;
3628 selectlen = selection.len; 3706 selectlen = selection.len;
3707 }
3708 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3709 {
3710 cl = selection.clip_text;
3711 selectlen = selection.clip_len;
3629 } 3712 }
3630 else 3713 else
3631 { 3714 {
3632 cl = L""; 3715 cl = L"";
3633 selectlen = 0; 3716 selectlen = 0;
… …
3701 h += 2; min_it (h, nrow); 3784 h += 2; min_it (h, nrow);
3702 3785
3703 x -= 1; clamp_it (x, 0, ncol - w); 3786 x -= 1; clamp_it (x, 0, ncol - w);
3704 y -= 1; clamp_it (y, 0, nrow - h); 3787 y -= 1; clamp_it (y, 0, nrow - h);
3705 3788
3706 ov_x = x; ov_y = y; 3789 ov.x = x; ov.y = y;
3707 ov_w = w; ov_h = h; 3790 ov.w = w; ov.h = h;
3708 3791
3709 ov_text = new text_t *[h]; 3792 ov.text = new text_t *[h];
3710 ov_rend = new rend_t *[h]; 3793 ov.rend = new rend_t *[h];
3711 3794
3712 for (y = 0; y < h; y++) 3795 for (y = 0; y < h; y++)
3713 { 3796 {
3714 text_t *tp = ov_text[y] = new text_t[w]; 3797 text_t *tp = ov.text[y] = new text_t[w];
3715 rend_t *rp = ov_rend[y] = new rend_t[w]; 3798 rend_t *rp = ov.rend[y] = new rend_t[w];
3716 3799
3717 text_t t0, t1, t2; 3800 text_t t0, t1, t2;
3718 rend_t r = OVERLAY_RSTYLE; 3801 rend_t r = OVERLAY_RSTYLE;
3719 3802
3720 if (y == 0) 3803 if (y == 0)
… …
3739} 3822}
3740 3823
3741void 3824void
3742rxvt_term::scr_overlay_off () NOTHROW 3825rxvt_term::scr_overlay_off () NOTHROW
3743{ 3826{
3744 if (!ov_text) 3827 if (!ov.text)
3745 return; 3828 return;
3746 3829
3747 want_refresh = 1; 3830 want_refresh = 1;
3748 3831
3749 for (int y = 0; y < ov_h; y++) 3832 for (int y = 0; y < ov.h; y++)
3750 { 3833 {
3751 delete [] ov_text[y]; 3834 delete [] ov.text[y];
3752 delete [] ov_rend[y]; 3835 delete [] ov.rend[y];
3753 } 3836 }
3754 3837
3755 delete [] ov_text; ov_text = 0; 3838 delete [] ov.text; ov.text = 0;
3756 delete [] ov_rend; ov_rend = 0; 3839 delete [] ov.rend; ov.rend = 0;
3757} 3840}
3758 3841
3759void 3842void
3760rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3843rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3761{ 3844{
3762 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3845 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3763 return; 3846 return;
3764 3847
3765 x++, y++; 3848 x++, y++;
3766 3849
3767 ov_text[y][x] = text; 3850 ov.text[y][x] = text;
3768 ov_rend[y][x] = rend; 3851 ov.rend[y][x] = rend;
3769} 3852}
3770 3853
3771void 3854void
3772rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3855rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3773{ 3856{
… …
3792} 3875}
3793 3876
3794void 3877void
3795rxvt_term::scr_swap_overlay () NOTHROW 3878rxvt_term::scr_swap_overlay () NOTHROW
3796{ 3879{
3797 if (!ov_text) 3880 if (!ov.text)
3798 return; 3881 return;
3799 3882
3883 // hide cursor if it is within the overlay area
3884 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3885 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3886 screen.flags &= ~Screen_VisibleCursor;
3887
3800 // swap screen mem with overlay 3888 // swap screen mem with overlay
3801 for (int y = ov_h; y--; ) 3889 for (int y = ov.h; y--; )
3802 { 3890 {
3803 text_t *t1 = ov_text[y]; 3891 text_t *t1 = ov.text[y];
3804 rend_t *r1 = ov_rend[y]; 3892 rend_t *r1 = ov.rend[y];
3805 3893
3806 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3894 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3807 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3895 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3808 3896
3809 for (int x = ov_w; x--; ) 3897 for (int x = ov.w; x--; )
3810 { 3898 {
3811 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3899 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3900 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3813 } 3901 }
3814 } 3902 }

Diff Legend

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