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.293 by root, Mon Dec 24 08:00:18 2007 UTC vs.
Revision 1.325 by root, Wed Nov 5 12:28:15 2008 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
… …
396 delete old_ta; 392 delete old_ta;
397 delete old_ra; 393 delete old_ra;
398 394
399 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
401
402 free (tabs);
403 } 397 }
404 398
405 CLEAR_ALL_SELECTION (); 399 CLEAR_ALL_SELECTION ();
406 400
407 prev_nrow = nrow; 401 prev_nrow = nrow;
408 prev_ncol = ncol; 402 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 403
418 tt_winch (); 404 tt_winch ();
419 405
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 406 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 407}
… …
433 delete ralloc; ralloc = 0; 419 delete ralloc; ralloc = 0;
434 420
435 free (row_buf); 421 free (row_buf);
436 free (swap_buf); 422 free (swap_buf);
437 free (drawn_buf); 423 free (drawn_buf);
424 row_buf = 0; // signal that we freed all the arrays above
425
438 free (tabs); 426 free (tabs);
439 427 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 428 }
442} 429}
443 430
444/* ------------------------------------------------------------------------- */ 431/* ------------------------------------------------------------------------- */
445/* 432/*
446 * Hard reset 433 * Hard/Soft reset
447 */ 434 */
448void 435void
449rxvt_term::scr_poweron () 436rxvt_term::scr_poweron ()
450{ 437{
451 scr_release (); 438 scr_release ();
452 prev_nrow = prev_ncol = 0; 439 prev_nrow = prev_ncol = 0;
440 rvideo_mode = false;
441 scr_soft_reset ();
453 scr_reset (); 442 scr_reset ();
454 443
455 scr_clear (true); 444 scr_clear (true);
456 scr_refresh (); 445 scr_refresh ();
446}
447
448void
449rxvt_term::scr_soft_reset ()
450{
451 /* only affects modes, nothing drastic such as clearing the screen */
452#if ENABLE_OVERLAY
453 scr_overlay_off ();
454#endif
455
456 if (current_screen != PRIMARY)
457 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
457} 468}
458 469
459/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
787 798
788 while (str < strend) 799 while (str < strend)
789 { 800 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 802
792 if (c < 0x20) 803 if (expect_false (c < 0x20))
793 if (c == C0_LF) 804 if (c == C0_LF)
794 { 805 {
795 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
796 807
797 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
816 { 827 {
817 scr_tab (1, true); 828 scr_tab (1, true);
818 continue; 829 continue;
819 } 830 }
820 831
832 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
824 { 837 {
825 checksel = 0; 838 checksel = 0;
826 /* 839 /*
827 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 842 * should be a similar check.
830 */ 843 */
831 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
832 } 845 }
833 846
834 if (screen.flags & Screen_WrapNext) 847 if (expect_false (screen.flags & Screen_WrapNext))
835 { 848 {
836 scr_do_wrap (); 849 scr_do_wrap ();
837 850
838 line->l = ncol; 851 line->l = ncol;
839 line->is_longer (1); 852 line->is_longer (1);
… …
841 row = screen.cur.row; 854 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
843 } 856 }
844 857
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 860 c = 0xfffd;
848 861
849 // rely on wcwidth to tell us the character width, do wcwidth before 862 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
852 // locale. 865 // locale.
853 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
854 867
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 869 {
857 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 871 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
875 } 888 }
876 } 889 }
877 890
878 if (screen.flags & Screen_Insert) 891 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
880 893
881 if (width != 0) 894 if (width != 0)
882 { 895 {
883#if !UNICODE_3 896#if !UNICODE_3
… …
889 c = 0xfffd; 902 c = 0xfffd;
890# endif 903# endif
891#endif 904#endif
892 905
893 // nuke the character at this position, if required 906 // nuke the character at this position, if required
907 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
897 { 918 {
898 int col = screen.cur.col; 919 // ... 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 = ' '; 920 c = NOCHAR;
921 // and try the same character next loop iteration 921 // and try the same character next loop iteration
922 --str; 922 --str;
923 } 923 }
924 924
925 line->touch (); 925 line->touch ();
… …
927 do 927 do
928 { 928 {
929 line->t[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
931 931
932 if (screen.cur.col < ncol - 1) 932 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 933 screen.cur.col++;
934 else 934 else
935 { 935 {
936 line->l = ncol; 936 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
… …
939 break; 939 break;
940 } 940 }
941 941
942 c = NOCHAR; 942 c = NOCHAR;
943 } 943 }
944 while (--width > 0); 944 while (expect_false (--width > 0));
945 945
946 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 947 if (expect_false (!width))
948 { 948 {
949 line->touch (); 949 line->touch ();
950 950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 952 {
953 line->t[c] = ' '; 953 line->t[c] = ' ';
954 line->r[c] = rend; 954 line->r[c] = rend;
955 } 955 }
956 } 956 }
957 } 957 }
958#if ENABLE_COMBINING
958 else // width == 0 959 else // width == 0
959 { 960 {
960#if ENABLE_COMBINING 961 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 { 962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
971 linep = line; 973 linep = line;
972 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 999 }
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 } 1000 }
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 1001#endif
998 }
999 } 1002 }
1000 1003
1001 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1002 1005
1003#ifdef DEBUG_STRICT 1006#ifdef DEBUG_STRICT
… …
1011 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1012 */ 1015 */
1013void 1016void
1014rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1015{ 1018{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1019 { 1020 {
1020 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1021 { 1022 {
1022#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1025 --screen.cur.row;
1025 return; 1026
1027 want_refresh = 1;
1026#endif 1028#endif
1027 } 1029 }
1028 } 1030 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1031 else
1030 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1033}
1034 1034
1035/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1036/* 1036/*
1037 * Process Horizontal Tab 1037 * Process Horizontal Tab
… …
1230/* 1230/*
1231 * Erase part or whole of a line 1231 * Erase part or whole of a line
1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1235 */ 1236 */
1236void 1237void
1237rxvt_term::scr_erase_line (int mode) NOTHROW 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1238{ 1239{
1239 unsigned int col, num; 1240 unsigned int col, num;
… …
1248 line.touch (); 1249 line.touch ();
1249 line.is_longer (0); 1250 line.is_longer (0);
1250 1251
1251 switch (mode) 1252 switch (mode)
1252 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1253 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1254 col = screen.cur.col; 1261 col = screen.cur.col;
1255 num = ncol - col; 1262 num = ncol - col;
1256 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1260 break; 1268 break;
1269
1261 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1262 col = 0; 1271 col = 0;
1263 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1264 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1267 break; 1277 break;
1278
1268 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1269 col = 0; 1280 col = 0;
1270 num = ncol; 1281 num = ncol;
1271 line.l = 0; 1282 line.l = 0;
1272 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1330 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1331 return; 1342 return;
1332 1343
1333 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1334 1345
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1335 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1352 {
1339 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1340 CLEAR_ROWS (row, num); 1354
1355 if (mapped && !view_start)
1356 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False);
1341 } 1359 }
1342 else 1360 else
1343 { 1361 {
1344 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1363
1364 if (mapped && !view_start)
1365 {
1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 ERASE_ROWS (row, num); 1368 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start),
1370 (unsigned int)width,
1371 (unsigned int)Height2Pixel (num));
1348 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1349 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1350 } 1375 }
1351 1376
1352 for (; num--; row++) 1377 for (; num--; row++)
1353 { 1378 {
1354 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1355 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1356 } 1383 }
1357} 1384}
1358 1385
1359#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1360void 1387void
… …
1434 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1435 */ 1462 */
1436void 1463void
1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1438{ 1465{
1439 int col, row;
1440 rend_t tr;
1441
1442 want_refresh = 1; 1466 want_refresh = 1;
1443 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1444 1468
1445 if (count <= 0) 1469 if (count <= 0)
1446 return; 1470 return;
… …
1448 scr_do_wrap (); 1472 scr_do_wrap ();
1449 1473
1450 selection_check (1); 1474 selection_check (1);
1451 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1452 1476
1453 row = screen.cur.row; 1477 int row = screen.cur.row;
1454 1478
1455 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1456 1480
1457 line->touch (); 1481 line->touch ();
1458 line->is_longer (0); 1482 line->is_longer (0);
1459 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1460 switch (insdel) 1488 switch (insdel)
1461 { 1489 {
1462 case INSERT: 1490 case INSERT:
1463 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1491 line->l = min (line->l + count, ncol);
1492
1493 if (line->t[screen.cur.col] == NOCHAR)
1494 scr_kill_char (*line, screen.cur.col);
1495
1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1464 { 1497 {
1465 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1466 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1467 } 1500 }
1468
1469 line->l = min (line->l + count, ncol);
1470 1501
1471 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473 { 1504 {
1474 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
… …
1489 case ERASE: 1520 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1522 selection_check (1);
1492 screen.cur.col -= count; 1523 screen.cur.col -= count;
1493 1524
1494 line->l = max (line->l - count, 0); 1525 // nuke wide char after the end
1526 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1527 scr_kill_char (*line, screen.cur.col + count);
1528
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1530 break;
1497 1531
1498 case DELETE: 1532 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1500 1534
1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1538
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1540 {
1503 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1505 } 1543 }
1506 1544
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1546
1510 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1549 {
1513 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1891 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent[0]);
1892# endif 1929# endif
1893 1930
1894# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1895 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1896 { 1933 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 1934# endif
1904 1935
1905 if (option (Opt_visualBell)) 1936 if (option (Opt_visualBell))
1906 { 1937 {
1907 rvideo_bell = true; 1938 rvideo_bell = true;
… …
1920void 1951void
1921rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1922{ 1953{
1923#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1924 int nrows, row_start; 1955 int nrows, row_start;
1925 FILE *fd; 1956 FILE *fd = popen_printer ();
1926 1957
1927 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1928 return; 1959 return;
1929 1960
1930 if (fullhist) 1961 if (fullhist)
1931 { 1962 {
1932 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1997 return; 2028 return;
1998 2029
1999 /* 2030 /*
2000 * A: set up vars 2031 * A: set up vars
2001 */ 2032 */
2033 refresh_count = 0;
2034
2002 have_bg = 0; 2035 have_bg = 0;
2003 refresh_count = 0;
2004
2005#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2006 have_bg |= bgPixmap.pixmap != None; 2037 have_bg = bgPixmap.pixmap != None;
2007#endif 2038#endif
2008 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2009 2040
2010 /* 2041 /*
2011 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
… …
2202 continue; 2233 continue;
2203 2234
2204 // redraw one or more characters 2235 // redraw one or more characters
2205 2236
2206 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2207 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2208 --col; 2239 --col;
2209 2240
2210 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2211 text_t *text = stp + col; 2242 text_t *text = stp + col;
2212 int count = 1; 2243 int count = 1;
… …
2249 2280
2250 col--; /* went one too far. move back */ 2281 col--; /* went one too far. move back */
2251 count -= i; /* dump any matching trailing chars */ 2282 count -= i; /* dump any matching trailing chars */
2252 2283
2253 // sometimes we optimize away the trailing NOCHAR's, add them back 2284 // sometimes we optimize away the trailing NOCHAR's, add them back
2254 while (i && text[count] == NOCHAR) 2285 while (expect_false (i && text[count] == NOCHAR))
2255 count++, i--; 2286 count++, i--;
2256 2287
2257 /* 2288 /*
2258 * Determine the attributes for the string 2289 * Determine the attributes for the string
2259 */ 2290 */
2260 int fore = fgcolor_of (rend); // desired foreground 2291 int fore = fgcolor_of (rend); // desired foreground
2261 int back = bgcolor_of (rend); // desired background 2292 int back = bgcolor_of (rend); // desired background
2262 2293
2263 // only do special processing if any attributes are set, which is unlikely 2294 // 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)) 2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2265 { 2296 {
2266 bool invert = rend & RS_RVid; 2297 bool invert = rend & RS_RVid;
2267 2298
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2299#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (rend & RS_Bold && fore == Color_fg) 2300 if (rend & RS_Bold && fore == Color_fg)
… …
2352 /* 2383 /*
2353 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2354 */ 2385 */
2355 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2356 2387
2357 if (have_bg && back == Color_bg) 2388 if (expect_true (have_bg && back == Color_bg))
2358 { 2389 {
2359 // this is very ugly, maybe push it into ->draw? 2390 // this is very ugly, maybe push it into ->draw?
2360 2391
2361 for (i = 0; i < count; i++) /* don't draw empty strings */ 2392 for (i = 0; i < count; i++) /* don't draw empty strings */
2362 if (text[i] != ' ') 2393 if (text[i] != ' ')
… …
2369 did_clear: ; 2400 did_clear: ;
2370 } 2401 }
2371 else 2402 else
2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2373 2404
2374 if (rend & RS_Uline && font->descent > 1 && fore != back) 2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2375 { 2406 {
2376#if ENABLE_FRILLS 2407#if ENABLE_FRILLS
2377 if (ISSET_PIXCOLOR (Color_underline)) 2408 if (ISSET_PIXCOLOR (Color_underline))
2378 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2409 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2379 else 2410 else
2380#endif 2411#endif
2381 XSetForeground (dpy, gc, pix_colors[fore]); 2412 XSetForeground (dpy, gc, pix_colors[fore]);
2382 2413
2383 XDrawLine (dpy, drawBuffer, gc, 2414 XDrawLine (dpy, vt, gc,
2384 xpixel, ypixel + font->ascent + 1, 2415 xpixel, ypixel + font->ascent + 1,
2385 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2386 } 2417 }
2387 } /* for (col....) */ 2418 } /* for (col....) */
2388 } /* for (row....) */ 2419 } /* for (row....) */
… …
2426 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2427 else 2458 else
2428#endif 2459#endif
2429 XSetForeground (dpy, gc, pix_colors[ccol1]); 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2430 2461
2431 XDrawRectangle (dpy, drawBuffer, gc, 2462 XDrawRectangle (dpy, vt, gc,
2432 Col2Pixel (col), 2463 Col2Pixel (col),
2433 Row2Pixel (oldcursor.row), 2464 Row2Pixel (oldcursor.row),
2434 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2465 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2435 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2436 } 2467 }
… …
2479 2510
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2511 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2512 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483 2514
2484# if HAVE_SCROLLBARS
2485 if (scrollBar.win) 2515 if (scrollBar.win)
2486 { 2516 {
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.setIdle (); 2518 scrollBar.state = STATE_IDLE;
2489 scrollbar_show (0); 2519 scrollBar.show (0);
2490 } 2520 }
2521
2491# endif 2522#endif
2492 2523
2524 /* bgPixmap.apply () does not do the following : */
2493 scr_clear (); 2525 scr_clear ();
2494 scr_touch (true); 2526 scr_touch (true);
2495 want_refresh = 1; 2527 want_refresh = 1;
2496
2497#endif
2498} 2528}
2499 2529
2500/* ------------------------------------------------------------------------- */ 2530/* ------------------------------------------------------------------------- */
2501void 2531void
2502rxvt_term::scr_clear (bool really) NOTHROW 2532rxvt_term::scr_clear (bool really) NOTHROW
… …
2591{ 2621{
2592 int row, wrote; 2622 int row, wrote;
2593 unsigned int width, towrite; 2623 unsigned int width, towrite;
2594 char r1[] = "\n"; 2624 char r1[] = "\n";
2595 2625
2596 for (row = saveLines - nsaved; 2626 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++) 2627 row < saveLines + nrow - 1; row++)
2598 { 2628 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l 2629 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol; 2630 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote) 2631 for (towrite = width; towrite; towrite -= wrote)
… …
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2682 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2683 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2684 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2685 data[i] = C0_CR;
2656 2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[200~");
2689
2657 tt_write (data, len); 2690 tt_write (data, len);
2691
2692 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~");
2658} 2694}
2659 2695
2660/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2661/* 2697/*
2662 * Respond to a notification that a primary selection has been sent 2698 * Respond to a notification that a primary selection has been sent

Diff Legend

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