| … | |
… | |
| 144 | col--; |
144 | col--; |
| 145 | |
145 | |
| 146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
| 147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
| 148 | |
148 | |
|
|
149 | l.touch (); |
|
|
150 | |
| 149 | // found start, nuke |
151 | // found start, nuke |
| 150 | do { |
152 | do { |
| 151 | l.t[col] = ' '; |
153 | l.t[col] = ' '; |
| 152 | l.r[col] = rend; |
154 | l.r[col] = rend; |
| 153 | col++; |
155 | col++; |
| … | |
… | |
| 898 | # else |
900 | # else |
| 899 | c = 0xfffd; |
901 | c = 0xfffd; |
| 900 | # endif |
902 | # endif |
| 901 | #endif |
903 | #endif |
| 902 | |
904 | |
| 903 | // nuke the character at this position, if required |
|
|
| 904 | if (expect_false ( |
|
|
| 905 | line->t[screen.cur.col] == NOCHAR |
|
|
| 906 | || (screen.cur.col < ncol - 1 |
|
|
| 907 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
| 908 | )) |
|
|
| 909 | scr_kill_char (*line, screen.cur.col); |
|
|
| 910 | |
|
|
| 911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
905 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
| 912 | |
906 | |
| 913 | // if the character doesn't fit into the remaining columns... |
907 | // if the character doesn't fit into the remaining columns... |
| 914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
908 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
| 915 | { |
909 | { |
|
|
910 | if (screen.flags & Screen_Autowrap) |
|
|
911 | { |
| 916 | // ... artificially enlargen the previous one |
912 | // ... artificially enlargen the previous one |
| 917 | c = NOCHAR; |
913 | c = NOCHAR; |
| 918 | // and try the same character next loop iteration |
914 | // and try the same character next loop iteration |
| 919 | --str; |
915 | --str; |
|
|
916 | } |
|
|
917 | else |
|
|
918 | screen.cur.col = ncol - width; |
| 920 | } |
919 | } |
|
|
920 | |
|
|
921 | // nuke the character at this position, if required |
|
|
922 | // due to wonderful coincidences everywhere else in this loop |
|
|
923 | // we never have to check for overwriting a wide char itself, |
|
|
924 | // only its tail. |
|
|
925 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
|
|
926 | scr_kill_char (*line, screen.cur.col); |
| 921 | |
927 | |
| 922 | line->touch (); |
928 | line->touch (); |
| 923 | |
929 | |
| 924 | do |
930 | do |
| 925 | { |
931 | { |
| … | |
… | |
| 931 | else |
937 | else |
| 932 | { |
938 | { |
| 933 | line->l = ncol; |
939 | line->l = ncol; |
| 934 | if (screen.flags & Screen_Autowrap) |
940 | if (screen.flags & Screen_Autowrap) |
| 935 | screen.flags |= Screen_WrapNext; |
941 | screen.flags |= Screen_WrapNext; |
| 936 | break; |
942 | |
|
|
943 | goto end_of_line; |
| 937 | } |
944 | } |
| 938 | |
945 | |
| 939 | c = NOCHAR; |
946 | c = NOCHAR; |
| 940 | } |
947 | } |
| 941 | while (expect_false (--width > 0)); |
948 | while (expect_false (--width > 0)); |
| 942 | |
949 | |
| 943 | // pad with spaces when overwriting wide character with smaller one |
950 | // pad with spaces when overwriting wide character with smaller one |
| 944 | if (expect_false (!width)) |
951 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
| 945 | { |
952 | { |
| 946 | line->touch (); |
|
|
| 947 | |
|
|
| 948 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
| 949 | { |
|
|
| 950 | line->t[c] = ' '; |
953 | line->t[c] = ' '; |
| 951 | line->r[c] = rend; |
954 | line->r[c] = rend; |
| 952 | } |
|
|
| 953 | } |
955 | } |
|
|
956 | |
|
|
957 | end_of_line: |
|
|
958 | ; |
| 954 | } |
959 | } |
| 955 | #if ENABLE_COMBINING |
960 | #if ENABLE_COMBINING |
| 956 | else // width == 0 |
961 | else // width == 0 |
| 957 | { |
962 | { |
| 958 | if (c != 0xfeff) // ignore BOM |
963 | if (c != 0xfeff) // ignore BOM |
| … | |
… | |
| 1021 | |
1026 | |
| 1022 | want_refresh = 1; |
1027 | want_refresh = 1; |
| 1023 | #endif |
1028 | #endif |
| 1024 | } |
1029 | } |
| 1025 | } |
1030 | } |
|
|
1031 | else if (screen.flags & Screen_WrapNext) |
|
|
1032 | screen.flags &= ~Screen_WrapNext; |
| 1026 | else |
1033 | else |
| 1027 | scr_gotorc (0, -1, RELATIVE); |
1034 | scr_gotorc (0, -1, RELATIVE); |
| 1028 | } |
1035 | } |
| 1029 | |
1036 | |
| 1030 | /* ------------------------------------------------------------------------- */ |
1037 | /* ------------------------------------------------------------------------- */ |
| … | |
… | |
| 2620 | void |
2627 | void |
| 2621 | rxvt_term::scr_dump (int fd) NOTHROW |
2628 | rxvt_term::scr_dump (int fd) NOTHROW |
| 2622 | { |
2629 | { |
| 2623 | int row, wrote; |
2630 | int row, wrote; |
| 2624 | unsigned int width, towrite; |
2631 | unsigned int width, towrite; |
| 2625 | char r1[] = "\n"; |
2632 | const char r1[] = "\n"; |
| 2626 | |
2633 | |
| 2627 | for (row = saveLines + top_row; |
2634 | for (row = saveLines + top_row; |
| 2628 | row < saveLines + nrow - 1; row++) |
2635 | row < saveLines + nrow - 1; row++) |
| 2629 | { |
2636 | { |
| 2630 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2637 | width = row_buf[row].l >= 0 ? row_buf[row].l |
