| … | |
… | |
| 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 | { |
| … | |
… | |
| 922 | } |
916 | } |
| 923 | else |
917 | else |
| 924 | screen.cur.col = ncol - width; |
918 | screen.cur.col = ncol - width; |
| 925 | } |
919 | } |
| 926 | |
920 | |
|
|
921 | // nuke the character at this position, if required |
|
|
922 | if (expect_false ( |
|
|
923 | line->t[screen.cur.col] == NOCHAR |
|
|
924 | || (screen.cur.col < ncol - 1 |
|
|
925 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
926 | )) |
|
|
927 | scr_kill_char (*line, screen.cur.col); |
|
|
928 | |
| 927 | line->touch (); |
929 | line->touch (); |
| 928 | |
930 | |
| 929 | do |
931 | do |
| 930 | { |
932 | { |
| 931 | line->t[screen.cur.col] = c; |
933 | line->t[screen.cur.col] = c; |
| … | |
… | |
| 936 | else |
938 | else |
| 937 | { |
939 | { |
| 938 | line->l = ncol; |
940 | line->l = ncol; |
| 939 | if (screen.flags & Screen_Autowrap) |
941 | if (screen.flags & Screen_Autowrap) |
| 940 | screen.flags |= Screen_WrapNext; |
942 | screen.flags |= Screen_WrapNext; |
| 941 | break; |
943 | |
|
|
944 | goto end_of_line; |
| 942 | } |
945 | } |
| 943 | |
946 | |
| 944 | c = NOCHAR; |
947 | c = NOCHAR; |
| 945 | } |
948 | } |
| 946 | while (expect_false (--width > 0)); |
949 | while (expect_false (--width > 0)); |
| 947 | |
950 | |
| 948 | // pad with spaces when overwriting wide character with smaller one |
951 | // pad with spaces when overwriting wide character with smaller one |
| 949 | if (expect_false (!width)) |
952 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
| 950 | { |
953 | { |
| 951 | line->touch (); |
|
|
| 952 | |
|
|
| 953 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
|
|
| 954 | { |
|
|
| 955 | line->t[c] = ' '; |
954 | line->t[c] = ' '; |
| 956 | line->r[c] = rend; |
955 | line->r[c] = rend; |
| 957 | } |
|
|
| 958 | } |
956 | } |
|
|
957 | |
|
|
958 | end_of_line: |
|
|
959 | ; |
| 959 | } |
960 | } |
| 960 | #if ENABLE_COMBINING |
961 | #if ENABLE_COMBINING |
| 961 | else // width == 0 |
962 | else // width == 0 |
| 962 | { |
963 | { |
| 963 | if (c != 0xfeff) // ignore BOM |
964 | if (c != 0xfeff) // ignore BOM |
| … | |
… | |
| 1026 | |
1027 | |
| 1027 | want_refresh = 1; |
1028 | want_refresh = 1; |
| 1028 | #endif |
1029 | #endif |
| 1029 | } |
1030 | } |
| 1030 | } |
1031 | } |
|
|
1032 | else if (screen.flags & Screen_WrapNext) |
|
|
1033 | screen.flags &= ~Screen_WrapNext; |
| 1031 | else |
1034 | else |
| 1032 | scr_gotorc (0, -1, RELATIVE); |
1035 | scr_gotorc (0, -1, RELATIVE); |
| 1033 | } |
1036 | } |
| 1034 | |
1037 | |
| 1035 | /* ------------------------------------------------------------------------- */ |
1038 | /* ------------------------------------------------------------------------- */ |
