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.295 by root, Wed Jan 9 01:01:31 2008 UTC vs.
Revision 1.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC

… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 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) \ 84#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) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 86
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * 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 */ 89 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 91 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 95
112/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
115 99
… …
148 132
149 l.l = 0; 133 l.l = 0;
150 l.f = 0; 134 l.f = 0;
151} 135}
152 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
153/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
156 159
157void 160void
158rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
159{ 162{
160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
163
164 rvideo_mode = false;
165 view_start = 0; 163 view_start = 0;
166 num_scr = 0; 164 num_scr = 0;
167 165
168 if (ncol == 0) 166 if (ncol == 0)
169 ncol = 80; 167 ncol = 80;
… …
171 if (nrow == 0) 169 if (nrow == 0)
172 nrow = 24; 170 nrow = 24;
173 171
174 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 173 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 174
180 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
182 { 177 {
183 //TODO//FIXME 178 //TODO//FIXME
… …
283 278
284 if (top_row) 279 if (top_row)
285 { 280 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
288 284
289 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 287
292 do 288 do
293 { 289 {
294 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 291 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 292 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 293 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 294
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 296 {
… …
396 delete old_ta; 390 delete old_ta;
397 delete old_ra; 391 delete old_ra;
398 392
399 clamp_it (screen.cur.row, 0, nrow - 1); 393 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 394 clamp_it (screen.cur.col, 0, ncol - 1);
395 }
401 396
402 free (tabs); 397 free (tabs);
403 } 398 tabs = (char *)rxvt_malloc (ncol);
399
400 for (int col = ncol; --col; )
401 tabs [col] = col % TABSIZE == 0;
404 402
405 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
406 404
407 prev_nrow = nrow; 405 prev_nrow = nrow;
408 prev_ncol = ncol; 406 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol);
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 407
418 tt_winch (); 408 tt_winch ();
419 409
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 410 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 411}
… …
433 delete ralloc; ralloc = 0; 423 delete ralloc; ralloc = 0;
434 424
435 free (row_buf); 425 free (row_buf);
436 free (swap_buf); 426 free (swap_buf);
437 free (drawn_buf); 427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
438 free (tabs); 430 free (tabs);
439 431 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 432 }
442} 433}
443 434
444/* ------------------------------------------------------------------------- */ 435/* ------------------------------------------------------------------------- */
445/* 436/*
446 * Hard reset 437 * Hard/Soft reset
447 */ 438 */
448void 439void
449rxvt_term::scr_poweron () 440rxvt_term::scr_poweron ()
450{ 441{
451 scr_release (); 442 scr_release ();
452 prev_nrow = prev_ncol = 0; 443 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false;
445 scr_soft_reset ();
453 scr_reset (); 446 scr_reset ();
454 447
455 scr_clear (true); 448 scr_clear (true);
456 scr_refresh (); 449 scr_refresh ();
450}
451
452void
453rxvt_term::scr_soft_reset ()
454{
455 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY
457 scr_overlay_off ();
458#endif
459
460 if (current_screen != PRIMARY)
461 scr_swap_screen ();
462
463 scr_scroll_region (0, MAX_ROWS - 1);
464 scr_rendition (0, ~RS_None);
465 scr_insert_mode (0);
457} 466}
458 467
459/* ------------------------------------------------------------------------- * 468/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 469 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 470 * ------------------------------------------------------------------------- */
… …
499 } 508 }
500 509
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 510 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 511 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 512 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 513 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 514 assert (s->cur.col >= 0);
507#endif
508} 515}
509 516
510void 517void
511rxvt_term::scr_swap_screen () 518rxvt_term::scr_swap_screen ()
512{ 519{
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
774 } 781 }
775 } 782 }
776 783
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 787 int row = screen.cur.row;
783 788
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 790
786 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
787 792
788 while (str < strend) 793 while (str < strend)
789 { 794 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 796
792 if (c < 0x20) 797 if (expect_false (c < 0x20))
793 if (c == C0_LF) 798 if (c == C0_LF)
794 { 799 {
795 max_it (line->l, screen.cur.col); 800 max_it (line->l, screen.cur.col);
796 801
797 screen.flags &= ~Screen_WrapNext; 802 screen.flags &= ~Screen_WrapNext;
… …
816 { 821 {
817 scr_tab (1, true); 822 scr_tab (1, true);
818 continue; 823 continue;
819 } 824 }
820 825
826 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 827 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 829 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 ))
824 { 831 {
825 checksel = 0; 832 checksel = 0;
826 /* 833 /*
827 * If we wrote anywhere in the selected area, kill the selection 834 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 835 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 836 * should be a similar check.
830 */ 837 */
831 CLEAR_SELECTION (); 838 CLEAR_SELECTION ();
832 } 839 }
833 840
834 if (screen.flags & Screen_WrapNext) 841 if (expect_false (screen.flags & Screen_WrapNext))
835 { 842 {
836 scr_do_wrap (); 843 scr_do_wrap ();
837 844
838 line->l = ncol; 845 line->l = ncol;
839 line->is_longer (1); 846 line->is_longer (1);
… …
841 row = screen.cur.row; 848 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 849 line = &ROW(row); /* _must_ refresh */
843 } 850 }
844 851
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 852 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 854 c = 0xfffd;
848 855
849 // rely on wcwidth to tell us the character width, do wcwidth before 856 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 857 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 858 // drawing characters below as they might be invalid in the current
852 // locale. 859 // locale.
853 int width = WCWIDTH (c); 860 int width = WCWIDTH (c);
854 861
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 863 {
857 // vt100 special graphics and line drawing 864 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 865 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 866 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 867 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 880 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 881 width = 1; // vt100 line drawing characters are always single-width
875 } 882 }
876 } 883 }
877 884
878 if (screen.flags & Screen_Insert) 885 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 886 scr_insdel_chars (width, INSERT);
880 887
881 if (width != 0) 888 if (width != 0)
882 { 889 {
883#if !UNICODE_3 890#if !UNICODE_3
… …
889 c = 0xfffd; 896 c = 0xfffd;
890# endif 897# endif
891#endif 898#endif
892 899
893 // nuke the character at this position, if required 900 // nuke the character at this position, if required
901 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 902 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 903 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
897 { 912 {
898 int col = screen.cur.col; 913 // ... artificially enlargen the previous one
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
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 (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' '; 914 c = NOCHAR;
921 // and try the same character next loop iteration 915 // and try the same character next loop iteration
922 --str; 916 --str;
923 } 917 }
924 918
925 line->touch (); 919 line->touch ();
… …
927 do 921 do
928 { 922 {
929 line->t[screen.cur.col] = c; 923 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 924 line->r[screen.cur.col] = rend;
931 925
932 if (screen.cur.col < ncol - 1) 926 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 927 screen.cur.col++;
934 else 928 else
935 { 929 {
936 line->l = ncol; 930 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 931 if (screen.flags & Screen_Autowrap)
… …
939 break; 933 break;
940 } 934 }
941 935
942 c = NOCHAR; 936 c = NOCHAR;
943 } 937 }
944 while (--width > 0); 938 while (expect_false (--width > 0));
945 939
946 // pad with spaces when overwriting wide character with smaller one 940 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 941 if (expect_false (!width))
948 { 942 {
949 line->touch (); 943 line->touch ();
950 944
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 946 {
953 line->t[c] = ' '; 947 line->t[c] = ' ';
954 line->r[c] = rend; 948 line->r[c] = rend;
955 } 949 }
956 } 950 }
957 } 951 }
952#if ENABLE_COMBINING
958 else // width == 0 953 else // width == 0
959 { 954 {
960#if ENABLE_COMBINING 955 if (c != 0xfeff) // ignore BOM
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 { 956 {
957 // handle combining characters
958 // we just tag the accent on the previous on-screen character.
959 // this is arguably not correct, but also arguably not wrong.
960 // we don't handle double-width characters nicely yet.
961 line_t *linep;
962 text_t *tp;
963 rend_t *rp;
964
965 if (screen.cur.col > 0)
966 {
971 linep = line; 967 linep = line;
972 tp = line->t + screen.cur.col - 1; 968 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 969 rp = line->r + screen.cur.col - 1;
970 }
971 else if (screen.cur.row > 0
972 && ROW(screen.cur.row - 1).is_longer ())
973 {
974 linep = &ROW(screen.cur.row - 1);
975 tp = line->t + ncol - 1;
976 rp = line->r + ncol - 1;
977 }
978 else
979 continue;
980
981 linep->touch ();
982
983 while (*tp == NOCHAR && tp > linep->t)
984 tp--, rp--;
985
986 // first try to find a precomposed character
987 unicode_t n = rxvt_compose (*tp, c);
988 if (n == NOCHAR)
989 n = rxvt_composite.compose (*tp, c);
990
991 *tp = n;
992 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 993 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 } 994 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 995#endif
998 }
999 } 996 }
1000 997
1001 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
1002 999
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
1005#endif
1006} 1001}
1007 1002
1008/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
1009/* 1004/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1005 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1012 */ 1007 */
1013void 1008void
1014rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1015{ 1010{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1019 { 1012 {
1020 screen.flags &= ~Screen_WrapNext;
1021
1022 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1023 { 1014 {
1024#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1017 --screen.cur.row;
1027 return; 1018
1019 want_refresh = 1;
1028#endif 1020#endif
1029 } 1021 }
1030 } 1022 }
1031 else 1023 else
1032 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
… …
1230/* 1222/*
1231 * Erase part or whole of a line 1223 * Erase part or whole of a line
1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1235 */ 1228 */
1236void 1229void
1237rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1238{ 1231{
1239 unsigned int col, num; 1232 unsigned int col, num;
… …
1248 line.touch (); 1241 line.touch ();
1249 line.is_longer (0); 1242 line.is_longer (0);
1250 1243
1251 switch (mode) 1244 switch (mode)
1252 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1253 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1254 col = screen.cur.col; 1253 col = screen.cur.col;
1255 num = ncol - col; 1254 num = ncol - col;
1256 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1260 break; 1260 break;
1261
1261 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1262 col = 0; 1263 col = 0;
1263 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1264 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1267 break; 1269 break;
1270
1268 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1269 col = 0; 1272 col = 0;
1270 num = ncol; 1273 num = ncol;
1271 line.l = 0; 1274 line.l = 0;
1272 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1330 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1331 return; 1334 return;
1332 1335
1333 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1334 1337
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1335 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1344 {
1339 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1340 CLEAR_ROWS (row, num); 1346
1347 if (mapped && !view_start)
1348 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False);
1341 } 1351 }
1342 else 1352 else
1343 { 1353 {
1344 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355
1356 if (mapped && !view_start)
1357 {
1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 ERASE_ROWS (row, num); 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start),
1362 (unsigned int)width,
1363 (unsigned int)Height2Pixel (num));
1348 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1349 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1350 } 1367 }
1351 1368
1352 for (; num--; row++) 1369 for (; num--; row++)
1353 { 1370 {
1354 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1355 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1356 } 1375 }
1357} 1376}
1358 1377
1359#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1360void 1379void
… …
1434 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1435 */ 1454 */
1436void 1455void
1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1438{ 1457{
1439 int col, row;
1440 rend_t tr;
1441
1442 want_refresh = 1; 1458 want_refresh = 1;
1443 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1444 1460
1445 if (count <= 0) 1461 if (count <= 0)
1446 return; 1462 return;
… …
1448 scr_do_wrap (); 1464 scr_do_wrap ();
1449 1465
1450 selection_check (1); 1466 selection_check (1);
1451 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1452 1468
1453 row = screen.cur.row; 1469 int row = screen.cur.row;
1454 1470
1455 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1456 1472
1457 line->touch (); 1473 line->touch ();
1458 line->is_longer (0); 1474 line->is_longer (0);
1459 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1460 switch (insdel) 1480 switch (insdel)
1461 { 1481 {
1462 case INSERT: 1482 case INSERT:
1463 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1483 line->l = min (line->l + count, ncol);
1484
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1488 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1464 { 1489 {
1465 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1466 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1467 } 1492 }
1468
1469 line->l = min (line->l + count, ncol);
1470 1493
1471 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1496 {
1474 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
… …
1489 case ERASE: 1512 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1514 selection_check (1);
1492 screen.cur.col -= count; 1515 screen.cur.col -= count;
1493 1516
1494 line->l = max (line->l - count, 0); 1517 // nuke wide char after the end
1518 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1519 scr_kill_char (*line, screen.cur.col + count);
1520
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1522 break;
1497 1523
1498 case DELETE: 1524 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1500 1526
1527 // nuke wide char spanning the end
1528 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1529 scr_kill_char (*line, screen.cur.col + count);
1530
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1532 {
1503 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1505 } 1535 }
1506 1536
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1538
1510 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1541 {
1513 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1891 XMapWindow (dpy, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1892# endif 1921# endif
1893 1922
1894# if ENABLE_FRILLS 1923# if ENABLE_FRILLS
1895 if (option (Opt_urgentOnBell)) 1924 if (option (Opt_urgentOnBell))
1896 { 1925 set_urgency (1);
1897 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1898 {
1899 h->flags |= XUrgencyHint;
1900 XSetWMHints (dpy, parent[0], h);
1901 }
1902 }
1903# endif 1926# endif
1904 1927
1905 if (option (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1906 { 1929 {
1907 rvideo_bell = true; 1930 rvideo_bell = true;
… …
1910 1933
1911 bell_ev.start (VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1912 } 1935 }
1913 else 1936 else
1914 XBell (dpy, 0); 1937 XBell (dpy, 0);
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1915#endif 1939#endif
1916} 1940}
1917 1941
1918/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1919/* ARGSUSED */ 1943/* ARGSUSED */
1920void 1944void
1921rxvt_term::scr_printscreen (int fullhist) NOTHROW 1945rxvt_term::scr_printscreen (int fullhist) NOTHROW
1922{ 1946{
1923#ifdef PRINTPIPE 1947#ifdef PRINTPIPE
1924 int nrows, row_start; 1948 int nrows, row_start;
1925 FILE *fd; 1949 FILE *fd = popen_printer ();
1926 1950
1927 if ((fd = popen_printer ()) == NULL) 1951 if (!fd)
1928 return; 1952 return;
1929 1953
1930 if (fullhist) 1954 if (fullhist)
1931 { 1955 {
1932 nrows = nrow - top_row; 1956 nrows = nrow - top_row;
… …
1938 row_start = view_start; 1962 row_start = view_start;
1939 } 1963 }
1940 1964
1941 wctomb (0, 0); 1965 wctomb (0, 0);
1942 1966
1943 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1944 { 1968 {
1945 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1946 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1947 1971
1948 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1977 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1978 */ 2002 */
1979void 2003void
1980rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
1981{ 2005{
1982 unsigned char have_bg,
1983 showcursor; /* show the cursor */
1984 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
1985 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
1986 int i; /* tmp */ 2008 int i; /* tmp */
1987#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1988 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
… …
1997 return; 2019 return;
1998 2020
1999 /* 2021 /*
2000 * A: set up vars 2022 * A: set up vars
2001 */ 2023 */
2002 have_bg = 0;
2003 refresh_count = 0; 2024 refresh_count = 0;
2004 2025
2026 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0;
2005#ifdef HAVE_BG_PIXMAP 2028#ifdef HAVE_BG_PIXMAP
2006 have_bg |= bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
2007#endif 2030#endif
2008 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2009 2032
2010 /* 2033 /*
2011 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2012 */ 2035 */
2013 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2014 2044
2015 /* 2045 /*
2016 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2017 */ 2047 */
2018 { 2048 {
2019 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2020 2050
2021 showcursor = (screen.flags & Screen_VisibleCursor);
2022#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2023 if (hidden_cursor) 2052 if (hidden_cursor)
2024 showcursor = 0; 2053 showcursor = 0;
2025#endif 2054#endif
2026 2055
… …
2099 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2100 } 2129 }
2101 } 2130 }
2102 } 2131 }
2103 2132
2104 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2105#if ENABLE_OVERLAY
2106 scr_swap_overlay ();
2107#endif
2108
2109#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2110 /* 2134 /*
2111 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2112 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2113 */ 2137 */
… …
2202 continue; 2226 continue;
2203 2227
2204 // redraw one or more characters 2228 // redraw one or more characters
2205 2229
2206 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2207 while (stp[col] == NOCHAR && col > 0) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2208 --col; 2232 --col;
2209 2233
2210 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2211 text_t *text = stp + col; 2235 text_t *text = stp + col;
2212 int count = 1; 2236 int count = 1;
… …
2219 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2220 { 2244 {
2221 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2222 { 2246 {
2223 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2224 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2225 count++; 2250 count++;
2226 i++; 2251 i++;
2227 2252
2228 continue; 2253 continue;
2229 } 2254 }
… …
2249 2274
2250 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2251 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2252 2277
2253 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2254 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2255 count++, i--; 2280 count++, i--;
2256 2281
2257 /* 2282 /*
2258 * Determine the attributes for the string 2283 * Determine the attributes for the string
2259 */ 2284 */
2260 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2261 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2262 2287
2263 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2264 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2265 { 2290 {
2266 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2267 2292
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (rend & RS_Bold && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
… …
2352 /* 2377 /*
2353 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2354 */ 2379 */
2355 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2356 2381
2357 if (have_bg && back == Color_bg) 2382 if (expect_true (have_bg && back == Color_bg))
2358 { 2383 {
2359 // this is very ugly, maybe push it into ->draw? 2384 // this is very ugly, maybe push it into ->draw?
2360 2385
2361 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2362 if (text[i] != ' ') 2387 if (text[i] != ' ')
… …
2369 did_clear: ; 2394 did_clear: ;
2370 } 2395 }
2371 else 2396 else
2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2373 2398
2374 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2375 { 2400 {
2376#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2377 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2378 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2379 else 2404 else
2380#endif 2405#endif
2381 XSetForeground (dpy, gc, pix_colors[fore]); 2406 XSetForeground (dpy, gc, pix_colors[fore]);
2382 2407
2383 XDrawLine (dpy, drawBuffer, gc, 2408 XDrawLine (dpy, vt, gc,
2384 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2385 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2386 } 2411 }
2387 } /* for (col....) */ 2412 } /* for (col....) */
2388 } /* for (row....) */ 2413 } /* for (row....) */
2389
2390#if ENABLE_OVERLAY
2391 scr_swap_overlay ();
2392#endif
2393 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2394 2414
2395 /* 2415 /*
2396 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2397 */ 2417 */
2398 if (showcursor) 2418 if (showcursor)
… …
2426 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2427 else 2447 else
2428#endif 2448#endif
2429 XSetForeground (dpy, gc, pix_colors[ccol1]); 2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2430 2450
2431 XDrawRectangle (dpy, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2432 Col2Pixel (col), 2452 Col2Pixel (col),
2433 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2434 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2435 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2436 } 2456 }
2437 } 2457 }
2438 2458
2439 /* 2459 /*
2440 * H: cleanup selection 2460 * H: cleanup selection
2441 */ 2461 */
2462#if ENABLE_OVERLAY
2463 scr_swap_overlay ();
2464#endif
2465 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466
2442 scr_reverse_selection (); 2467 scr_reverse_selection ();
2443 2468
2469 screen.flags = old_screen_flags;
2444 num_scr = 0; 2470 num_scr = 0;
2445 num_scr_allow = 1; 2471 num_scr_allow = 1;
2446} 2472}
2447 2473
2448void 2474void
… …
2479 2505
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2507 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483 2509
2484# if HAVE_SCROLLBARS
2485 if (scrollBar.win) 2510 if (scrollBar.win)
2486 { 2511 {
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.setIdle (); 2513 scrollBar.state = STATE_IDLE;
2489 scrollbar_show (0); 2514 scrollBar.show (0);
2490 } 2515 }
2516
2491# endif 2517#endif
2492 2518
2519 /* bgPixmap.apply () does not do the following : */
2493 scr_clear (); 2520 scr_clear ();
2494 scr_touch (true); 2521 scr_touch (true);
2495 want_refresh = 1; 2522 want_refresh = 1;
2496
2497#endif
2498} 2523}
2499 2524
2500/* ------------------------------------------------------------------------- */ 2525/* ------------------------------------------------------------------------- */
2501void 2526void
2502rxvt_term::scr_clear (bool really) NOTHROW 2527rxvt_term::scr_clear (bool really) NOTHROW
… …
2591{ 2616{
2592 int row, wrote; 2617 int row, wrote;
2593 unsigned int width, towrite; 2618 unsigned int width, towrite;
2594 char r1[] = "\n"; 2619 char r1[] = "\n";
2595 2620
2596 for (row = saveLines - nsaved; 2621 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++) 2622 row < saveLines + nrow - 1; row++)
2598 { 2623 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l 2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol; 2625 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote) 2626 for (towrite = width; towrite; towrite -= wrote)
… …
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2677 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2678 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2679 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2680 data[i] = C0_CR;
2656 2681
2682 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~");
2684
2657 tt_write (data, len); 2685 tt_write (data, len);
2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~");
2658} 2689}
2659 2690
2660/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2661/* 2692/*
2662 * Respond to a notification that a primary selection has been sent 2693 * Respond to a notification that a primary selection has been sent
… …
3702 h += 2; min_it (h, nrow); 3733 h += 2; min_it (h, nrow);
3703 3734
3704 x -= 1; clamp_it (x, 0, ncol - w); 3735 x -= 1; clamp_it (x, 0, ncol - w);
3705 y -= 1; clamp_it (y, 0, nrow - h); 3736 y -= 1; clamp_it (y, 0, nrow - h);
3706 3737
3707 ov_x = x; ov_y = y; 3738 ov.x = x; ov.y = y;
3708 ov_w = w; ov_h = h; 3739 ov.w = w; ov.h = h;
3709 3740
3710 ov_text = new text_t *[h]; 3741 ov.text = new text_t *[h];
3711 ov_rend = new rend_t *[h]; 3742 ov.rend = new rend_t *[h];
3712 3743
3713 for (y = 0; y < h; y++) 3744 for (y = 0; y < h; y++)
3714 { 3745 {
3715 text_t *tp = ov_text[y] = new text_t[w]; 3746 text_t *tp = ov.text[y] = new text_t[w];
3716 rend_t *rp = ov_rend[y] = new rend_t[w]; 3747 rend_t *rp = ov.rend[y] = new rend_t[w];
3717 3748
3718 text_t t0, t1, t2; 3749 text_t t0, t1, t2;
3719 rend_t r = OVERLAY_RSTYLE; 3750 rend_t r = OVERLAY_RSTYLE;
3720 3751
3721 if (y == 0) 3752 if (y == 0)
… …
3740} 3771}
3741 3772
3742void 3773void
3743rxvt_term::scr_overlay_off () NOTHROW 3774rxvt_term::scr_overlay_off () NOTHROW
3744{ 3775{
3745 if (!ov_text) 3776 if (!ov.text)
3746 return; 3777 return;
3747 3778
3748 want_refresh = 1; 3779 want_refresh = 1;
3749 3780
3750 for (int y = 0; y < ov_h; y++) 3781 for (int y = 0; y < ov.h; y++)
3751 { 3782 {
3752 delete [] ov_text[y]; 3783 delete [] ov.text[y];
3753 delete [] ov_rend[y]; 3784 delete [] ov.rend[y];
3754 } 3785 }
3755 3786
3756 delete [] ov_text; ov_text = 0; 3787 delete [] ov.text; ov.text = 0;
3757 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov.rend; ov.rend = 0;
3758} 3789}
3759 3790
3760void 3791void
3761rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3762{ 3793{
3763 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3764 return; 3795 return;
3765 3796
3766 x++, y++; 3797 x++, y++;
3767 3798
3768 ov_text[y][x] = text; 3799 ov.text[y][x] = text;
3769 ov_rend[y][x] = rend; 3800 ov.rend[y][x] = rend;
3770} 3801}
3771 3802
3772void 3803void
3773rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3774{ 3805{
… …
3793} 3824}
3794 3825
3795void 3826void
3796rxvt_term::scr_swap_overlay () NOTHROW 3827rxvt_term::scr_swap_overlay () NOTHROW
3797{ 3828{
3798 if (!ov_text) 3829 if (!ov.text)
3799 return; 3830 return;
3800 3831
3832 // hide cursor if it is within the overlay area
3833 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3834 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3835 screen.flags &= ~Screen_VisibleCursor;
3836
3801 // swap screen mem with overlay 3837 // swap screen mem with overlay
3802 for (int y = ov_h; y--; ) 3838 for (int y = ov.h; y--; )
3803 { 3839 {
3804 text_t *t1 = ov_text[y]; 3840 text_t *t1 = ov.text[y];
3805 rend_t *r1 = ov_rend[y]; 3841 rend_t *r1 = ov.rend[y];
3806 3842
3807 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3843 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3808 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3844 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3809 3845
3810 for (int x = ov_w; x--; ) 3846 for (int x = ov.w; x--; )
3811 { 3847 {
3812 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3848 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3813 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3814 } 3850 }
3815 } 3851 }

Diff Legend

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