| … | |
… | |
| 351 | lofs += len; |
351 | lofs += len; |
| 352 | qcol += len; |
352 | qcol += len; |
| 353 | } |
353 | } |
| 354 | } |
354 | } |
| 355 | |
355 | |
| 356 | qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; |
356 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
|
|
357 | #ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY |
|
|
358 | if (qline->l < 0) |
|
|
359 | { |
| 357 | printf ("qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
360 | fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
|
|
361 | qline->l = 0; |
|
|
362 | } |
|
|
363 | #endif |
| 358 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
364 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
| 359 | } |
365 | } |
| 360 | while (p != pend && q > 0); |
366 | while (p != pend && q > 0); |
| 361 | |
367 | |
| 362 | term_start = total_rows - nrow; |
368 | term_start = total_rows - nrow; |
| … | |
… | |
| 2184 | * Determine the attributes for the string |
2190 | * Determine the attributes for the string |
| 2185 | */ |
2191 | */ |
| 2186 | int fore = GET_FGCOLOR (rend); // desired foreground |
2192 | int fore = GET_FGCOLOR (rend); // desired foreground |
| 2187 | int back = GET_BGCOLOR (rend); // desired background |
2193 | int back = GET_BGCOLOR (rend); // desired background |
| 2188 | |
2194 | |
| 2189 | // only do special processing if any attributes are set, which is rare |
2195 | // only do special processing if any attributes are set, which is unlikely |
| 2190 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2196 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
| 2191 | { |
2197 | { |
| 2192 | #if ENABLE_STYLES |
2198 | #if ENABLE_STYLES |
| 2193 | // force redraw after "careful" characters to avoid pixel droppings |
2199 | // force redraw after "careful" characters to avoid pixel droppings |
| 2194 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2200 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
| … | |
… | |
| 3670 | for (int y = ov_h; y--; ) |
3676 | for (int y = ov_h; y--; ) |
| 3671 | { |
3677 | { |
| 3672 | text_t *t1 = ov_text[y]; |
3678 | text_t *t1 = ov_text[y]; |
| 3673 | rend_t *r1 = ov_rend[y]; |
3679 | rend_t *r1 = ov_rend[y]; |
| 3674 | |
3680 | |
| 3675 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3681 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
| 3676 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3682 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
| 3677 | |
3683 | |
| 3678 | for (int x = ov_w; x--; ) |
3684 | for (int x = ov_w; x--; ) |
| 3679 | { |
3685 | { |
| 3680 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3686 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
| 3681 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3687 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
