| … | |
… | |
| 898 | # else |
898 | # else |
| 899 | c = 0xfffd; |
899 | c = 0xfffd; |
| 900 | # endif |
900 | # endif |
| 901 | #endif |
901 | #endif |
| 902 | |
902 | |
|
|
903 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
904 | |
|
|
905 | // if the character doesn't fit into the remaining columns... |
|
|
906 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
907 | { |
|
|
908 | if (screen.flags & Screen_Autowrap) |
|
|
909 | { |
|
|
910 | // ... artificially enlargen the previous one |
|
|
911 | c = NOCHAR; |
|
|
912 | // and try the same character next loop iteration |
|
|
913 | --str; |
|
|
914 | } |
|
|
915 | else |
|
|
916 | screen.cur.col = ncol - width; |
|
|
917 | } |
|
|
918 | |
| 903 | // nuke the character at this position, if required |
919 | // nuke the character at this position, if required |
| 904 | if (expect_false ( |
920 | if (expect_false ( |
| 905 | line->t[screen.cur.col] == NOCHAR |
921 | line->t[screen.cur.col] == NOCHAR |
| 906 | || (screen.cur.col < ncol - 1 |
922 | || (screen.cur.col < ncol - 1 |
| 907 | && line->t[screen.cur.col + 1] == NOCHAR) |
923 | && line->t[screen.cur.col + 1] == NOCHAR) |
| 908 | )) |
924 | )) |
| 909 | scr_kill_char (*line, screen.cur.col); |
925 | scr_kill_char (*line, screen.cur.col); |
| 910 | |
|
|
| 911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
| 912 | |
|
|
| 913 | // if the character doesn't fit into the remaining columns... |
|
|
| 914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
|
|
| 915 | { |
|
|
| 916 | // ... artificially enlargen the previous one |
|
|
| 917 | c = NOCHAR; |
|
|
| 918 | // and try the same character next loop iteration |
|
|
| 919 | --str; |
|
|
| 920 | } |
|
|
| 921 | |
926 | |
| 922 | line->touch (); |
927 | line->touch (); |
| 923 | |
928 | |
| 924 | do |
929 | do |
| 925 | { |
930 | { |
| … | |
… | |
| 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 | /* ------------------------------------------------------------------------- */ |
| … | |
… | |
| 1336 | if (row >= nrow) /* Out Of Bounds */ |
1343 | if (row >= nrow) /* Out Of Bounds */ |
| 1337 | return; |
1344 | return; |
| 1338 | |
1345 | |
| 1339 | min_it (num, nrow - row); |
1346 | min_it (num, nrow - row); |
| 1340 | |
1347 | |
| 1341 | // TODO: the code below does not work when view_start != 0 |
|
|
| 1342 | // the workaround is to disable the clear and use a normal refresh |
|
|
| 1343 | // when view_start != 0. mysterious. |
|
|
| 1344 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1348 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
| 1345 | ren = (rend_t) ~RS_None; |
1349 | ren = (rend_t) ~RS_None; |
| 1346 | else if (GET_BASEBG (rstyle) == Color_bg) |
1350 | else if (GET_BASEBG (rstyle) == Color_bg) |
| 1347 | { |
1351 | { |
| 1348 | ren = DEFAULT_RSTYLE; |
1352 | ren = DEFAULT_RSTYLE; |
| 1349 | |
1353 | |
| 1350 | if (mapped && !view_start) |
1354 | if (mapped) |
| 1351 | XClearArea (dpy, vt, 0, |
1355 | XClearArea (dpy, vt, 0, |
| 1352 | Row2Pixel (row - view_start), (unsigned int)width, |
1356 | Row2Pixel (row - view_start), (unsigned int)width, |
| 1353 | (unsigned int)Height2Pixel (num), False); |
1357 | (unsigned int)Height2Pixel (num), False); |
| 1354 | } |
1358 | } |
| 1355 | else |
1359 | else |
| 1356 | { |
1360 | { |
| 1357 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1361 | ren = rstyle & (RS_fgMask | RS_bgMask); |
| 1358 | |
1362 | |
| 1359 | if (mapped && !view_start) |
1363 | if (mapped) |
| 1360 | { |
1364 | { |
| 1361 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1365 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
| 1362 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1366 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
| 1363 | XFillRectangle (dpy, vt, gc, |
1367 | XFillRectangle (dpy, vt, gc, |
| 1364 | 0, Row2Pixel (row - view_start), |
1368 | 0, Row2Pixel (row - view_start), |
| … | |
… | |
| 1371 | |
1375 | |
| 1372 | for (; num--; row++) |
1376 | for (; num--; row++) |
| 1373 | { |
1377 | { |
| 1374 | scr_blank_screen_mem (ROW(row), rstyle); |
1378 | scr_blank_screen_mem (ROW(row), rstyle); |
| 1375 | |
1379 | |
| 1376 | if (!view_start) |
1380 | if (row - view_start < nrow) |
| 1377 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1381 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
| 1378 | } |
1382 | } |
| 1379 | } |
1383 | } |
| 1380 | |
1384 | |
| 1381 | #if !ENABLE_MINIMAL |
1385 | #if !ENABLE_MINIMAL |
| 1382 | void |
1386 | void |
