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.296 by root, Wed Jan 9 01:05:24 2008 UTC vs.
Revision 1.329 by root, Sat Dec 26 10:24:04 2009 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
… …
1017 { 1012 {
1018 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1019 { 1014 {
1020#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1021 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1022 screen.cur.row--; 1017 --screen.cur.row;
1018
1023 want_refresh = 1; 1019 want_refresh = 1;
1024#endif 1020#endif
1025 } 1021 }
1026 } 1022 }
1027 else 1023 else
… …
1226/* 1222/*
1227 * Erase part or whole of a line 1223 * Erase part or whole of a line
1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1230 * 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
1231 */ 1228 */
1232void 1229void
1233rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1234{ 1231{
1235 unsigned int col, num; 1232 unsigned int col, num;
… …
1244 line.touch (); 1241 line.touch ();
1245 line.is_longer (0); 1242 line.is_longer (0);
1246 1243
1247 switch (mode) 1244 switch (mode)
1248 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1249 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1250 col = screen.cur.col; 1253 col = screen.cur.col;
1251 num = ncol - col; 1254 num = ncol - col;
1252 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1255 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1256 break; 1260 break;
1261
1257 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1258 col = 0; 1263 col = 0;
1259 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1260 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1261 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1262 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1263 break; 1269 break;
1270
1264 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1265 col = 0; 1272 col = 0;
1266 num = ncol; 1273 num = ncol;
1267 line.l = 0; 1274 line.l = 0;
1268 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1326 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1327 return; 1334 return;
1328 1335
1329 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1330 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.
1331 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1332 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1333 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1334 { 1344 {
1335 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1336 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);
1337 } 1351 }
1338 else 1352 else
1339 { 1353 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355
1356 if (mapped && !view_start)
1357 {
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start),
1362 (unsigned int)width,
1363 (unsigned int)Height2Pixel (num));
1344 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1346 } 1367 }
1347 1368
1348 for (; num--; row++) 1369 for (; num--; row++)
1349 { 1370 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1351 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1352 } 1375 }
1353} 1376}
1354 1377
1355#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1356void 1379void
… …
1430 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1431 */ 1454 */
1432void 1455void
1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1434{ 1457{
1435 int col, row;
1436 rend_t tr;
1437
1438 want_refresh = 1; 1458 want_refresh = 1;
1439 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1440 1460
1441 if (count <= 0) 1461 if (count <= 0)
1442 return; 1462 return;
… …
1444 scr_do_wrap (); 1464 scr_do_wrap ();
1445 1465
1446 selection_check (1); 1466 selection_check (1);
1447 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1448 1468
1449 row = screen.cur.row; 1469 int row = screen.cur.row;
1450 1470
1451 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1452 1472
1453 line->touch (); 1473 line->touch ();
1454 line->is_longer (0); 1474 line->is_longer (0);
1455 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1456 switch (insdel) 1480 switch (insdel)
1457 { 1481 {
1458 case INSERT: 1482 case INSERT:
1459 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--)
1460 { 1489 {
1461 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1462 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1463 } 1492 }
1464
1465 line->l = min (line->l + count, ncol);
1466 1493
1467 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1468 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1469 { 1496 {
1470 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
… …
1485 case ERASE: 1512 case ERASE:
1486 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1487 selection_check (1); 1514 selection_check (1);
1488 screen.cur.col -= count; 1515 screen.cur.col -= count;
1489 1516
1490 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
1491 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1492 break; 1522 break;
1493 1523
1494 case DELETE: 1524 case DELETE:
1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1496 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
1497 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1498 { 1532 {
1499 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1500 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1501 } 1535 }
1502 1536
1503 line->l = max (line->l - count, 0);
1504 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1505 1538
1506 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1508 { 1541 {
1509 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1887 XMapWindow (dpy, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1888# endif 1921# endif
1889 1922
1890# if ENABLE_FRILLS 1923# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1924 if (option (Opt_urgentOnBell))
1892 { 1925 set_urgency (1);
1893 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1894 {
1895 h->flags |= XUrgencyHint;
1896 XSetWMHints (dpy, parent[0], h);
1897 }
1898 }
1899# endif 1926# endif
1900 1927
1901 if (option (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1902 { 1929 {
1903 rvideo_bell = true; 1930 rvideo_bell = true;
… …
1916void 1943void
1917rxvt_term::scr_printscreen (int fullhist) NOTHROW 1944rxvt_term::scr_printscreen (int fullhist) NOTHROW
1918{ 1945{
1919#ifdef PRINTPIPE 1946#ifdef PRINTPIPE
1920 int nrows, row_start; 1947 int nrows, row_start;
1921 FILE *fd; 1948 FILE *fd = popen_printer ();
1922 1949
1923 if ((fd = popen_printer ()) == NULL) 1950 if (!fd)
1924 return; 1951 return;
1925 1952
1926 if (fullhist) 1953 if (fullhist)
1927 { 1954 {
1928 nrows = nrow - top_row; 1955 nrows = nrow - top_row;
… …
1973 * screen.text/screen.rend contain what the screen will change to. 2000 * screen.text/screen.rend contain what the screen will change to.
1974 */ 2001 */
1975void 2002void
1976rxvt_term::scr_refresh () NOTHROW 2003rxvt_term::scr_refresh () NOTHROW
1977{ 2004{
1978 unsigned char have_bg,
1979 showcursor; /* show the cursor */
1980 int16_t col, row, /* column/row we're processing */ 2005 int16_t col, row, /* column/row we're processing */
1981 ocrow; /* old cursor row */ 2006 ocrow; /* old cursor row */
1982 int i; /* tmp */ 2007 int i; /* tmp */
1983#ifndef NO_CURSORCOLOR 2008#ifndef NO_CURSORCOLOR
1984 rend_t cc1; /* store colours at cursor position (s) */ 2009 rend_t cc1; /* store colours at cursor position (s) */
… …
1993 return; 2018 return;
1994 2019
1995 /* 2020 /*
1996 * A: set up vars 2021 * A: set up vars
1997 */ 2022 */
1998 have_bg = 0;
1999 refresh_count = 0; 2023 refresh_count = 0;
2000 2024
2025 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0;
2001#ifdef HAVE_BG_PIXMAP 2027#ifdef HAVE_BG_PIXMAP
2002 have_bg |= bgPixmap.pixmap != None; 2028 have_bg = bgPixmap.pixmap != None;
2003#endif 2029#endif
2004 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2005 2031
2006 /* 2032 /*
2007 * B: reverse any characters which are selected 2033 * B: reverse any characters which are selected
2008 */ 2034 */
2009 scr_reverse_selection (); 2035 scr_reverse_selection ();
2036
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY
2039 scr_swap_overlay ();
2040#endif
2041
2042 char showcursor = screen.flags & Screen_VisibleCursor;
2010 2043
2011 /* 2044 /*
2012 * C: set the cursor character (s) 2045 * C: set the cursor character (s)
2013 */ 2046 */
2014 { 2047 {
2015 unsigned char setoldcursor; 2048 unsigned char setoldcursor;
2016 2049
2017 showcursor = (screen.flags & Screen_VisibleCursor);
2018#ifdef CURSOR_BLINK 2050#ifdef CURSOR_BLINK
2019 if (hidden_cursor) 2051 if (hidden_cursor)
2020 showcursor = 0; 2052 showcursor = 0;
2021#endif 2053#endif
2022 2054
… …
2095 oldcursor.col = screen.cur.col; 2127 oldcursor.col = screen.cur.col;
2096 } 2128 }
2097 } 2129 }
2098 } 2130 }
2099 2131
2100 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2101#if ENABLE_OVERLAY
2102 scr_swap_overlay ();
2103#endif
2104
2105#ifndef NO_SLOW_LINK_SUPPORT 2132#ifndef NO_SLOW_LINK_SUPPORT
2106 /* 2133 /*
2107 * D: CopyArea pass - very useful for slower links 2134 * D: CopyArea pass - very useful for slower links
2108 * This has been deliberately kept simple. 2135 * This has been deliberately kept simple.
2109 */ 2136 */
… …
2198 continue; 2225 continue;
2199 2226
2200 // redraw one or more characters 2227 // redraw one or more characters
2201 2228
2202 // seek to the beginning of wide characters 2229 // seek to the beginning of wide characters
2203 while (stp[col] == NOCHAR && col > 0) 2230 while (expect_false (stp[col] == NOCHAR && col > 0))
2204 --col; 2231 --col;
2205 2232
2206 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2207 text_t *text = stp + col; 2234 text_t *text = stp + col;
2208 int count = 1; 2235 int count = 1;
… …
2215 for (i = 0; ++col < ncol; ) 2242 for (i = 0; ++col < ncol; )
2216 { 2243 {
2217 if (stp[col] == NOCHAR) 2244 if (stp[col] == NOCHAR)
2218 { 2245 {
2219 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2220 drp[col] = rend; 2247 drp[col] = srp[col];
2248
2221 count++; 2249 count++;
2222 i++; 2250 i++;
2223 2251
2224 continue; 2252 continue;
2225 } 2253 }
… …
2245 2273
2246 col--; /* went one too far. move back */ 2274 col--; /* went one too far. move back */
2247 count -= i; /* dump any matching trailing chars */ 2275 count -= i; /* dump any matching trailing chars */
2248 2276
2249 // sometimes we optimize away the trailing NOCHAR's, add them back 2277 // sometimes we optimize away the trailing NOCHAR's, add them back
2250 while (i && text[count] == NOCHAR) 2278 while (expect_false (i && text[count] == NOCHAR))
2251 count++, i--; 2279 count++, i--;
2252 2280
2253 /* 2281 /*
2254 * Determine the attributes for the string 2282 * Determine the attributes for the string
2255 */ 2283 */
2256 int fore = fgcolor_of (rend); // desired foreground 2284 int fore = fgcolor_of (rend); // desired foreground
2257 int back = bgcolor_of (rend); // desired background 2285 int back = bgcolor_of (rend); // desired background
2258 2286
2259 // only do special processing if any attributes are set, which is unlikely 2287 // only do special processing if any attributes are set, which is unlikely
2260 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2288 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2261 { 2289 {
2262 bool invert = rend & RS_RVid; 2290 bool invert = rend & RS_RVid;
2263 2291
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2292#ifndef NO_BOLD_UNDERLINE_REVERSE
2265 if (rend & RS_Bold && fore == Color_fg) 2293 if (rend & RS_Bold && fore == Color_fg)
… …
2348 /* 2376 /*
2349 * Actually do the drawing of the string here 2377 * Actually do the drawing of the string here
2350 */ 2378 */
2351 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2352 2380
2353 if (have_bg && back == Color_bg) 2381 if (expect_true (have_bg && back == Color_bg))
2354 { 2382 {
2355 // this is very ugly, maybe push it into ->draw? 2383 // this is very ugly, maybe push it into ->draw?
2356 2384
2357 for (i = 0; i < count; i++) /* don't draw empty strings */ 2385 for (i = 0; i < count; i++) /* don't draw empty strings */
2358 if (text[i] != ' ') 2386 if (text[i] != ' ')
… …
2365 did_clear: ; 2393 did_clear: ;
2366 } 2394 }
2367 else 2395 else
2368 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2369 2397
2370 if (rend & RS_Uline && font->descent > 1 && fore != back) 2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2371 { 2399 {
2372#if ENABLE_FRILLS 2400#if ENABLE_FRILLS
2373 if (ISSET_PIXCOLOR (Color_underline)) 2401 if (ISSET_PIXCOLOR (Color_underline))
2374 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2402 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2375 else 2403 else
2376#endif 2404#endif
2377 XSetForeground (dpy, gc, pix_colors[fore]); 2405 XSetForeground (dpy, gc, pix_colors[fore]);
2378 2406
2379 XDrawLine (dpy, drawBuffer, gc, 2407 XDrawLine (dpy, vt, gc,
2380 xpixel, ypixel + font->ascent + 1, 2408 xpixel, ypixel + font->ascent + 1,
2381 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2409 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2382 } 2410 }
2383 } /* for (col....) */ 2411 } /* for (col....) */
2384 } /* for (row....) */ 2412 } /* for (row....) */
2385
2386#if ENABLE_OVERLAY
2387 scr_swap_overlay ();
2388#endif
2389 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2390 2413
2391 /* 2414 /*
2392 * G: cleanup cursor and display outline cursor if necessary 2415 * G: cleanup cursor and display outline cursor if necessary
2393 */ 2416 */
2394 if (showcursor) 2417 if (showcursor)
… …
2422 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2445 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2423 else 2446 else
2424#endif 2447#endif
2425 XSetForeground (dpy, gc, pix_colors[ccol1]); 2448 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 2449
2427 XDrawRectangle (dpy, drawBuffer, gc, 2450 XDrawRectangle (dpy, vt, gc,
2428 Col2Pixel (col), 2451 Col2Pixel (col),
2429 Row2Pixel (oldcursor.row), 2452 Row2Pixel (oldcursor.row),
2430 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2453 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2431 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2432 } 2455 }
2433 } 2456 }
2434 2457
2435 /* 2458 /*
2436 * H: cleanup selection 2459 * H: cleanup selection
2437 */ 2460 */
2461#if ENABLE_OVERLAY
2462 scr_swap_overlay ();
2463#endif
2464 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2465
2438 scr_reverse_selection (); 2466 scr_reverse_selection ();
2439 2467
2468 screen.flags = old_screen_flags;
2440 num_scr = 0; 2469 num_scr = 0;
2441 num_scr_allow = 1; 2470 num_scr_allow = 1;
2442} 2471}
2443 2472
2444void 2473void
… …
2475 2504
2476 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2477 XClearWindow (dpy, parent[0]); 2506 XClearWindow (dpy, parent[0]);
2478 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2479 2508
2480# if HAVE_SCROLLBARS
2481 if (scrollBar.win) 2509 if (scrollBar.win)
2482 { 2510 {
2483 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2484 scrollBar.setIdle (); 2512 scrollBar.state = STATE_IDLE;
2485 scrollbar_show (0); 2513 scrollBar.show (0);
2486 } 2514 }
2515
2487# endif 2516#endif
2488 2517
2518 /* bgPixmap.apply () does not do the following : */
2489 scr_clear (); 2519 scr_clear ();
2490 scr_touch (true); 2520 scr_touch (true);
2491 want_refresh = 1; 2521 want_refresh = 1;
2492
2493#endif
2494} 2522}
2495 2523
2496/* ------------------------------------------------------------------------- */ 2524/* ------------------------------------------------------------------------- */
2497void 2525void
2498rxvt_term::scr_clear (bool really) NOTHROW 2526rxvt_term::scr_clear (bool really) NOTHROW
… …
2587{ 2615{
2588 int row, wrote; 2616 int row, wrote;
2589 unsigned int width, towrite; 2617 unsigned int width, towrite;
2590 char r1[] = "\n"; 2618 char r1[] = "\n";
2591 2619
2592 for (row = saveLines - nsaved; 2620 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2621 row < saveLines + nrow - 1; row++)
2594 { 2622 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2624 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2625 for (towrite = width; towrite; towrite -= wrote)
… …
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2677 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2678 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2679 data[i] = C0_CR;
2652 2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~");
2683
2653 tt_write (data, len); 2684 tt_write (data, len);
2685
2686 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~");
2654} 2688}
2655 2689
2656/* ------------------------------------------------------------------------- */ 2690/* ------------------------------------------------------------------------- */
2657/* 2691/*
2658 * Respond to a notification that a primary selection has been sent 2692 * Respond to a notification that a primary selection has been sent
… …
3698 h += 2; min_it (h, nrow); 3732 h += 2; min_it (h, nrow);
3699 3733
3700 x -= 1; clamp_it (x, 0, ncol - w); 3734 x -= 1; clamp_it (x, 0, ncol - w);
3701 y -= 1; clamp_it (y, 0, nrow - h); 3735 y -= 1; clamp_it (y, 0, nrow - h);
3702 3736
3703 ov_x = x; ov_y = y; 3737 ov.x = x; ov.y = y;
3704 ov_w = w; ov_h = h; 3738 ov.w = w; ov.h = h;
3705 3739
3706 ov_text = new text_t *[h]; 3740 ov.text = new text_t *[h];
3707 ov_rend = new rend_t *[h]; 3741 ov.rend = new rend_t *[h];
3708 3742
3709 for (y = 0; y < h; y++) 3743 for (y = 0; y < h; y++)
3710 { 3744 {
3711 text_t *tp = ov_text[y] = new text_t[w]; 3745 text_t *tp = ov.text[y] = new text_t[w];
3712 rend_t *rp = ov_rend[y] = new rend_t[w]; 3746 rend_t *rp = ov.rend[y] = new rend_t[w];
3713 3747
3714 text_t t0, t1, t2; 3748 text_t t0, t1, t2;
3715 rend_t r = OVERLAY_RSTYLE; 3749 rend_t r = OVERLAY_RSTYLE;
3716 3750
3717 if (y == 0) 3751 if (y == 0)
… …
3736} 3770}
3737 3771
3738void 3772void
3739rxvt_term::scr_overlay_off () NOTHROW 3773rxvt_term::scr_overlay_off () NOTHROW
3740{ 3774{
3741 if (!ov_text) 3775 if (!ov.text)
3742 return; 3776 return;
3743 3777
3744 want_refresh = 1; 3778 want_refresh = 1;
3745 3779
3746 for (int y = 0; y < ov_h; y++) 3780 for (int y = 0; y < ov.h; y++)
3747 { 3781 {
3748 delete [] ov_text[y]; 3782 delete [] ov.text[y];
3749 delete [] ov_rend[y]; 3783 delete [] ov.rend[y];
3750 } 3784 }
3751 3785
3752 delete [] ov_text; ov_text = 0; 3786 delete [] ov.text; ov.text = 0;
3753 delete [] ov_rend; ov_rend = 0; 3787 delete [] ov.rend; ov.rend = 0;
3754} 3788}
3755 3789
3756void 3790void
3757rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3758{ 3792{
3759 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3793 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3760 return; 3794 return;
3761 3795
3762 x++, y++; 3796 x++, y++;
3763 3797
3764 ov_text[y][x] = text; 3798 ov.text[y][x] = text;
3765 ov_rend[y][x] = rend; 3799 ov.rend[y][x] = rend;
3766} 3800}
3767 3801
3768void 3802void
3769rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3770{ 3804{
… …
3789} 3823}
3790 3824
3791void 3825void
3792rxvt_term::scr_swap_overlay () NOTHROW 3826rxvt_term::scr_swap_overlay () NOTHROW
3793{ 3827{
3794 if (!ov_text) 3828 if (!ov.text)
3795 return; 3829 return;
3796 3830
3831 // hide cursor if it is within the overlay area
3832 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3833 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3834 screen.flags &= ~Screen_VisibleCursor;
3835
3797 // swap screen mem with overlay 3836 // swap screen mem with overlay
3798 for (int y = ov_h; y--; ) 3837 for (int y = ov.h; y--; )
3799 { 3838 {
3800 text_t *t1 = ov_text[y]; 3839 text_t *t1 = ov.text[y];
3801 rend_t *r1 = ov_rend[y]; 3840 rend_t *r1 = ov.rend[y];
3802 3841
3803 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3842 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3804 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3843 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3805 3844
3806 for (int x = ov_w; x--; ) 3845 for (int x = ov.w; x--; )
3807 { 3846 {
3808 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3847 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3809 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3810 } 3849 }
3811 } 3850 }

Diff Legend

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