… | |
… | |
572 | * Change the colour for following text |
572 | * Change the colour for following text |
573 | */ |
573 | */ |
574 | void |
574 | void |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
576 | { |
576 | { |
577 | if (!IN_RANGE_INC (color, minTermCOLOR, maxTermCOLOR)) |
577 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
578 | color = fgbg; |
578 | color = fgbg; |
579 | |
579 | |
580 | if (fgbg == Color_fg) |
580 | if (fgbg == Color_fg) |
581 | rstyle = SET_FGCOLOR (rstyle, color); |
581 | rstyle = SET_FGCOLOR (rstyle, color); |
582 | else |
582 | else |
… | |
… | |
613 | want_refresh = 1; |
613 | want_refresh = 1; |
614 | num_scr += count; |
614 | num_scr += count; |
615 | |
615 | |
616 | if (count > 0 |
616 | if (count > 0 |
617 | && row1 == 0 |
617 | && row1 == 0 |
618 | && row2 == nrow - 1 |
|
|
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
618 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
620 | { |
619 | { |
621 | nsaved = min (nsaved + count, saveLines); |
620 | nsaved = min (nsaved + count, saveLines); |
622 | |
621 | |
623 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
622 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
624 | |
623 | |
|
|
624 | // scroll everything up 'count' lines |
625 | term_start = (term_start + count) % total_rows; |
625 | term_start = (term_start + count) % total_rows; |
626 | |
626 | |
|
|
627 | { |
|
|
628 | // severe bottommost scrolled line |
|
|
629 | line_t &l = ROW(row2 - count); |
|
|
630 | l.touch (); |
|
|
631 | l.is_longer (0); |
|
|
632 | } |
|
|
633 | |
|
|
634 | // erase newly scorlled-in lines |
|
|
635 | for (int i = count; i; --i ) |
|
|
636 | { |
|
|
637 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
638 | // it is worth the effort on slower machines |
|
|
639 | line_t &l = ROW(nrow - i); |
|
|
640 | |
|
|
641 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
642 | |
|
|
643 | l.l = 0; |
|
|
644 | l.f = 0; |
|
|
645 | } |
|
|
646 | |
|
|
647 | // now copy lines below the scroll region bottom to the |
|
|
648 | // bottom of the screen again, so they look as if they |
|
|
649 | // hadn't moved. |
|
|
650 | for (int i = nrow; --i > row2; ) |
|
|
651 | { |
|
|
652 | line_t &l1 = ROW(i - count); |
|
|
653 | line_t &l2 = ROW(i); |
|
|
654 | |
|
|
655 | ::swap (l1, l2); |
|
|
656 | l2.touch (); |
|
|
657 | } |
|
|
658 | |
|
|
659 | // move and/or clear selection, if any |
627 | if (selection.op && current_screen == selection.screen) |
660 | if (selection.op && current_screen == selection.screen) |
628 | { |
661 | { |
629 | selection.beg.row -= count; |
662 | selection.beg.row -= count; |
630 | selection.end.row -= count; |
663 | selection.end.row -= count; |
631 | selection.mark.row -= count; |
664 | selection.mark.row -= count; |
… | |
… | |
637 | CLEAR_ALL_SELECTION (); |
670 | CLEAR_ALL_SELECTION (); |
638 | selection.op = SELECTION_CLEAR; |
671 | selection.op = SELECTION_CLEAR; |
639 | } |
672 | } |
640 | } |
673 | } |
641 | |
674 | |
642 | for (int i = count; i--; ) |
675 | // finally move the view window, if desired |
643 | { |
|
|
644 | // basically thi is a slightly optimized scr_blank_screen_mem |
|
|
645 | // it is worth the effort on slower machines |
|
|
646 | line_t &l = ROW(row2 - i); |
|
|
647 | |
|
|
648 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
649 | |
|
|
650 | l.l = 0; |
|
|
651 | l.f = 0; |
|
|
652 | } |
|
|
653 | |
|
|
654 | if (OPTION (Opt_scrollWithBuffer) |
676 | if (OPTION (Opt_scrollWithBuffer) |
655 | && view_start != 0 |
677 | && view_start != 0 |
656 | && view_start != saveLines) |
678 | && view_start != saveLines) |
657 | scr_page (UP, count); |
679 | scr_page (UP, count); |
658 | } |
680 | } |
… | |
… | |
3021 | { |
3043 | { |
3022 | display->set_selection_owner (this); |
3044 | display->set_selection_owner (this); |
3023 | return true; |
3045 | return true; |
3024 | } |
3046 | } |
3025 | else |
3047 | else |
|
|
3048 | { |
|
|
3049 | selection_clear (); |
3026 | return false; |
3050 | return false; |
|
|
3051 | } |
3027 | |
3052 | |
3028 | #if 0 |
3053 | #if 0 |
3029 | XTextProperty ct; |
3054 | XTextProperty ct; |
3030 | |
3055 | |
3031 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3056 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
… | |
… | |
3044 | void |
3069 | void |
3045 | rxvt_term::selection_click (int clicks, int x, int y) |
3070 | rxvt_term::selection_click (int clicks, int x, int y) |
3046 | { |
3071 | { |
3047 | clicks = ((clicks - 1) % 3) + 1; |
3072 | clicks = ((clicks - 1) % 3) + 1; |
3048 | selection.clicks = clicks; /* save clicks so extend will work */ |
3073 | selection.clicks = clicks; /* save clicks so extend will work */ |
|
|
3074 | |
|
|
3075 | if (clicks == 2 && !selection.rect |
|
|
3076 | && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3077 | { |
|
|
3078 | MEvent.clicks = 1; // what a mess |
|
|
3079 | selection.screen = current_screen; |
|
|
3080 | selection.op = SELECTION_CONT; |
|
|
3081 | return; |
|
|
3082 | } |
3049 | |
3083 | |
3050 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3084 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3051 | |
3085 | |
3052 | if (clicks == 2 || clicks == 3) |
3086 | if (clicks == 2 || clicks == 3) |
3053 | selection_extend_colrow (selection.mark.col, |
3087 | selection_extend_colrow (selection.mark.col, |
… | |
… | |
3349 | else if (selection.clicks == 2) |
3383 | else if (selection.clicks == 2) |
3350 | { |
3384 | { |
3351 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3385 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3352 | selection.end.col--; |
3386 | selection.end.col--; |
3353 | |
3387 | |
3354 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3355 | { |
|
|
3356 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3388 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3357 | selection_delimit_word (DN, &selection.end, &selection.end); |
3389 | selection_delimit_word (DN, &selection.end, &selection.end); |
3358 | } |
|
|
3359 | } |
3390 | } |
3360 | else if (selection.clicks == 3) |
3391 | else if (selection.clicks == 3) |
3361 | { |
3392 | { |
3362 | #if ENABLE_FRILLS |
3393 | #if ENABLE_FRILLS |
3363 | if (OPTION (Opt_tripleclickwords)) |
3394 | if (OPTION (Opt_tripleclickwords)) |