… | |
… | |
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 (color > 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 | } |
… | |
… | |
1863 | # endif |
1885 | # endif |
1864 | |
1886 | |
1865 | if (OPTION (Opt_visualBell)) |
1887 | if (OPTION (Opt_visualBell)) |
1866 | { |
1888 | { |
1867 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1889 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1890 | display->flush (); |
1868 | rxvt_usleep (VISUAL_BELL_DURATION); |
1891 | rxvt_usleep (VISUAL_BELL_DURATION); |
1869 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1892 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1870 | } |
1893 | } |
1871 | else |
1894 | else |
1872 | XBell (display->display, 0); |
1895 | XBell (display->display, 0); |
… | |
… | |
2380 | /* |
2403 | /* |
2381 | * H: cleanup selection |
2404 | * H: cleanup selection |
2382 | */ |
2405 | */ |
2383 | scr_reverse_selection (); |
2406 | scr_reverse_selection (); |
2384 | |
2407 | |
2385 | if (refresh_type & SMOOTH_REFRESH) |
|
|
2386 | XFlush (display->display); |
|
|
2387 | |
|
|
2388 | num_scr = 0; |
2408 | num_scr = 0; |
2389 | num_scr_allow = 1; |
2409 | num_scr_allow = 1; |
2390 | } |
2410 | } |
2391 | |
2411 | |
2392 | void |
2412 | void |
… | |
… | |
2456 | |
2476 | |
2457 | if (really) |
2477 | if (really) |
2458 | XClearWindow (display->display, vt); |
2478 | XClearWindow (display->display, vt); |
2459 | } |
2479 | } |
2460 | |
2480 | |
|
|
2481 | void |
|
|
2482 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
|
|
2483 | { |
|
|
2484 | int view_end = -view_start + nrow; |
|
|
2485 | int row, col; |
|
|
2486 | |
|
|
2487 | for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) |
|
|
2488 | { |
|
|
2489 | text_t *stp = ROW(row).t; |
|
|
2490 | rend_t *srp = ROW(row).r; |
|
|
2491 | |
|
|
2492 | for (col = beg_col; col < end_col; col++) |
|
|
2493 | srp[col] ^= rstyle1; |
|
|
2494 | |
|
|
2495 | while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2496 | srp[col] ^= rstyle2; |
|
|
2497 | |
|
|
2498 | if (++col < end_col) |
|
|
2499 | srp[col] ^= rstyle2; |
|
|
2500 | } |
|
|
2501 | } |
|
|
2502 | |
|
|
2503 | void |
|
|
2504 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
|
|
2505 | { |
|
|
2506 | int view_end = -view_start + nrow; |
|
|
2507 | int row, col; |
|
|
2508 | |
|
|
2509 | if (beg_row >= -view_start) |
|
|
2510 | { |
|
|
2511 | col = beg_col; |
|
|
2512 | row = beg_row; |
|
|
2513 | } |
|
|
2514 | else |
|
|
2515 | { |
|
|
2516 | col = 0; |
|
|
2517 | row = -view_start; |
|
|
2518 | } |
|
|
2519 | |
|
|
2520 | for (; row < min (end_row, view_end); row++, col = 0) |
|
|
2521 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2522 | srp[col] ^= rstyle; |
|
|
2523 | |
|
|
2524 | if (row == end_row) |
|
|
2525 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
|
|
2526 | srp[col] ^= rstyle; |
|
|
2527 | } |
|
|
2528 | |
2461 | /* ------------------------------------------------------------------------- */ |
2529 | /* ------------------------------------------------------------------------- */ |
2462 | void |
2530 | void |
2463 | rxvt_term::scr_reverse_selection () |
2531 | rxvt_term::scr_reverse_selection () |
2464 | { |
2532 | { |
2465 | if (selection.op |
2533 | if (selection.op |
2466 | && current_screen == selection.screen |
2534 | && current_screen == selection.screen |
2467 | && selection.end.row >= -view_start) |
2535 | && selection.end.row >= -view_start) |
2468 | { |
2536 | { |
2469 | int view_end = -view_start + nrow; |
|
|
2470 | int row, col; |
|
|
2471 | |
|
|
2472 | #if ENABLE_FRILLS |
2537 | #if ENABLE_FRILLS |
2473 | if (selection.rect) |
2538 | if (selection.rect) |
2474 | { |
2539 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2475 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2540 | selection.end.row, selection.end.col, |
2476 | { |
2541 | RS_RVid, RS_RVid | RS_Uline); |
2477 | text_t *stp = ROW(row).t; |
|
|
2478 | rend_t *srp = ROW(row).r; |
|
|
2479 | |
|
|
2480 | for (col = selection.beg.col; col < selection.end.col; col++) |
|
|
2481 | srp[col] ^= RS_RVid; |
|
|
2482 | |
|
|
2483 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2484 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2485 | |
|
|
2486 | if (++col < selection.end.col) |
|
|
2487 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2488 | } |
|
|
2489 | } |
|
|
2490 | else |
2542 | else |
2491 | #endif |
2543 | #endif |
2492 | { |
2544 | scr_xor_span (selection.beg.row, selection.beg.col, |
2493 | if (selection.beg.row >= -view_start) |
2545 | selection.end.row, selection.end.col, |
2494 | { |
2546 | RS_RVid); |
2495 | col = selection.beg.col; |
|
|
2496 | row = selection.beg.row; |
|
|
2497 | } |
|
|
2498 | else |
|
|
2499 | { |
|
|
2500 | col = 0; |
|
|
2501 | row = -view_start; |
|
|
2502 | } |
|
|
2503 | |
|
|
2504 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
|
|
2505 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2506 | srp[col] ^= RS_RVid; |
|
|
2507 | |
|
|
2508 | if (row == selection.end.row) |
|
|
2509 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
|
|
2510 | srp[col] ^= RS_RVid; |
|
|
2511 | } |
|
|
2512 | } |
2547 | } |
2513 | } |
2548 | } |
2514 | |
2549 | |
2515 | /* ------------------------------------------------------------------------- */ |
2550 | /* ------------------------------------------------------------------------- */ |
2516 | /* |
2551 | /* |
… | |
… | |
3008 | { |
3043 | { |
3009 | display->set_selection_owner (this); |
3044 | display->set_selection_owner (this); |
3010 | return true; |
3045 | return true; |
3011 | } |
3046 | } |
3012 | else |
3047 | else |
|
|
3048 | { |
|
|
3049 | selection_clear (); |
3013 | return false; |
3050 | return false; |
|
|
3051 | } |
3014 | |
3052 | |
3015 | #if 0 |
3053 | #if 0 |
3016 | XTextProperty ct; |
3054 | XTextProperty ct; |
3017 | |
3055 | |
3018 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3056 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
… | |
… | |
3031 | void |
3069 | void |
3032 | rxvt_term::selection_click (int clicks, int x, int y) |
3070 | rxvt_term::selection_click (int clicks, int x, int y) |
3033 | { |
3071 | { |
3034 | clicks = ((clicks - 1) % 3) + 1; |
3072 | clicks = ((clicks - 1) % 3) + 1; |
3035 | 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 | } |
3036 | |
3083 | |
3037 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3084 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3038 | |
3085 | |
3039 | if (clicks == 2 || clicks == 3) |
3086 | if (clicks == 2 || clicks == 3) |
3040 | selection_extend_colrow (selection.mark.col, |
3087 | selection_extend_colrow (selection.mark.col, |
… | |
… | |
3336 | else if (selection.clicks == 2) |
3383 | else if (selection.clicks == 2) |
3337 | { |
3384 | { |
3338 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3385 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3339 | selection.end.col--; |
3386 | selection.end.col--; |
3340 | |
3387 | |
3341 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3342 | { |
|
|
3343 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3388 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3344 | selection_delimit_word (DN, &selection.end, &selection.end); |
3389 | selection_delimit_word (DN, &selection.end, &selection.end); |
3345 | } |
|
|
3346 | } |
3390 | } |
3347 | else if (selection.clicks == 3) |
3391 | else if (selection.clicks == 3) |
3348 | { |
3392 | { |
3349 | #if ENABLE_FRILLS |
3393 | #if ENABLE_FRILLS |
3350 | if (OPTION (Opt_tripleclickwords)) |
3394 | if (OPTION (Opt_tripleclickwords)) |