… | |
… | |
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) |
… | |
… | |
2438 | |
2448 | |
2439 | #if ENABLE_FRILLS |
2449 | #if ENABLE_FRILLS |
2440 | if (selection.rect) |
2450 | if (selection.rect) |
2441 | { |
2451 | { |
2442 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2452 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
|
|
2453 | { |
|
|
2454 | text_t *stp = ROW(row).t; |
|
|
2455 | rend_t *srp = ROW(row).r; |
|
|
2456 | |
2443 | for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) |
2457 | for (col = selection.beg.col; col < selection.end.col; col++) |
2444 | srp[col] ^= RS_RVid; |
2458 | srp[col] ^= RS_RVid; |
|
|
2459 | |
|
|
2460 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2461 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2462 | } |
2445 | } |
2463 | } |
2446 | else |
2464 | else |
2447 | #endif |
2465 | #endif |
2448 | { |
2466 | { |
2449 | if (selection.beg.row >= -view_start) |
2467 | if (selection.beg.row >= -view_start) |
… | |
… | |
2452 | row = selection.beg.row; |
2470 | row = selection.beg.row; |
2453 | } |
2471 | } |
2454 | else |
2472 | else |
2455 | { |
2473 | { |
2456 | col = 0; |
2474 | col = 0; |
2457 | row = view_start; |
2475 | row = -view_start; |
2458 | } |
2476 | } |
2459 | |
2477 | |
2460 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2478 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2461 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2479 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2462 | srp[col] ^= RS_RVid; |
2480 | srp[col] ^= RS_RVid; |
… | |
… | |
2876 | #endif |
2894 | #endif |
2877 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2895 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2878 | |
2896 | |
2879 | col = max (col, 0); |
2897 | col = max (col, 0); |
2880 | |
2898 | |
2881 | if (row == selection.end.row || selection.rect) |
2899 | if (row == selection.end.row |
|
|
2900 | #if ENABLE_FRILLS |
|
|
2901 | || selection.rect |
|
|
2902 | #endif |
|
|
2903 | ) |
2882 | end_col = min (end_col, selection.end.col); |
2904 | min_it (end_col, selection.end.col); |
2883 | |
2905 | |
2884 | t = ROW(row).t + col; |
2906 | t = ROW(row).t + col; |
2885 | for (; col < end_col; col++) |
2907 | for (; col < end_col; col++) |
2886 | { |
2908 | { |
2887 | if (*t == NOCHAR) |
2909 | if (*t == NOCHAR) |
… | |
… | |
2905 | #endif |
2927 | #endif |
2906 | else |
2928 | else |
2907 | new_selection_text[ofs++] = *t++; |
2929 | new_selection_text[ofs++] = *t++; |
2908 | } |
2930 | } |
2909 | |
2931 | |
|
|
2932 | #if ENABLE_FRILLS |
|
|
2933 | if (selection.rect) |
|
|
2934 | { |
|
|
2935 | while (ofs |
|
|
2936 | && new_selection_text[ofs - 1] != C0_LF |
|
|
2937 | && unicode::is_space (new_selection_text[ofs - 1])) |
|
|
2938 | --ofs; |
|
|
2939 | |
|
|
2940 | new_selection_text[ofs++] = C0_LF; |
|
|
2941 | } |
|
|
2942 | else |
|
|
2943 | #endif |
2910 | if (!ROW(row).is_longer () && row != selection.end.row) |
2944 | if (!ROW(row).is_longer () && row != selection.end.row) |
2911 | new_selection_text[ofs++] = C0_LF; |
2945 | new_selection_text[ofs++] = C0_LF; |
2912 | } |
2946 | } |
2913 | |
2947 | |
2914 | if (end_col != selection.end.col) |
2948 | if (end_col != selection.end.col) |
2915 | new_selection_text[ofs++] = C0_LF; |
2949 | new_selection_text[ofs++] = C0_LF; |
2916 | |
2950 | |
… | |
… | |
3338 | { |
3372 | { |
3339 | stp = ROW(end_row).t; |
3373 | stp = ROW(end_row).t; |
3340 | |
3374 | |
3341 | while (--end_col >= 0) |
3375 | while (--end_col >= 0) |
3342 | { |
3376 | { |
3343 | if (stp[end_col] != ' ' |
3377 | if (stp[end_col] != NOCHAR |
3344 | && stp[end_col] != '\t' |
3378 | && !unicode::is_space (stp[end_col])) |
3345 | && stp[end_col] != NOCHAR) |
|
|
3346 | break; |
3379 | break; |
3347 | } |
3380 | } |
3348 | |
3381 | |
3349 | if (end_col >= 0 |
3382 | if (end_col >= 0 |
3350 | || !ROW(end_row - 1).is_longer ()) |
3383 | || !ROW(end_row - 1).is_longer ()) |
… | |
… | |
3666 | for (int y = ov_h; y--; ) |
3699 | for (int y = ov_h; y--; ) |
3667 | { |
3700 | { |
3668 | text_t *t1 = ov_text[y]; |
3701 | text_t *t1 = ov_text[y]; |
3669 | rend_t *r1 = ov_rend[y]; |
3702 | rend_t *r1 = ov_rend[y]; |
3670 | |
3703 | |
3671 | text_t *t2 = ROW(y - view_start).t + ov_x; |
3704 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3672 | rend_t *r2 = ROW(y - view_start).r + ov_x; |
3705 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3673 | |
3706 | |
3674 | for (int x = ov_w; x--; ) |
3707 | for (int x = ov_w; x--; ) |
3675 | { |
3708 | { |
3676 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3709 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3677 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3710 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |