… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
35 | static inline void |
35 | static inline void |
36 | fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
37 | { |
37 | { |
38 | while (len--) |
38 | while (len--) |
… | |
… | |
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
912 | |
912 | |
913 | // if the character doesn't fit into the remaining columns... |
913 | // if the character doesn't fit into the remaining columns... |
914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
915 | { |
915 | { |
|
|
916 | if (screen.flags & Screen_Autowrap) |
|
|
917 | { |
916 | // ... artificially enlargen the previous one |
918 | // ... artificially enlargen the previous one |
917 | c = NOCHAR; |
919 | c = NOCHAR; |
918 | // and try the same character next loop iteration |
920 | // and try the same character next loop iteration |
919 | --str; |
921 | --str; |
|
|
922 | } |
|
|
923 | else |
|
|
924 | screen.cur.col = ncol - width; |
920 | } |
925 | } |
921 | |
926 | |
922 | line->touch (); |
927 | line->touch (); |
923 | |
928 | |
924 | do |
929 | do |
… | |
… | |
1336 | if (row >= nrow) /* Out Of Bounds */ |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1337 | return; |
1342 | return; |
1338 | |
1343 | |
1339 | min_it (num, nrow - row); |
1344 | min_it (num, nrow - row); |
1340 | |
1345 | |
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)) |
1346 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1345 | ren = (rend_t) ~RS_None; |
1347 | ren = (rend_t) ~RS_None; |
1346 | else if (GET_BASEBG (rstyle) == Color_bg) |
1348 | else if (GET_BASEBG (rstyle) == Color_bg) |
1347 | { |
1349 | { |
1348 | ren = DEFAULT_RSTYLE; |
1350 | ren = DEFAULT_RSTYLE; |
1349 | |
1351 | |
1350 | if (mapped && !view_start) |
1352 | if (mapped) |
1351 | XClearArea (dpy, vt, 0, |
1353 | XClearArea (dpy, vt, 0, |
1352 | Row2Pixel (row - view_start), (unsigned int)width, |
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
1353 | (unsigned int)Height2Pixel (num), False); |
1355 | (unsigned int)Height2Pixel (num), False); |
1354 | } |
1356 | } |
1355 | else |
1357 | else |
1356 | { |
1358 | { |
1357 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1358 | |
1360 | |
1359 | if (mapped && !view_start) |
1361 | if (mapped) |
1360 | { |
1362 | { |
1361 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1362 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1363 | XFillRectangle (dpy, vt, gc, |
1365 | XFillRectangle (dpy, vt, gc, |
1364 | 0, Row2Pixel (row - view_start), |
1366 | 0, Row2Pixel (row - view_start), |
… | |
… | |
1371 | |
1373 | |
1372 | for (; num--; row++) |
1374 | for (; num--; row++) |
1373 | { |
1375 | { |
1374 | scr_blank_screen_mem (ROW(row), rstyle); |
1376 | scr_blank_screen_mem (ROW(row), rstyle); |
1375 | |
1377 | |
1376 | if (!view_start) |
1378 | if (row - view_start < nrow) |
1377 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1378 | } |
1380 | } |
1379 | } |
1381 | } |
1380 | |
1382 | |
1381 | #if !ENABLE_MINIMAL |
1383 | #if !ENABLE_MINIMAL |
1382 | void |
1384 | void |