| … | |
… | |
| 898 | # else |
898 | # else |
| 899 | c = 0xfffd; |
899 | c = 0xfffd; |
| 900 | # endif |
900 | # endif |
| 901 | #endif |
901 | #endif |
| 902 | |
902 | |
| 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)); |
903 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
| 912 | |
904 | |
| 913 | // if the character doesn't fit into the remaining columns... |
905 | // if the character doesn't fit into the remaining columns... |
| 914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
906 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
| 915 | { |
907 | { |
| … | |
… | |
| 921 | --str; |
913 | --str; |
| 922 | } |
914 | } |
| 923 | else |
915 | else |
| 924 | screen.cur.col = ncol - width; |
916 | screen.cur.col = ncol - width; |
| 925 | } |
917 | } |
|
|
918 | |
|
|
919 | // nuke the character at this position, if required |
|
|
920 | if (expect_false ( |
|
|
921 | line->t[screen.cur.col] == NOCHAR |
|
|
922 | || (screen.cur.col < ncol - 1 |
|
|
923 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
924 | )) |
|
|
925 | scr_kill_char (*line, screen.cur.col); |
| 926 | |
926 | |
| 927 | line->touch (); |
927 | line->touch (); |
| 928 | |
928 | |
| 929 | do |
929 | do |
| 930 | { |
930 | { |
| … | |
… | |
| 1026 | |
1026 | |
| 1027 | want_refresh = 1; |
1027 | want_refresh = 1; |
| 1028 | #endif |
1028 | #endif |
| 1029 | } |
1029 | } |
| 1030 | } |
1030 | } |
| 1031 | #ifdef TERMCAP_HAS_BW |
|
|
| 1032 | else if (screen.flags & Screen_WrapNext) |
1031 | else if (screen.flags & Screen_WrapNext) |
| 1033 | screen.flags &= ~Screen_WrapNext; |
1032 | screen.flags &= ~Screen_WrapNext; |
| 1034 | #endif |
|
|
| 1035 | else |
1033 | else |
| 1036 | scr_gotorc (0, -1, RELATIVE); |
1034 | scr_gotorc (0, -1, RELATIVE); |
| 1037 | } |
1035 | } |
| 1038 | |
1036 | |
| 1039 | /* ------------------------------------------------------------------------- */ |
1037 | /* ------------------------------------------------------------------------- */ |
