| … | |
… | |
| 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 | { |
|
|
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 |
| 357 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
364 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
| 358 | } |
365 | } |
| 359 | while (p != pend && q > 0); |
366 | while (p != pend && q > 0); |
| 360 | |
367 | |
| 361 | term_start = total_rows - nrow; |
368 | term_start = total_rows - nrow; |
| … | |
… | |
| 630 | selection.op = SELECTION_CLEAR; |
637 | selection.op = SELECTION_CLEAR; |
| 631 | } |
638 | } |
| 632 | } |
639 | } |
| 633 | |
640 | |
| 634 | for (int i = count; i--; ) |
641 | for (int i = count; i--; ) |
|
|
642 | { |
|
|
643 | ROW(row2 - i).l = 0; |
| 635 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
644 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
645 | } |
| 636 | |
646 | |
| 637 | if ((options & Opt_scrollWithBuffer) |
647 | if ((options & Opt_scrollWithBuffer) |
| 638 | && view_start != 0 |
648 | && view_start != 0 |
| 639 | && view_start != saveLines) |
649 | && view_start != saveLines) |
| 640 | scr_page (UP, count); |
650 | scr_page (UP, count); |
| … | |
… | |
| 733 | { |
743 | { |
| 734 | c = *str++; |
744 | c = *str++; |
| 735 | |
745 | |
| 736 | if (c < 0x20) |
746 | if (c < 0x20) |
| 737 | if (c == C0_LF) |
747 | if (c == C0_LF) |
| 738 | { |
748 | { |
| 739 | if (!line->is_longer ()) /* XXX: think about this */ |
749 | if (!line->is_longer ()) /* XXX: think about this */ |
| 740 | max_it (line->l, screen.cur.col); |
750 | max_it (line->l, screen.cur.col); |
| 741 | |
751 | |
| 742 | screen.flags &= ~Screen_WrapNext; |
752 | screen.flags &= ~Screen_WrapNext; |
| 743 | |
753 | |
| … | |
… | |
| 1283 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1293 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
| 1284 | } |
1294 | } |
| 1285 | |
1295 | |
| 1286 | for (; num--; row++) |
1296 | for (; num--; row++) |
| 1287 | { |
1297 | { |
|
|
1298 | ROW (row).l = 0; |
| 1288 | scr_blank_screen_mem (ROW (row), rstyle); |
1299 | scr_blank_screen_mem (ROW (row), rstyle); |
| 1289 | ROW (row).l = 0; |
|
|
| 1290 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1300 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
| 1291 | } |
1301 | } |
| 1292 | } |
1302 | } |
| 1293 | |
1303 | |
| 1294 | #if ENABLE_FRILLS |
1304 | #if ENABLE_FRILLS |
| … | |
… | |
| 2180 | * Determine the attributes for the string |
2190 | * Determine the attributes for the string |
| 2181 | */ |
2191 | */ |
| 2182 | int fore = GET_FGCOLOR (rend); // desired foreground |
2192 | int fore = GET_FGCOLOR (rend); // desired foreground |
| 2183 | int back = GET_BGCOLOR (rend); // desired background |
2193 | int back = GET_BGCOLOR (rend); // desired background |
| 2184 | |
2194 | |
| 2185 | // 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 |
| 2186 | 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)) |
| 2187 | { |
2197 | { |
| 2188 | #if ENABLE_STYLES |
2198 | #if ENABLE_STYLES |
| 2189 | // force redraw after "careful" characters to avoid pixel droppings |
2199 | // force redraw after "careful" characters to avoid pixel droppings |
| 2190 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
2200 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
| … | |
… | |
| 2452 | row = selection.beg.row; |
2462 | row = selection.beg.row; |
| 2453 | } |
2463 | } |
| 2454 | else |
2464 | else |
| 2455 | { |
2465 | { |
| 2456 | col = 0; |
2466 | col = 0; |
| 2457 | row = view_start; |
2467 | row = -view_start; |
| 2458 | } |
2468 | } |
| 2459 | |
2469 | |
| 2460 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2470 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
| 2461 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2471 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
| 2462 | srp[col] ^= RS_RVid; |
2472 | srp[col] ^= RS_RVid; |
| … | |
… | |
| 3666 | for (int y = ov_h; y--; ) |
3676 | for (int y = ov_h; y--; ) |
| 3667 | { |
3677 | { |
| 3668 | text_t *t1 = ov_text[y]; |
3678 | text_t *t1 = ov_text[y]; |
| 3669 | rend_t *r1 = ov_rend[y]; |
3679 | rend_t *r1 = ov_rend[y]; |
| 3670 | |
3680 | |
| 3671 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3681 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
| 3672 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3682 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
| 3673 | |
3683 | |
| 3674 | for (int x = ov_w; x--; ) |
3684 | for (int x = ov_w; x--; ) |
| 3675 | { |
3685 | { |
| 3676 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3686 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
| 3677 | 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)); |
