… | |
… | |
126 | width = ncol; |
126 | width = ncol; |
127 | } |
127 | } |
128 | |
128 | |
129 | l.touch (); |
129 | l.touch (); |
130 | |
130 | |
131 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
133 | |
134 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
136 | |
136 | |
… | |
… | |
640 | l.touch (); |
640 | l.touch (); |
641 | } |
641 | } |
642 | |
642 | |
643 | // erase newly scrolled-in lines |
643 | // erase newly scrolled-in lines |
644 | for (int i = count; i--; ) |
644 | for (int i = count; i--; ) |
|
|
645 | { |
|
|
646 | line_t &l = ROW(nrow - 1 - i); |
|
|
647 | |
|
|
648 | // optimize if already cleared, can be significant on slow machines |
|
|
649 | // could be rolled into scr_blank_screen_mem |
|
|
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) |
|
|
651 | { |
|
|
652 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
653 | l.l = 0; |
|
|
654 | l.f = 0; |
|
|
655 | } |
|
|
656 | else |
645 | scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); |
657 | scr_blank_screen_mem (l, rstyle); |
|
|
658 | } |
646 | |
659 | |
647 | // now copy lines below the scroll region bottom to the |
660 | // now copy lines below the scroll region bottom to the |
648 | // bottom of the screen again, so they look as if they |
661 | // bottom of the screen again, so they look as if they |
649 | // hadn't moved. |
662 | // hadn't moved. |
650 | for (int i = nrow; --i > row2; ) |
663 | for (int i = nrow; --i > row2; ) |
… | |
… | |
1101 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1102 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1103 | * Move cursor left in row. If we're at the left boundary, shift everything |
1116 | * Move cursor left in row. If we're at the left boundary, shift everything |
1104 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1105 | */ |
1118 | */ |
1106 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1107 | void |
1120 | void |
1108 | rxvt_term::scr_backindex () NOTHROW |
1121 | rxvt_term::scr_backindex () NOTHROW |
1109 | { |
1122 | { |
1110 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1111 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1118 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1119 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1120 | * Move cursor right in row. If we're at the right boundary, shift everything |
1133 | * Move cursor right in row. If we're at the right boundary, shift everything |
1121 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1122 | */ |
1135 | */ |
1123 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1124 | void |
1137 | void |
1125 | rxvt_term::scr_forwardindex () NOTHROW |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1126 | { |
1139 | { |
1127 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1128 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1342 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1343 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1344 | } |
1357 | } |
1345 | } |
1358 | } |
1346 | |
1359 | |
1347 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1348 | void |
1361 | void |
1349 | rxvt_term::scr_erase_savelines () NOTHROW |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1350 | { |
1363 | { |
1351 | want_refresh = 1; |
1364 | want_refresh = 1; |
1352 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
… | |
… | |
1741 | { |
1754 | { |
1742 | bool found = false; |
1755 | bool found = false; |
1743 | |
1756 | |
1744 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1745 | { |
1758 | { |
1746 | int col = 0; |
|
|
1747 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1748 | |
1760 | |
1749 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1750 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1751 | { |
1763 | { |
1752 | found = true; |
1764 | found = true; |
1753 | *drp = ~value; |
1765 | *drp = ~value; |
1754 | } |
1766 | } |
… | |
… | |
2245 | && RS_SAME (rend, srp[text - stp - 1])) |
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
2246 | text--, count++, xpixel -= fwidth; |
2258 | text--, count++, xpixel -= fwidth; |
2247 | |
2259 | |
2248 | // force redraw after "careful" characters to avoid pixel droppings |
2260 | // force redraw after "careful" characters to avoid pixel droppings |
2249 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
2261 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
2250 | drp[col + i + 1] = ~srp[col + i + 1]; |
2262 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
2251 | |
2263 | |
2252 | // force redraw before "careful" characters to avoid pixel droppings |
2264 | // force redraw before "careful" characters to avoid pixel droppings |
2253 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
2265 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
2254 | drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; |
2266 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
2255 | #endif |
2267 | #endif |
2256 | |
2268 | |
2257 | bool invert = rend & RS_RVid; |
2269 | bool invert = rend & RS_RVid; |
2258 | |
2270 | |
2259 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2317 | * Actually do the drawing of the string here |
2329 | * Actually do the drawing of the string here |
2318 | */ |
2330 | */ |
2319 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2331 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2320 | |
2332 | |
2321 | if (back == fore) |
2333 | if (back == fore) |
2322 | font->clear_rect (*drawable, xpixel, ypixel, |
2334 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
2323 | fwidth * count, fheight, |
|
|
2324 | back); |
|
|
2325 | else if (back == Color_bg) |
2335 | else if (back == Color_bg) |
2326 | { |
2336 | { |
2327 | if (must_clear) |
2337 | if (must_clear) |
2328 | { |
2338 | { |
2329 | CLEAR_CHARS (xpixel, ypixel, count); |
2339 | CLEAR_CHARS (xpixel, ypixel, count); |
… | |
… | |
2536 | { |
2546 | { |
2537 | if (selection.op |
2547 | if (selection.op |
2538 | && current_screen == selection.screen |
2548 | && current_screen == selection.screen |
2539 | && selection.end.row >= view_start) |
2549 | && selection.end.row >= view_start) |
2540 | { |
2550 | { |
2541 | #if ENABLE_FRILLS |
2551 | #if !ENABLE_MINIMAL |
2542 | if (selection.rect) |
2552 | if (selection.rect) |
2543 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2553 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2544 | selection.end.row, selection.end.col, |
2554 | selection.end.row, selection.end.col, |
2545 | RS_RVid, RS_RVid | RS_Uline); |
2555 | RS_RVid, RS_RVid | RS_Uline); |
2546 | else |
2556 | else |
… | |
… | |
2761 | } |
2771 | } |
2762 | |
2772 | |
2763 | char **cl; |
2773 | char **cl; |
2764 | int cr; |
2774 | int cr; |
2765 | |
2775 | |
2766 | #if ENABLE_FRILLS |
2776 | #if !ENABLE_MINIMAL |
2767 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2777 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2768 | // so recode it manually |
2778 | // so recode it manually |
2769 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2779 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2770 | { |
2780 | { |
2771 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2781 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2942 | |
2952 | |
2943 | int end_col; |
2953 | int end_col; |
2944 | |
2954 | |
2945 | for (; row <= selection.end.row; row++, col = 0) |
2955 | for (; row <= selection.end.row; row++, col = 0) |
2946 | { |
2956 | { |
2947 | #if ENABLE_FRILLS |
2957 | #if !ENABLE_MINIMAL |
2948 | if (selection.rect) |
2958 | if (selection.rect) |
2949 | { |
2959 | { |
2950 | col = selection.beg.col; |
2960 | col = selection.beg.col; |
2951 | end_col = ncol + 1; |
2961 | end_col = ncol + 1; |
2952 | } |
2962 | } |
… | |
… | |
2955 | end_col = ROW(row).l; |
2965 | end_col = ROW(row).l; |
2956 | |
2966 | |
2957 | col = max (col, 0); |
2967 | col = max (col, 0); |
2958 | |
2968 | |
2959 | if (row == selection.end.row |
2969 | if (row == selection.end.row |
2960 | #if ENABLE_FRILLS |
2970 | #if !ENABLE_MINIMAL |
2961 | || selection.rect |
2971 | || selection.rect |
2962 | #endif |
2972 | #endif |
2963 | ) |
2973 | ) |
2964 | min_it (end_col, selection.end.col); |
2974 | min_it (end_col, selection.end.col); |
2965 | |
2975 | |
… | |
… | |
2988 | #endif |
2998 | #endif |
2989 | else |
2999 | else |
2990 | new_selection_text[ofs++] = *t++; |
3000 | new_selection_text[ofs++] = *t++; |
2991 | } |
3001 | } |
2992 | |
3002 | |
2993 | #if ENABLE_FRILLS |
3003 | #if !ENABLE_MINIMAL |
2994 | if (selection.rect) |
3004 | if (selection.rect) |
2995 | { |
3005 | { |
2996 | while (ofs |
3006 | while (ofs |
2997 | && new_selection_text[ofs - 1] != C0_LF |
3007 | && new_selection_text[ofs - 1] != C0_LF |
2998 | && unicode::is_space (new_selection_text[ofs - 1])) |
3008 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3359 | |
3369 | |
3360 | if (selection.clicks == 1) |
3370 | if (selection.clicks == 1) |
3361 | { |
3371 | { |
3362 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3372 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3363 | && !ROW(selection.beg.row).is_longer () |
3373 | && !ROW(selection.beg.row).is_longer () |
3364 | #if ENABLE_FRILLS |
3374 | #if !ENABLE_MINIMAL |
3365 | && !selection.rect |
3375 | && !selection.rect |
3366 | #endif |
3376 | #endif |
3367 | ) |
3377 | ) |
3368 | selection.beg.col = ncol; |
3378 | selection.beg.col = ncol; |
3369 | |
3379 | |
3370 | if ( |
3380 | if ( |
3371 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3381 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3372 | && !ROW(selection.end.row).is_longer () |
3382 | && !ROW(selection.end.row).is_longer () |
3373 | #if ENABLE_FRILLS |
3383 | #if !ENABLE_MINIMAL |
3374 | && !selection.rect |
3384 | && !selection.rect |
3375 | #endif |
3385 | #endif |
3376 | ) |
3386 | ) |
3377 | selection.end.col = ncol; |
3387 | selection.end.col = ncol; |
3378 | } |
3388 | } |
… | |
… | |
3395 | { |
3405 | { |
3396 | if (!ROW(end_row).is_longer ()) |
3406 | if (!ROW(end_row).is_longer ()) |
3397 | { |
3407 | { |
3398 | selection.end.row = end_row; |
3408 | selection.end.row = end_row; |
3399 | selection.end.col = ROW(end_row).l; |
3409 | selection.end.col = ROW(end_row).l; |
|
|
3410 | # if !ENABLE_MINIMAL |
3400 | selection_remove_trailing_spaces (); |
3411 | selection_remove_trailing_spaces (); |
|
|
3412 | # endif |
3401 | break; |
3413 | break; |
3402 | } |
3414 | } |
3403 | } |
3415 | } |
3404 | } |
3416 | } |
3405 | else |
3417 | else |
… | |
… | |
3434 | selection.mark.row = selection.beg.row; |
3446 | selection.mark.row = selection.beg.row; |
3435 | selection.mark.col = selection.beg.col; |
3447 | selection.mark.col = selection.beg.col; |
3436 | } |
3448 | } |
3437 | } |
3449 | } |
3438 | |
3450 | |
3439 | #if ENABLE_FRILLS |
3451 | #if !ENABLE_MINIMAL |
3440 | if (selection.rect && selection.beg.col > selection.end.col) |
3452 | if (selection.rect && selection.beg.col > selection.end.col) |
3441 | ::swap (selection.beg.col, selection.end.col); |
3453 | ::swap (selection.beg.col, selection.end.col); |
3442 | #endif |
3454 | #endif |
3443 | } |
3455 | } |
3444 | |
3456 | |
3445 | #if ENABLE_FRILLS |
3457 | #if !ENABLE_MINIMAL |
3446 | void |
3458 | void |
3447 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3459 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3448 | { |
3460 | { |
3449 | int32_t end_col, end_row; |
3461 | int32_t end_col, end_row; |
3450 | text_t *stp; |
3462 | text_t *stp; |
… | |
… | |
3575 | style = enc_string; |
3587 | style = enc_string; |
3576 | else if (target == xa[XA_TEXT]) |
3588 | else if (target == xa[XA_TEXT]) |
3577 | style = enc_text; |
3589 | style = enc_text; |
3578 | else if (target == xa[XA_COMPOUND_TEXT]) |
3590 | else if (target == xa[XA_COMPOUND_TEXT]) |
3579 | style = enc_compound_text; |
3591 | style = enc_compound_text; |
3580 | #if ENABLE_FRILLS |
3592 | #if !ENABLE_MINIMAL |
3581 | else if (target == xa[XA_UTF8_STRING]) |
3593 | else if (target == xa[XA_UTF8_STRING]) |
3582 | style = enc_utf8; |
3594 | style = enc_utf8; |
3583 | #endif |
3595 | #endif |
3584 | else |
3596 | else |
3585 | { |
3597 | { |
… | |
… | |
3596 | { |
3608 | { |
3597 | cl = L""; |
3609 | cl = L""; |
3598 | selectlen = 0; |
3610 | selectlen = 0; |
3599 | } |
3611 | } |
3600 | |
3612 | |
3601 | #if ENABLE_FRILLS |
3613 | #if !ENABLE_MINIMAL |
3602 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3614 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3603 | // so recode it manually |
3615 | // so recode it manually |
3604 | if (style == enc_utf8) |
3616 | if (style == enc_utf8) |
3605 | { |
3617 | { |
3606 | freect = 1; |
3618 | freect = 1; |