1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.c |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
… | |
… | |
439 | uint16_t total_rows; |
439 | uint16_t total_rows; |
440 | int i; |
440 | int i; |
441 | |
441 | |
442 | total_rows = TermWin.nrow + TermWin.saveLines; |
442 | total_rows = TermWin.nrow + TermWin.saveLines; |
443 | |
443 | |
444 | #ifdef DEBUG_STRICT |
|
|
445 | for (i = 0; i < total_rows; i++) |
|
|
446 | { |
|
|
447 | if (screen.text[i]) |
|
|
448 | /* then so is screen.rend[i] */ |
|
|
449 | assert (screen.rend[i]); |
|
|
450 | } |
|
|
451 | #endif |
|
|
452 | |
|
|
453 | delete talloc; talloc = 0; |
444 | delete talloc; talloc = 0; |
454 | delete ralloc; ralloc = 0; |
445 | delete ralloc; ralloc = 0; |
455 | |
446 | |
456 | free (screen.text); |
447 | free (screen.text); |
457 | free (screen.tlen); |
448 | free (screen.tlen); |
… | |
… | |
500 | * XTERM_SEQ: Restore cursor: ESC 8 |
491 | * XTERM_SEQ: Restore cursor: ESC 8 |
501 | */ |
492 | */ |
502 | void |
493 | void |
503 | rxvt_term::scr_cursor (int mode) |
494 | rxvt_term::scr_cursor (int mode) |
504 | { |
495 | { |
505 | screen_t *s; |
496 | screen_t *s; |
506 | |
497 | |
507 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
498 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
508 | |
499 | |
509 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
500 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
510 | if (current_screen == SECONDARY) |
501 | if (current_screen == SECONDARY) |
511 | s = & (swap); |
502 | s = &swap; |
512 | else |
503 | else |
513 | #endif |
504 | #endif |
514 | s = & (screen); |
505 | s = &screen; |
|
|
506 | |
515 | switch (mode) |
507 | switch (mode) |
516 | { |
508 | { |
517 | case SAVE: |
509 | case SAVE: |
518 | s->s_cur.row = s->cur.row; |
510 | s->s_cur.row = s->cur.row; |
519 | s->s_cur.col = s->cur.col; |
511 | s->s_cur.col = s->cur.col; |
520 | s->s_rstyle = rstyle; |
512 | s->s_rstyle = rstyle; |
521 | s->s_charset = s->charset; |
513 | s->s_charset = s->charset; |
522 | s->s_charset_char = charsets[s->charset]; |
514 | s->s_charset_char = charsets[s->charset]; |
523 | break; |
515 | break; |
|
|
516 | |
524 | case RESTORE: |
517 | case RESTORE: |
525 | want_refresh = 1; |
518 | want_refresh = 1; |
526 | s->cur.row = s->s_cur.row; |
519 | s->cur.row = s->s_cur.row; |
527 | s->cur.col = s->s_cur.col; |
520 | s->cur.col = s->s_cur.col; |
528 | s->flags &= ~Screen_WrapNext; |
521 | s->flags &= ~Screen_WrapNext; |
… | |
… | |
530 | s->charset = s->s_charset; |
523 | s->charset = s->s_charset; |
531 | charsets[s->charset] = s->s_charset_char; |
524 | charsets[s->charset] = s->s_charset_char; |
532 | set_font_style (); |
525 | set_font_style (); |
533 | break; |
526 | break; |
534 | } |
527 | } |
|
|
528 | |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
529 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
536 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
530 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
537 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
531 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
538 | #ifdef DEBUG_STRICT |
532 | #ifdef DEBUG_STRICT |
539 | assert (s->cur.row >= 0); |
533 | assert (s->cur.row >= 0); |
… | |
… | |
551 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
545 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
552 | */ |
546 | */ |
553 | int |
547 | int |
554 | rxvt_term::scr_change_screen (int scrn) |
548 | rxvt_term::scr_change_screen (int scrn) |
555 | { |
549 | { |
556 | int i; |
550 | int i; |
557 | #if NSCREENS |
551 | #if NSCREENS |
558 | int offset; |
552 | int offset; |
559 | #endif |
553 | #endif |
560 | |
554 | |
561 | want_refresh = 1; |
555 | want_refresh = 1; |
562 | |
556 | |
563 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
557 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
564 | |
558 | |
565 | TermWin.view_start = 0; |
559 | TermWin.view_start = 0; |
566 | |
560 | |
567 | if (current_screen == scrn) |
561 | if (current_screen == scrn) |
568 | return current_screen; |
562 | return scrn; |
569 | |
563 | |
570 | selection_check (2); /* check for boundary cross */ |
564 | selection_check (2); /* check for boundary cross */ |
571 | |
565 | |
572 | SWAP_IT (current_screen, scrn, int); |
566 | SWAP_IT (current_screen, scrn, int); |
573 | #if NSCREENS |
567 | #if NSCREENS |
|
|
568 | if (Options & Opt_secondaryScreen) |
|
|
569 | { |
574 | num_scr = 0; |
570 | num_scr = 0; |
575 | offset = TermWin.saveLines; |
571 | offset = TermWin.saveLines; |
576 | for (i = prev_nrow; i--;) |
572 | for (i = prev_nrow; i--;) |
577 | { |
573 | { |
578 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
574 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
579 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
575 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
580 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
576 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
581 | } |
577 | } |
582 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
578 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
583 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
579 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
584 | # ifdef DEBUG_STRICT |
580 | # ifdef DEBUG_STRICT |
585 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
581 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
586 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
582 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
587 | # else /* drive with your eyes closed */ |
583 | # else /* drive with your eyes closed */ |
588 | MAX_IT (screen.cur.row, 0); |
584 | MAX_IT (screen.cur.row, 0); |
589 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
585 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
590 | MAX_IT (screen.cur.col, 0); |
586 | MAX_IT (screen.cur.col, 0); |
591 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
587 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
592 | # endif |
588 | # endif |
593 | SWAP_IT (screen.charset, swap.charset, int16_t); |
589 | SWAP_IT (screen.charset, swap.charset, int16_t); |
594 | SWAP_IT (screen.flags, swap.flags, int); |
590 | SWAP_IT (screen.flags, swap.flags, int); |
595 | screen.flags |= Screen_VisibleCursor; |
591 | screen.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
592 | swap.flags |= Screen_VisibleCursor; |
597 | #else |
593 | } |
598 | # ifdef SCROLL_ON_NO_SECONDARY |
594 | else |
|
|
595 | #endif |
|
|
596 | if (Options & Opt_secondaryScroll) |
599 | if (current_screen == PRIMARY) |
597 | //if (current_screen == PRIMARY) |
600 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
598 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
601 | # endif |
|
|
602 | #endif |
|
|
603 | return scrn; |
599 | return scrn; |
604 | } |
600 | } |
605 | |
601 | |
606 | /* ------------------------------------------------------------------------- */ |
602 | /* ------------------------------------------------------------------------- */ |
607 | /* |
603 | /* |
… | |
… | |
649 | return 0; |
645 | return 0; |
650 | |
646 | |
651 | want_refresh = 1; |
647 | want_refresh = 1; |
652 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
648 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
653 | |
649 | |
654 | if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) |
650 | if (row1 == 0 && count > 0 |
|
|
651 | && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) |
655 | { |
652 | { |
656 | nscrolled = (long)TermWin.nscrolled + (long)count; |
653 | nscrolled = (long)TermWin.nscrolled + (long)count; |
657 | |
654 | |
658 | if (nscrolled > (long)TermWin.saveLines) |
655 | if (nscrolled > (long)TermWin.saveLines) |
659 | TermWin.nscrolled = TermWin.saveLines; |
656 | TermWin.nscrolled = TermWin.saveLines; |
… | |
… | |
762 | /* ------------------------------------------------------------------------- */ |
759 | /* ------------------------------------------------------------------------- */ |
763 | /* |
760 | /* |
764 | * Add text given in <str> of length <len> to screen struct |
761 | * Add text given in <str> of length <len> to screen struct |
765 | */ |
762 | */ |
766 | void |
763 | void |
767 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
764 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
768 | { |
765 | { |
769 | unsigned char checksel, clearsel; |
766 | unsigned char checksel, clearsel; |
770 | uint32_t c; |
767 | unicode_t c; |
771 | int i, row, last_col; |
768 | int i, row, last_col; |
772 | text_t *stp; |
769 | text_t *stp; |
773 | rend_t *srp; |
770 | rend_t *srp; |
774 | |
771 | |
775 | if (len <= 0) /* sanity */ |
772 | if (len <= 0) /* sanity */ |
776 | return; |
773 | return; |
777 | |
774 | |
778 | want_refresh = 1; |
775 | want_refresh = 1; |
… | |
… | |
801 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
798 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
802 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
799 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
803 | #endif |
800 | #endif |
804 | row = screen.cur.row + TermWin.saveLines; |
801 | row = screen.cur.row + TermWin.saveLines; |
805 | |
802 | |
806 | checksel = (selection.op |
803 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
807 | && current_screen == selection.screen) ? 1 : 0; |
|
|
808 | clearsel = 0; |
804 | clearsel = 0; |
809 | |
805 | |
810 | stp = screen.text[row]; |
806 | stp = screen.text[row]; |
811 | srp = screen.rend[row]; |
807 | srp = screen.rend[row]; |
812 | |
808 | |
813 | for (i = 0; i < len;) |
809 | while (len--) |
814 | { |
810 | { |
815 | c = str[i++]; |
811 | c = *str++; |
|
|
812 | |
|
|
813 | if (c < 0x20) |
816 | switch (c) |
814 | switch (c) |
817 | { |
815 | { |
818 | case '\t': |
816 | case C0_HT: |
819 | scr_tab (1); |
817 | scr_tab (1); |
820 | continue; |
818 | continue; |
821 | case '\n': |
819 | |
|
|
820 | case C0_LF: |
822 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
821 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
823 | MAX_IT (screen.tlen[row], screen.cur.col); |
822 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
823 | |
824 | screen.flags &= ~Screen_WrapNext; |
824 | screen.flags &= ~Screen_WrapNext; |
|
|
825 | |
825 | if (screen.cur.row == screen.bscroll) |
826 | if (screen.cur.row == screen.bscroll) |
826 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
827 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
827 | else if (screen.cur.row < (TermWin.nrow - 1)) |
828 | else if (screen.cur.row < (TermWin.nrow - 1)) |
828 | row = (++screen.cur.row) + TermWin.saveLines; |
829 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
830 | |
829 | stp = screen.text[row]; /* _must_ refresh */ |
831 | stp = screen.text[row]; /* _must_ refresh */ |
830 | srp = screen.rend[row]; /* _must_ refresh */ |
832 | srp = screen.rend[row]; /* _must_ refresh */ |
831 | continue; |
833 | continue; |
832 | case '\r': |
834 | |
|
|
835 | case C0_CR: |
833 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
836 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
834 | MAX_IT (screen.tlen[row], screen.cur.col); |
837 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
838 | |
835 | screen.flags &= ~Screen_WrapNext; |
839 | screen.flags &= ~Screen_WrapNext; |
836 | screen.cur.col = 0; |
840 | screen.cur.col = 0; |
837 | continue; |
841 | continue; |
838 | default: |
|
|
839 | if (c == 127) |
|
|
840 | continue; /* yummmm..... */ |
|
|
841 | break; |
|
|
842 | } |
842 | } |
843 | |
843 | |
844 | if (checksel /* see if we're writing within selection */ |
844 | if (checksel /* see if we're writing within selection */ |
845 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
845 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
846 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
846 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
847 | { |
847 | { |
848 | checksel = 0; |
848 | checksel = 0; |
849 | clearsel = 1; |
849 | clearsel = 1; |
850 | } |
850 | } |
|
|
851 | |
851 | if (screen.flags & Screen_WrapNext) |
852 | if (screen.flags & Screen_WrapNext) |
852 | { |
853 | { |
853 | screen.tlen[row] = -1; |
854 | screen.tlen[row] = -1; |
854 | if (screen.cur.row == screen.bscroll) |
855 | if (screen.cur.row == screen.bscroll) |
855 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
856 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
856 | else if (screen.cur.row < (TermWin.nrow - 1)) |
857 | else if (screen.cur.row < (TermWin.nrow - 1)) |
857 | row = (++screen.cur.row) + TermWin.saveLines; |
858 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
859 | |
858 | stp = screen.text[row]; /* _must_ refresh */ |
860 | stp = screen.text[row]; /* _must_ refresh */ |
859 | srp = screen.rend[row]; /* _must_ refresh */ |
861 | srp = screen.rend[row]; /* _must_ refresh */ |
860 | screen.cur.col = 0; |
862 | screen.cur.col = 0; |
861 | screen.flags &= ~Screen_WrapNext; |
863 | screen.flags &= ~Screen_WrapNext; |
862 | } |
864 | } |
|
|
865 | |
863 | if (screen.flags & Screen_Insert) |
866 | if (screen.flags & Screen_Insert) |
864 | scr_insdel_chars (1, INSERT); |
867 | scr_insdel_chars (1, INSERT); |
865 | |
868 | |
|
|
869 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
|
|
870 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
|
|
871 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
|
|
872 | int width = c < 256 ? 1 : wcwidth (c); |
|
|
873 | |
866 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
874 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
867 | switch (c) |
|
|
868 | { |
875 | { |
869 | // dunno where these come from |
|
|
870 | #if 0 |
|
|
871 | case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; |
|
|
872 | case '.': c = 0x2193; break; case '0': c = 0x25ae; break; |
|
|
873 | #endif |
|
|
874 | // vt100 special graphics and line drawing |
876 | // vt100 special graphics and line drawing |
875 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
877 | static uint16_t vt100_0[32] = { // 5f .. 7e |
876 | case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; |
878 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
877 | case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; |
879 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
878 | case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; |
880 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
879 | case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; |
881 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
880 | case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; |
|
|
881 | case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; |
|
|
882 | case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; |
|
|
883 | case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; |
|
|
884 | case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; |
|
|
885 | case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
|
|
886 | } |
882 | }; |
887 | |
883 | |
888 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
884 | if (c >= 0x5f && c <= 0x7e) |
889 | // rely on wcwidth to tell us the character width, at least for non-ascii |
885 | { |
890 | int width = c <= 128 ? 1 : wcwidth (c); |
886 | c = vt100_0[c - 0x5f]; |
|
|
887 | width = 1; |
|
|
888 | } |
|
|
889 | } |
891 | |
890 | |
892 | // width -1 characters (e.g. combining chars) are ignored currently. |
|
|
893 | if (width > 0) |
891 | if (width > 0) |
894 | { |
892 | { |
|
|
893 | #if !UNICODE_3 && ENABLE_COMBINING |
|
|
894 | // trim characters we can't store directly :( |
|
|
895 | if (c >= 0x10000) |
|
|
896 | c = rxvt_composite.compose (c); // map to lower 16 bits |
|
|
897 | #endif |
|
|
898 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
|
|
899 | |
895 | do |
900 | do |
896 | { |
901 | { |
897 | stp[screen.cur.col] = c; |
902 | stp[screen.cur.col] = c; |
898 | srp[screen.cur.col] = rend; |
903 | srp[screen.cur.col] = rend; |
899 | |
904 | |
… | |
… | |
910 | c = NOCHAR; |
915 | c = NOCHAR; |
911 | } |
916 | } |
912 | while (--width > 0); |
917 | while (--width > 0); |
913 | |
918 | |
914 | // pad with spaces when overwriting wide character with smaller one |
919 | // pad with spaces when overwriting wide character with smaller one |
915 | for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++) |
920 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
916 | { |
921 | { |
917 | stp[c] = ' '; |
922 | stp[c] = ' '; |
918 | srp[c] = rend; |
923 | srp[c] = rend; |
919 | } |
924 | } |
920 | } |
925 | } |
|
|
926 | else if (width == 0) |
|
|
927 | { |
|
|
928 | #if ENABLE_COMBINING |
|
|
929 | // handle combining characters |
|
|
930 | // we just tag the accent on the previous on-screen character. |
|
|
931 | // this is arguably not correct, but also arguably not wrong. |
|
|
932 | // we don't handle double-width characters nicely yet. |
|
|
933 | |
|
|
934 | text_t *tp; |
|
|
935 | rend_t *rp; |
|
|
936 | |
|
|
937 | if (screen.cur.col > 0) |
|
|
938 | { |
|
|
939 | tp = stp + screen.cur.col - 1; |
|
|
940 | rp = srp + screen.cur.col - 1; |
|
|
941 | } |
|
|
942 | else if (screen.cur.row > 0 |
|
|
943 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
|
|
944 | { |
|
|
945 | tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
|
|
946 | rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
|
|
947 | } |
921 | else |
948 | else |
922 | (void)0; /* handle combining character etc. here. */ |
949 | continue; |
|
|
950 | |
|
|
951 | // handle double-width-chars by making them look extremely ugly |
|
|
952 | if (*tp == NOCHAR) |
|
|
953 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
|
|
954 | |
|
|
955 | // first try to find a precomposed character |
|
|
956 | unicode_t n = rxvt_compose (*tp, c); |
|
|
957 | if (n == NOCHAR) |
|
|
958 | n = rxvt_composite.compose (*tp, c); |
|
|
959 | |
|
|
960 | *tp = n; |
|
|
961 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
|
|
962 | #endif |
|
|
963 | } |
923 | } |
964 | } |
924 | |
965 | |
925 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
966 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
926 | MAX_IT (screen.tlen[row], screen.cur.col); |
967 | MAX_IT (screen.tlen[row], screen.cur.col); |
927 | |
968 | |
… | |
… | |
947 | */ |
988 | */ |
948 | void |
989 | void |
949 | rxvt_term::scr_backspace () |
990 | rxvt_term::scr_backspace () |
950 | { |
991 | { |
951 | want_refresh = 1; |
992 | want_refresh = 1; |
|
|
993 | |
952 | if (screen.cur.col == 0) |
994 | if (screen.cur.col == 0) |
953 | { |
995 | { |
954 | if (screen.cur.row > 0) |
996 | if (screen.cur.row > 0) |
955 | { |
997 | { |
956 | #ifdef TERMCAP_HAS_BW |
998 | #ifdef TERMCAP_HAS_BW |
… | |
… | |
961 | |
1003 | |
962 | } |
1004 | } |
963 | } |
1005 | } |
964 | else if ((screen.flags & Screen_WrapNext) == 0) |
1006 | else if ((screen.flags & Screen_WrapNext) == 0) |
965 | scr_gotorc (0, -1, RELATIVE); |
1007 | scr_gotorc (0, -1, RELATIVE); |
|
|
1008 | |
966 | screen.flags &= ~Screen_WrapNext; |
1009 | screen.flags &= ~Screen_WrapNext; |
967 | } |
1010 | } |
968 | |
1011 | |
969 | /* ------------------------------------------------------------------------- */ |
1012 | /* ------------------------------------------------------------------------- */ |
970 | /* |
1013 | /* |
… | |
… | |
973 | * XTERM_SEQ: CTRL-I |
1016 | * XTERM_SEQ: CTRL-I |
974 | */ |
1017 | */ |
975 | void |
1018 | void |
976 | rxvt_term::scr_tab (int count) |
1019 | rxvt_term::scr_tab (int count) |
977 | { |
1020 | { |
978 | int i, x; |
1021 | int i, x; |
979 | |
1022 | |
980 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1023 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
981 | want_refresh = 1; |
1024 | want_refresh = 1; |
982 | i = x = screen.cur.col; |
1025 | i = x = screen.cur.col; |
|
|
1026 | |
983 | if (count == 0) |
1027 | if (count == 0) |
984 | return; |
1028 | return; |
985 | else if (count > 0) |
1029 | else if (count > 0) |
986 | { |
1030 | { |
987 | for (; ++i < TermWin.ncol; ) |
1031 | for (; ++i < TermWin.ncol; ) |
… | |
… | |
989 | { |
1033 | { |
990 | x = i; |
1034 | x = i; |
991 | if (!--count) |
1035 | if (!--count) |
992 | break; |
1036 | break; |
993 | } |
1037 | } |
|
|
1038 | |
994 | if (count) |
1039 | if (count) |
995 | x = TermWin.ncol - 1; |
1040 | x = TermWin.ncol - 1; |
996 | } |
1041 | } |
997 | else /* if (count < 0) */ |
1042 | else /* if (count < 0) */ |
998 | { |
1043 | { |
… | |
… | |
1001 | { |
1046 | { |
1002 | x = i; |
1047 | x = i; |
1003 | if (!++count) |
1048 | if (!++count) |
1004 | break; |
1049 | break; |
1005 | } |
1050 | } |
|
|
1051 | |
1006 | if (count) |
1052 | if (count) |
1007 | x = 0; |
1053 | x = 0; |
1008 | } |
1054 | } |
|
|
1055 | |
1009 | if (x != screen.cur.col) |
1056 | if (x != screen.cur.col) |
1010 | scr_gotorc (0, x, R_RELATIVE); |
1057 | scr_gotorc (0, x, R_RELATIVE); |
1011 | } |
1058 | } |
1012 | |
1059 | |
1013 | /* ------------------------------------------------------------------------- */ |
1060 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1070 | want_refresh = 1; |
1117 | want_refresh = 1; |
1071 | ZERO_SCROLLBACK (); |
1118 | ZERO_SCROLLBACK (); |
1072 | |
1119 | |
1073 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1120 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1074 | |
1121 | |
1075 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1122 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1076 | : col); |
|
|
1077 | MAX_IT (screen.cur.col, 0); |
1123 | MAX_IT (screen.cur.col, 0); |
1078 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1124 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1079 | |
1125 | |
1080 | screen.flags &= ~Screen_WrapNext; |
1126 | screen.flags &= ~Screen_WrapNext; |
1081 | if (relative & R_RELATIVE) |
1127 | if (relative & R_RELATIVE) |
… | |
… | |
1120 | * direction should be UP or DN |
1166 | * direction should be UP or DN |
1121 | */ |
1167 | */ |
1122 | void |
1168 | void |
1123 | rxvt_term::scr_index (enum page_dirn direction) |
1169 | rxvt_term::scr_index (enum page_dirn direction) |
1124 | { |
1170 | { |
1125 | int dirn; |
1171 | int dirn; |
1126 | |
1172 | |
1127 | want_refresh = 1; |
1173 | want_refresh = 1; |
1128 | dirn = ((direction == UP) ? 1 : -1); |
1174 | dirn = ((direction == UP) ? 1 : -1); |
1129 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1175 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1130 | |
1176 | |
… | |
… | |
1206 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1252 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1207 | */ |
1253 | */ |
1208 | void |
1254 | void |
1209 | rxvt_term::scr_erase_screen (int mode) |
1255 | rxvt_term::scr_erase_screen (int mode) |
1210 | { |
1256 | { |
1211 | int num; |
1257 | int num; |
1212 | int32_t row, row_offset; |
1258 | int32_t row, row_offset; |
1213 | rend_t ren; |
1259 | rend_t ren; |
1214 | XGCValues gcvalue; |
1260 | XGCValues gcvalue; |
1215 | |
1261 | |
1216 | want_refresh = 1; |
1262 | want_refresh = 1; |
1217 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1263 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1218 | ZERO_SCROLLBACK (); |
1264 | ZERO_SCROLLBACK (); |
1219 | row_offset = (int32_t)TermWin.saveLines; |
1265 | row_offset = (int32_t)TermWin.saveLines; |
… | |
… | |
1238 | num = TermWin.nrow; |
1284 | num = TermWin.nrow; |
1239 | break; |
1285 | break; |
1240 | default: |
1286 | default: |
1241 | return; |
1287 | return; |
1242 | } |
1288 | } |
|
|
1289 | |
1243 | refresh_type |= REFRESH_BOUNDS; |
1290 | refresh_type |= REFRESH_BOUNDS; |
|
|
1291 | |
1244 | if (selection.op && current_screen == selection.screen |
1292 | if (selection.op && current_screen == selection.screen |
1245 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1293 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1246 | || (selection.end.row >= row |
1294 | || (selection.end.row >= row |
1247 | && selection.end.row <= row + num))) |
1295 | && selection.end.row <= row + num))) |
1248 | CLEAR_SELECTION (); |
1296 | CLEAR_SELECTION (); |
|
|
1297 | |
1249 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1298 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1250 | return; |
1299 | return; |
|
|
1300 | |
1251 | MIN_IT (num, (TermWin.nrow - row)); |
1301 | MIN_IT (num, (TermWin.nrow - row)); |
|
|
1302 | |
1252 | if (rstyle & (RS_RVid | RS_Uline)) |
1303 | if (rstyle & (RS_RVid | RS_Uline)) |
1253 | ren = (rend_t) ~RS_None; |
1304 | ren = (rend_t) ~RS_None; |
1254 | else if (GET_BASEBG (rstyle) == Color_bg) |
1305 | else if (GET_BASEBG (rstyle) == Color_bg) |
1255 | { |
1306 | { |
1256 | ren = DEFAULT_RSTYLE; |
1307 | ren = DEFAULT_RSTYLE; |
… | |
… | |
1263 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1314 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1264 | ERASE_ROWS (row, num); |
1315 | ERASE_ROWS (row, num); |
1265 | gcvalue.foreground = PixColors[Color_fg]; |
1316 | gcvalue.foreground = PixColors[Color_fg]; |
1266 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1317 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1267 | } |
1318 | } |
|
|
1319 | |
1268 | for (; num--; row++) |
1320 | for (; num--; row++) |
1269 | { |
1321 | { |
1270 | scr_blank_screen_mem (screen.text, screen.rend, |
1322 | scr_blank_screen_mem (screen.text, screen.rend, |
1271 | (unsigned int) (row + row_offset), rstyle); |
1323 | (unsigned int) (row + row_offset), rstyle); |
1272 | screen.tlen[row + row_offset] = 0; |
1324 | screen.tlen[row + row_offset] = 0; |
… | |
… | |
1306 | * Insert/Delete <count> lines |
1358 | * Insert/Delete <count> lines |
1307 | */ |
1359 | */ |
1308 | void |
1360 | void |
1309 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1361 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1310 | { |
1362 | { |
1311 | int end; |
1363 | int end; |
1312 | |
1364 | |
1313 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
1314 | |
1366 | |
1315 | selection_check (1); |
1367 | selection_check (1); |
1316 | |
1368 | |
… | |
… | |
1335 | * Insert/Delete <count> characters from the current position |
1387 | * Insert/Delete <count> characters from the current position |
1336 | */ |
1388 | */ |
1337 | void |
1389 | void |
1338 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1390 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1339 | { |
1391 | { |
1340 | int col, row; |
1392 | int col, row; |
1341 | rend_t tr; |
1393 | rend_t tr; |
1342 | text_t *stp; |
1394 | text_t *stp; |
1343 | rend_t *srp; |
1395 | rend_t *srp; |
1344 | int16_t *slp; |
1396 | int16_t *slp; |
1345 | |
1397 | |
1346 | want_refresh = 1; |
1398 | want_refresh = 1; |
1347 | ZERO_SCROLLBACK (); |
1399 | ZERO_SCROLLBACK (); |
1348 | |
1400 | |
1349 | if (count <= 0) |
1401 | if (count <= 0) |
… | |
… | |
1356 | screen.flags &= ~Screen_WrapNext; |
1408 | screen.flags &= ~Screen_WrapNext; |
1357 | |
1409 | |
1358 | stp = screen.text[row]; |
1410 | stp = screen.text[row]; |
1359 | srp = screen.rend[row]; |
1411 | srp = screen.rend[row]; |
1360 | slp = & (screen.tlen[row]); |
1412 | slp = & (screen.tlen[row]); |
|
|
1413 | |
1361 | switch (insdel) |
1414 | switch (insdel) |
1362 | { |
1415 | { |
1363 | case INSERT: |
1416 | case INSERT: |
1364 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1417 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1365 | col--) |
1418 | col--) |
1366 | { |
1419 | { |
1367 | stp[col] = stp[col - count]; |
1420 | stp[col] = stp[col - count]; |
1368 | srp[col] = srp[col - count]; |
1421 | srp[col] = srp[col - count]; |
1369 | } |
1422 | } |
|
|
1423 | |
1370 | if (*slp != -1) |
1424 | if (*slp != -1) |
1371 | { |
1425 | { |
1372 | *slp += count; |
1426 | *slp += count; |
1373 | MIN_IT (*slp, TermWin.ncol); |
1427 | MIN_IT (*slp, TermWin.ncol); |
1374 | } |
1428 | } |
|
|
1429 | |
1375 | if (selection.op && current_screen == selection.screen |
1430 | if (selection.op && current_screen == selection.screen |
1376 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1431 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1377 | { |
1432 | { |
1378 | if (selection.end.row != screen.cur.row |
1433 | if (selection.end.row != screen.cur.row |
1379 | || (selection.end.col + count >= TermWin.ncol)) |
1434 | || (selection.end.col + count >= TermWin.ncol)) |
… | |
… | |
1383 | selection.beg.col += count; |
1438 | selection.beg.col += count; |
1384 | selection.mark.col += count; /* XXX: yes? */ |
1439 | selection.mark.col += count; /* XXX: yes? */ |
1385 | selection.end.col += count; |
1440 | selection.end.col += count; |
1386 | } |
1441 | } |
1387 | } |
1442 | } |
|
|
1443 | |
1388 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1444 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1389 | (unsigned int)count, rstyle); |
1445 | (unsigned int)count, rstyle); |
1390 | break; |
1446 | break; |
|
|
1447 | |
1391 | case ERASE: |
1448 | case ERASE: |
1392 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1449 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1393 | selection_check (1); |
1450 | selection_check (1); |
1394 | screen.cur.col -= count; |
1451 | screen.cur.col -= count; |
1395 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1452 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1396 | (unsigned int)count, rstyle); |
1453 | (unsigned int)count, rstyle); |
1397 | break; |
1454 | break; |
|
|
1455 | |
1398 | case DELETE: |
1456 | case DELETE: |
1399 | tr = srp[TermWin.ncol - 1] |
|
|
1400 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1457 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
|
|
1458 | |
1401 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1459 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1402 | { |
1460 | { |
1403 | stp[col] = stp[col + count]; |
1461 | stp[col] = stp[col + count]; |
1404 | srp[col] = srp[col + count]; |
1462 | srp[col] = srp[col + count]; |
1405 | } |
1463 | } |
|
|
1464 | |
1406 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1465 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1407 | & (srp[TermWin.ncol - count]), |
1466 | & (srp[TermWin.ncol - count]), |
1408 | (unsigned int)count, tr); |
1467 | (unsigned int)count, tr); |
|
|
1468 | |
1409 | if (*slp == -1) /* break line continuation */ |
1469 | if (*slp == -1) /* break line continuation */ |
1410 | *slp = TermWin.ncol; |
1470 | *slp = TermWin.ncol; |
|
|
1471 | |
1411 | *slp -= count; |
1472 | *slp -= count; |
1412 | MAX_IT (*slp, 0); |
1473 | MAX_IT (*slp, 0); |
|
|
1474 | |
1413 | if (selection.op && current_screen == selection.screen |
1475 | if (selection.op && current_screen == selection.screen |
1414 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1476 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1415 | { |
1477 | { |
1416 | if (selection.end.row != screen.cur.row |
1478 | if (selection.end.row != screen.cur.row |
1417 | || (screen.cur.col >= selection.beg.col - count) |
1479 | || (screen.cur.col >= selection.beg.col - count) |
… | |
… | |
1423 | selection.beg.col -= count; |
1485 | selection.beg.col -= count; |
1424 | selection.mark.col -= count; /* XXX: yes? */ |
1486 | selection.mark.col -= count; /* XXX: yes? */ |
1425 | selection.end.col -= count; |
1487 | selection.end.col -= count; |
1426 | } |
1488 | } |
1427 | } |
1489 | } |
|
|
1490 | |
1428 | break; |
1491 | break; |
1429 | } |
1492 | } |
1430 | } |
1493 | } |
1431 | |
1494 | |
1432 | /* ------------------------------------------------------------------------- */ |
1495 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1437 | void |
1500 | void |
1438 | rxvt_term::scr_scroll_region (int top, int bot) |
1501 | rxvt_term::scr_scroll_region (int top, int bot) |
1439 | { |
1502 | { |
1440 | MAX_IT (top, 0); |
1503 | MAX_IT (top, 0); |
1441 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1504 | MIN_IT (bot, (int)TermWin.nrow - 1); |
|
|
1505 | |
1442 | if (top > bot) |
1506 | if (top > bot) |
1443 | return; |
1507 | return; |
|
|
1508 | |
1444 | screen.tscroll = top; |
1509 | screen.tscroll = top; |
1445 | screen.bscroll = bot; |
1510 | screen.bscroll = bot; |
1446 | scr_gotorc (0, 0, 0); |
1511 | scr_gotorc (0, 0, 0); |
1447 | } |
1512 | } |
1448 | |
1513 | |
… | |
… | |
1454 | */ |
1519 | */ |
1455 | void |
1520 | void |
1456 | rxvt_term::scr_cursor_visible (int mode) |
1521 | rxvt_term::scr_cursor_visible (int mode) |
1457 | { |
1522 | { |
1458 | want_refresh = 1; |
1523 | want_refresh = 1; |
|
|
1524 | |
1459 | if (mode) |
1525 | if (mode) |
1460 | screen.flags |= Screen_VisibleCursor; |
1526 | screen.flags |= Screen_VisibleCursor; |
1461 | else |
1527 | else |
1462 | screen.flags &= ~Screen_VisibleCursor; |
1528 | screen.flags &= ~Screen_VisibleCursor; |
1463 | } |
1529 | } |
… | |
… | |
1779 | if (TermWin.view_start != oldviewstart) |
1845 | if (TermWin.view_start != oldviewstart) |
1780 | { |
1846 | { |
1781 | want_refresh = 1; |
1847 | want_refresh = 1; |
1782 | num_scr -= (TermWin.view_start - oldviewstart); |
1848 | num_scr -= (TermWin.view_start - oldviewstart); |
1783 | } |
1849 | } |
|
|
1850 | |
1784 | return (int) (TermWin.view_start - oldviewstart); |
1851 | return (int) (TermWin.view_start - oldviewstart); |
1785 | } |
1852 | } |
1786 | |
1853 | |
1787 | /* ------------------------------------------------------------------------- */ |
1854 | /* ------------------------------------------------------------------------- */ |
1788 | void |
1855 | void |
… | |
… | |
1906 | |
1973 | |
1907 | /* |
1974 | /* |
1908 | * C: set the cursor character (s) |
1975 | * C: set the cursor character (s) |
1909 | */ |
1976 | */ |
1910 | { |
1977 | { |
1911 | unsigned char setoldcursor; |
1978 | unsigned char setoldcursor; |
1912 | rend_t ccol1, /* Cursor colour */ |
1979 | rend_t ccol1, /* Cursor colour */ |
1913 | ccol2; /* Cursor colour2 */ |
1980 | ccol2; /* Cursor colour2 */ |
1914 | |
1981 | |
1915 | showcursor = (screen.flags & Screen_VisibleCursor); |
1982 | showcursor = (screen.flags & Screen_VisibleCursor); |
1916 | #ifdef CURSOR_BLINK |
1983 | #ifdef CURSOR_BLINK |
1917 | if (hidden_cursor) |
1984 | if (hidden_cursor) |
1918 | showcursor = 0; |
1985 | showcursor = 0; |
1919 | #endif |
1986 | #endif |
1920 | |
1987 | |
1921 | if (showcursor) |
1988 | if (showcursor) |
1922 | { |
1989 | { |
1923 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
1990 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
1924 | [screen.cur.col]); |
|
|
1925 | |
1991 | |
1926 | if (showcursor && TermWin.focus) |
1992 | if (showcursor && TermWin.focus) |
1927 | { |
1993 | { |
1928 | *srp ^= RS_RVid; |
1994 | *srp ^= RS_RVid; |
1929 | #ifndef NO_CURSORCOLOR |
1995 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1957 | if (screen.cur.row + TermWin.view_start != ocrow |
2023 | if (screen.cur.row + TermWin.view_start != ocrow |
1958 | || screen.cur.col != oldcursor.col) |
2024 | || screen.cur.col != oldcursor.col) |
1959 | { |
2025 | { |
1960 | if (ocrow < TermWin.nrow |
2026 | if (ocrow < TermWin.nrow |
1961 | && oldcursor.col < TermWin.ncol) |
2027 | && oldcursor.col < TermWin.ncol) |
1962 | { |
|
|
1963 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2028 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
1964 | } |
2029 | |
1965 | if (TermWin.focus || !showcursor) |
2030 | if (TermWin.focus || !showcursor) |
1966 | oldcursor.row = -1; |
2031 | oldcursor.row = -1; |
1967 | else |
2032 | else |
1968 | setoldcursor = 1; |
2033 | setoldcursor = 1; |
1969 | } |
2034 | } |
1970 | } |
2035 | } |
1971 | else if (!TermWin.focus) |
2036 | else if (!TermWin.focus) |
1972 | setoldcursor = 1; |
2037 | setoldcursor = 1; |
|
|
2038 | |
1973 | if (setoldcursor) |
2039 | if (setoldcursor) |
1974 | { |
2040 | { |
1975 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2041 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
1976 | oldcursor.row = -1; |
2042 | oldcursor.row = -1; |
1977 | else |
2043 | else |
… | |
… | |
1989 | */ |
2055 | */ |
1990 | i = num_scr; |
2056 | i = num_scr; |
1991 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2057 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
1992 | && abs (i) < TermWin.nrow && !must_clear) |
2058 | && abs (i) < TermWin.nrow && !must_clear) |
1993 | { |
2059 | { |
1994 | int16_t nits; |
2060 | int16_t nits; |
1995 | int j; |
2061 | int j; |
1996 | rend_t *drp2; |
2062 | rend_t *drp2; |
1997 | text_t *dtp2; |
2063 | text_t *dtp2; |
1998 | int len, wlen; |
2064 | int len, wlen; |
1999 | |
2065 | |
2000 | j = TermWin.nrow; |
2066 | j = TermWin.nrow; |
2001 | wlen = len = -1; |
2067 | wlen = len = -1; |
2002 | row = i > 0 ? 0 : j - 1; |
2068 | row = i > 0 ? 0 : j - 1; |
2003 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2069 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
… | |
… | |
2147 | else |
2213 | else |
2148 | rvid = !rvid; |
2214 | rvid = !rvid; |
2149 | } |
2215 | } |
2150 | |
2216 | |
2151 | if (rend & RS_Uline) |
2217 | if (rend & RS_Uline) |
2152 | { |
|
|
2153 | if (ISSET_PIXCOLOR (Color_UL)) |
2218 | if (ISSET_PIXCOLOR (Color_UL)) |
2154 | fore = Color_UL; |
2219 | fore = Color_UL; |
2155 | } |
|
|
2156 | #endif |
2220 | #endif |
2157 | |
2221 | |
2158 | if (rvid) |
2222 | if (rvid) |
2159 | { |
2223 | { |
2160 | SWAP_IT (fore, back, int); |
2224 | SWAP_IT (fore, back, int); |
… | |
… | |
2457 | { |
2521 | { |
2458 | n = min (len - i, PROP_SIZE); |
2522 | n = min (len - i, PROP_SIZE); |
2459 | MEMCPY (ds, data + i, n); |
2523 | MEMCPY (ds, data + i, n); |
2460 | |
2524 | |
2461 | for (j = 0; j < n; j++) |
2525 | for (j = 0; j < n; j++) |
2462 | if (ds[j] == '\n') |
2526 | if (ds[j] == C0_LF) |
2463 | ds[j] = '\r'; |
2527 | ds[j] = C0_CR; |
2464 | |
2528 | |
2465 | tt_write (ds, (int)n); |
2529 | tt_write (ds, (int)n); |
2466 | } |
2530 | } |
2467 | |
2531 | |
2468 | free (ds); |
2532 | free (ds); |
… | |
… | |
2529 | } |
2593 | } |
2530 | |
2594 | |
2531 | if (ct.nitems == 0) |
2595 | if (ct.nitems == 0) |
2532 | { |
2596 | { |
2533 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2597 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
|
|
2598 | |
2534 | if (selection_wait == Sel_normal && nread == 0 |
2599 | if (selection_wait == Sel_normal && nread == 0 |
2535 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2600 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2536 | { |
2601 | { |
2537 | /* |
2602 | /* |
2538 | * pass through again trying CUT_BUFFER0 if we've come from |
2603 | * pass through again trying CUT_BUFFER0 if we've come from |
… | |
… | |
2580 | void |
2645 | void |
2581 | rxvt_term::incr_cb (time_watcher &w) |
2646 | rxvt_term::incr_cb (time_watcher &w) |
2582 | { |
2647 | { |
2583 | selection_wait = Sel_none; |
2648 | selection_wait = Sel_none; |
2584 | |
2649 | |
2585 | rxvt_print_error ("data loss: timeout on INCR selection paste"); |
2650 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2586 | } |
2651 | } |
2587 | |
2652 | |
2588 | /* |
2653 | /* |
2589 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2654 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2590 | */ |
2655 | */ |
… | |
… | |
2593 | { |
2658 | { |
2594 | int reget_time = 0; |
2659 | int reget_time = 0; |
2595 | |
2660 | |
2596 | if (prop == None) |
2661 | if (prop == None) |
2597 | return; |
2662 | return; |
|
|
2663 | |
2598 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
2664 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
2599 | if (selection_wait == Sel_normal) |
2665 | if (selection_wait == Sel_normal) |
2600 | { |
2666 | { |
2601 | int a, afmt; |
2667 | int a, afmt; |
2602 | Atom atype; |
2668 | Atom atype; |
2603 | unsigned long bytes_after, nitems; |
2669 | unsigned long bytes_after, nitems; |
2604 | unsigned char *s = NULL; |
2670 | unsigned char *s = NULL; |
2605 | |
2671 | |
2606 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2672 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2607 | xa[XA_INCR], &atype, &afmt, &nitems, |
2673 | xa[XA_INCR], &atype, &afmt, &nitems, |
2608 | &bytes_after, &s); |
2674 | &bytes_after, &s); |
2609 | if (s) |
2675 | if (s) |
2610 | XFree (s); |
2676 | XFree (s); |
2611 | if (a != Success) |
2677 | if (a != Success) |
2612 | return; |
2678 | return; |
|
|
2679 | |
2613 | #ifndef __CYGWIN32__ |
2680 | #ifndef __CYGWIN32__ |
2614 | if (atype == xa[XA_INCR]) |
2681 | if (atype == xa[XA_INCR]) |
2615 | { /* start an INCR transfer */ |
2682 | { /* start an INCR transfer */ |
2616 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2683 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2617 | XDeleteProperty (display->display, win, prop); |
2684 | XDeleteProperty (display->display, win, prop); |
… | |
… | |
2623 | |
2690 | |
2624 | } |
2691 | } |
2625 | else if (selection_wait == Sel_incr) |
2692 | else if (selection_wait == Sel_incr) |
2626 | { |
2693 | { |
2627 | reget_time = 1; |
2694 | reget_time = 1; |
|
|
2695 | |
2628 | if (selection_paste (win, prop, True) == -1) |
2696 | if (selection_paste (win, prop, True) == -1) |
2629 | { |
2697 | { |
2630 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2698 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2631 | selection_wait = Sel_none; |
2699 | selection_wait = Sel_none; |
2632 | incr_ev.stop (); |
2700 | incr_ev.stop (); |
2633 | } |
2701 | } |
2634 | } |
2702 | } |
2635 | if (reget_time) /* received more data so reget time */ |
2703 | if (reget_time) /* received more data so reget time */ |
2636 | incr_ev.start (NOW + 10); |
2704 | incr_ev.start (NOW + 10); |
2637 | } |
2705 | } |
|
|
2706 | |
2638 | /* ------------------------------------------------------------------------- */ |
2707 | /* ------------------------------------------------------------------------- */ |
2639 | /* |
2708 | /* |
2640 | * Request the current selection: |
2709 | * Request the current selection: |
2641 | * Order: > internal selection if available |
2710 | * Order: > internal selection if available |
2642 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2711 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
… | |
… | |
2647 | */ |
2716 | */ |
2648 | void |
2717 | void |
2649 | rxvt_term::selection_request (Time tm, int x, int y) |
2718 | rxvt_term::selection_request (Time tm, int x, int y) |
2650 | { |
2719 | { |
2651 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
2720 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2721 | |
2652 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2722 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2653 | return; /* outside window */ |
2723 | return; /* outside window */ |
2654 | |
2724 | |
2655 | if (selection.text != NULL) |
2725 | if (selection.text) |
2656 | { /* internal selection */ |
2726 | { /* internal selection */ |
2657 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2727 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2658 | paste (selection.text, selection.len); |
2728 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2729 | paste ((unsigned char *)str, strlen (str)); |
|
|
2730 | free (str); |
2659 | return; |
2731 | return; |
2660 | } |
2732 | } |
2661 | else |
2733 | else |
2662 | { |
2734 | { |
2663 | int i; |
2735 | int i; |
2664 | |
2736 | |
2665 | selection_request_time = tm; |
2737 | selection_request_time = tm; |
2666 | selection_wait = Sel_normal; |
2738 | selection_wait = Sel_normal; |
|
|
2739 | |
2667 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2740 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2668 | { |
2741 | { |
2669 | #if X_HAVE_UTF8_STRING |
2742 | #if X_HAVE_UTF8_STRING |
2670 | selection_type = Sel_UTF8String; |
2743 | selection_type = Sel_UTF8String; |
2671 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2744 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
… | |
… | |
2676 | return; |
2749 | return; |
2677 | #endif |
2750 | #endif |
2678 | |
2751 | |
2679 | } |
2752 | } |
2680 | } |
2753 | } |
|
|
2754 | |
2681 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2755 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2682 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2756 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2683 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2757 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2684 | } |
2758 | } |
2685 | |
2759 | |
2686 | int |
2760 | int |
2687 | rxvt_term::selection_request_other (Atom target, int selnum) |
2761 | rxvt_term::selection_request_other (Atom target, int selnum) |
2688 | { |
2762 | { |
2689 | Atom sel; |
2763 | Atom sel; |
2690 | #ifdef DEBUG_SELECT |
2764 | #ifdef DEBUG_SELECT |
2691 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2765 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2692 | #endif |
2766 | #endif |
2693 | |
2767 | |
2694 | selection_type |= selnum; |
2768 | selection_type |= selnum; |
|
|
2769 | |
2695 | if (selnum == Sel_Primary) |
2770 | if (selnum == Sel_Primary) |
2696 | sel = XA_PRIMARY; |
2771 | sel = XA_PRIMARY; |
2697 | else if (selnum == Sel_Secondary) |
2772 | else if (selnum == Sel_Secondary) |
2698 | sel = XA_SECONDARY; |
2773 | sel = XA_SECONDARY; |
2699 | else |
2774 | else |
2700 | sel = xa[XA_CLIPBOARD]; |
2775 | sel = xa[XA_CLIPBOARD]; |
|
|
2776 | |
2701 | if (XGetSelectionOwner (display->display, sel) != None) |
2777 | if (XGetSelectionOwner (display->display, sel) != None) |
2702 | { |
2778 | { |
2703 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2779 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2704 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2780 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2705 | TermWin.vt, selection_request_time); |
2781 | TermWin.vt, selection_request_time); |
2706 | return 1; |
2782 | return 1; |
2707 | } |
2783 | } |
|
|
2784 | |
2708 | return 0; |
2785 | return 0; |
2709 | } |
2786 | } |
2710 | |
2787 | |
2711 | /* ------------------------------------------------------------------------- */ |
2788 | /* ------------------------------------------------------------------------- */ |
2712 | /* |
2789 | /* |
… | |
… | |
2721 | want_refresh = 1; |
2798 | want_refresh = 1; |
2722 | free (selection.text); |
2799 | free (selection.text); |
2723 | selection.text = NULL; |
2800 | selection.text = NULL; |
2724 | selection.len = 0; |
2801 | selection.len = 0; |
2725 | CLEAR_SELECTION (); |
2802 | CLEAR_SELECTION (); |
|
|
2803 | |
|
|
2804 | if (display->selection_owner == this) |
|
|
2805 | display->selection_owner = 0; |
2726 | } |
2806 | } |
2727 | |
2807 | |
2728 | /* ------------------------------------------------------------------------- */ |
2808 | /* ------------------------------------------------------------------------- */ |
2729 | /* |
2809 | /* |
2730 | * Copy a selection into the cut buffer |
2810 | * Copy a selection into the cut buffer |
… | |
… | |
2732 | */ |
2812 | */ |
2733 | void |
2813 | void |
2734 | rxvt_term::selection_make (Time tm) |
2814 | rxvt_term::selection_make (Time tm) |
2735 | { |
2815 | { |
2736 | int i, col, end_col, row, end_row; |
2816 | int i, col, end_col, row, end_row; |
2737 | unsigned char *new_selection_text; |
2817 | wchar_t *new_selection_text; |
2738 | char *str; |
|
|
2739 | text_t *t; |
2818 | text_t *t; |
2740 | |
2819 | |
2741 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2820 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2742 | switch (selection.op) |
2821 | switch (selection.op) |
2743 | { |
2822 | { |
… | |
… | |
2756 | selection.op = SELECTION_DONE; |
2835 | selection.op = SELECTION_DONE; |
2757 | |
2836 | |
2758 | if (selection.clicks == 4) |
2837 | if (selection.clicks == 4) |
2759 | return; /* nothing selected, go away */ |
2838 | return; /* nothing selected, go away */ |
2760 | |
2839 | |
2761 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; |
2840 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2762 | str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); |
2841 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2763 | |
|
|
2764 | new_selection_text = (unsigned char *)str; |
|
|
2765 | |
2842 | |
2766 | col = selection.beg.col; |
2843 | col = selection.beg.col; |
2767 | MAX_IT (col, 0); |
2844 | MAX_IT (col, 0); |
2768 | row = selection.beg.row + TermWin.saveLines; |
2845 | row = selection.beg.row + TermWin.saveLines; |
2769 | end_row = selection.end.row + TermWin.saveLines; |
2846 | end_row = selection.end.row + TermWin.saveLines; |
2770 | struct mbstate mbs; |
2847 | int ofs = 0; |
|
|
2848 | int extra = 0; |
2771 | |
2849 | |
2772 | for (; row <= end_row; row++, col = 0) |
2850 | for (; row <= end_row; row++, col = 0) |
2773 | { |
2851 | { |
2774 | t = & (screen.text[row][col]); |
2852 | t = &(screen.text[row][col]); |
2775 | |
2853 | |
2776 | end_col = screen.tlen[row]; |
2854 | end_col = screen.tlen[row]; |
2777 | |
2855 | |
2778 | if (end_col == -1) |
2856 | if (end_col == -1) |
2779 | end_col = TermWin.ncol; |
2857 | end_col = TermWin.ncol; |
2780 | |
2858 | |
2781 | if (row == end_row) |
2859 | if (row == end_row) |
2782 | MIN_IT (end_col, selection.end.col); |
2860 | MIN_IT (end_col, selection.end.col); |
2783 | |
2861 | |
2784 | for (; col < end_col; col++) |
2862 | for (; col < end_col; col++) |
|
|
2863 | { |
2785 | if (*t == NOCHAR) |
2864 | if (*t == NOCHAR) |
2786 | t++; |
2865 | t++; |
|
|
2866 | #if ENABLE_COMBINING |
|
|
2867 | else if (IS_COMPOSE (*t)) |
|
|
2868 | { |
|
|
2869 | int len = rxvt_composite.expand (*t, 0); |
|
|
2870 | |
|
|
2871 | extra -= (len - 1); |
|
|
2872 | |
|
|
2873 | if (extra < 0) |
|
|
2874 | { |
|
|
2875 | extra += i; |
|
|
2876 | i += i; |
|
|
2877 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
|
|
2878 | } |
|
|
2879 | |
|
|
2880 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
|
|
2881 | } |
|
|
2882 | #endif |
2787 | else |
2883 | else |
2788 | { |
2884 | new_selection_text[ofs++] = *t++; |
2789 | int len = wcrtomb (str, *t++, mbs); |
|
|
2790 | if (len > 0) |
|
|
2791 | str += len; |
|
|
2792 | } |
2885 | } |
2793 | |
2886 | |
2794 | if (screen.tlen[row] != -1 && row != end_row) |
2887 | if (screen.tlen[row] != -1 && row != end_row) |
2795 | *str++ = '\n'; |
2888 | new_selection_text[ofs++] = C0_LF; |
2796 | } |
2889 | } |
2797 | |
2890 | |
2798 | #ifndef NO_OLD_SELECTION |
|
|
2799 | if (selection_style == OLD_SELECT) |
|
|
2800 | if (end_col == TermWin.ncol) |
|
|
2801 | *str++ = '\n'; |
|
|
2802 | #endif |
|
|
2803 | #ifndef NO_NEW_SELECTION |
|
|
2804 | if (selection_style != OLD_SELECT) |
|
|
2805 | if (end_col != selection.end.col) |
2891 | if (end_col != selection.end.col) |
2806 | *str++ = '\n'; |
2892 | new_selection_text[ofs++] = C0_LF; |
2807 | #endif |
|
|
2808 | *str = '\0'; |
|
|
2809 | |
2893 | |
2810 | i = str - (char *)new_selection_text; |
2894 | new_selection_text[ofs] = 0; |
|
|
2895 | |
2811 | if (i == 0) |
2896 | if (ofs == 0) |
2812 | { |
2897 | { |
2813 | free (new_selection_text); |
2898 | free (new_selection_text); |
2814 | return; |
2899 | return; |
2815 | } |
2900 | } |
2816 | |
2901 | |
2817 | // due to MB_CUR_MAX, selection wastage is usually high, so realloc |
|
|
2818 | if (str - (char *)new_selection_text > 1024) |
|
|
2819 | new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); |
|
|
2820 | |
|
|
2821 | selection.len = i; |
|
|
2822 | |
|
|
2823 | if (selection.text) |
|
|
2824 | free (selection.text); |
2902 | free (selection.text); |
2825 | |
2903 | |
2826 | selection.text = new_selection_text; |
2904 | // we usually allocate much more than necessary, so realloc it smaller again |
|
|
2905 | selection.len = ofs; |
|
|
2906 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2827 | |
2907 | |
2828 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2908 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2829 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2909 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2830 | display->set_selection_owner (this); |
2910 | display->set_selection_owner (this); |
2831 | else |
2911 | else |
2832 | rxvt_print_error ("can't get primary selection"); |
2912 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2833 | |
2913 | |
2834 | { |
2914 | #if 0 |
2835 | XTextProperty ct; |
2915 | XTextProperty ct; |
2836 | char *cl = (char *)selection.text; |
|
|
2837 | |
2916 | |
2838 | if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) |
2917 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2839 | { |
2918 | { |
2840 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
|
|
2841 | PropModeReplace, ct.value, ct.nitems); |
|
|
2842 | XFree (ct.value); |
|
|
2843 | } |
|
|
2844 | else |
|
|
2845 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2919 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2846 | PropModeReplace, selection.text, (int)selection.len); |
2920 | PropModeReplace, ct.value, ct.nitems); |
|
|
2921 | XFree (ct.value); |
2847 | } |
2922 | } |
|
|
2923 | #endif |
2848 | |
2924 | |
2849 | selection_time = tm; |
2925 | selection_time = tm; |
2850 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2926 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2851 | } |
2927 | } |
2852 | |
2928 | |
… | |
… | |
2881 | rxvt_term::selection_start_colrow (int col, int row) |
2957 | rxvt_term::selection_start_colrow (int col, int row) |
2882 | { |
2958 | { |
2883 | want_refresh = 1; |
2959 | want_refresh = 1; |
2884 | selection.mark.col = col; |
2960 | selection.mark.col = col; |
2885 | selection.mark.row = row - TermWin.view_start; |
2961 | selection.mark.row = row - TermWin.view_start; |
|
|
2962 | |
2886 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2963 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2887 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2964 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2888 | MAX_IT (selection.mark.col, 0); |
2965 | MAX_IT (selection.mark.col, 0); |
2889 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2966 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2890 | |
2967 | |
|
|
2968 | while (selection.mark.col > 0 |
|
|
2969 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
|
|
2970 | --selection.mark.col; |
|
|
2971 | |
2891 | if (selection.op) |
2972 | if (selection.op) |
2892 | { /* clear the old selection */ |
2973 | { /* clear the old selection */ |
2893 | selection.beg.row = selection.end.row = selection.mark.row; |
2974 | selection.beg.row = selection.end.row = selection.mark.row; |
2894 | selection.beg.col = selection.end.col = selection.mark.col; |
2975 | selection.beg.col = selection.end.col = selection.mark.col; |
2895 | } |
2976 | } |
|
|
2977 | |
2896 | selection.op = SELECTION_INIT; |
2978 | selection.op = SELECTION_INIT; |
2897 | selection.screen = current_screen; |
2979 | selection.screen = current_screen; |
2898 | } |
2980 | } |
2899 | |
2981 | |
2900 | /* ------------------------------------------------------------------------- */ |
2982 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2902 | * Word select: select text for 2 clicks |
2984 | * Word select: select text for 2 clicks |
2903 | * We now only find out the boundary in one direction |
2985 | * We now only find out the boundary in one direction |
2904 | */ |
2986 | */ |
2905 | |
2987 | |
2906 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2988 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2907 | #define DELIMIT_TEXT(x) \ |
2989 | #define DELIMIT_TEXT(x) \ |
2908 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) |
2990 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
2909 | #define DELIMIT_REND(x) 1 |
2991 | #define DELIMIT_REND(x) 1 |
2910 | |
2992 | |
2911 | void |
2993 | void |
2912 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2994 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2913 | { |
2995 | { |
2914 | int col, row, dirnadd, tcol, trow, w1, w2; |
2996 | int col, row, dirnadd, tcol, trow, w1, w2; |
2915 | row_col_t bound; |
2997 | row_col_t bound; |
2916 | text_t *stp; |
2998 | text_t *stp; |
2917 | rend_t *srp; |
2999 | rend_t *srp; |
2918 | |
3000 | |
2919 | if (dirn == UP) |
3001 | if (dirn == UP) |
2920 | { |
3002 | { |
2921 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
3003 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2922 | bound.col = 0; |
3004 | bound.col = 0; |
… | |
… | |
2926 | { |
3008 | { |
2927 | bound.row = TermWin.saveLines + TermWin.nrow; |
3009 | bound.row = TermWin.saveLines + TermWin.nrow; |
2928 | bound.col = TermWin.ncol - 1; |
3010 | bound.col = TermWin.ncol - 1; |
2929 | dirnadd = 1; |
3011 | dirnadd = 1; |
2930 | } |
3012 | } |
|
|
3013 | |
2931 | row = mark->row + TermWin.saveLines; |
3014 | row = mark->row + TermWin.saveLines; |
2932 | col = mark->col; |
3015 | col = mark->col; |
2933 | MAX_IT (col, 0); |
3016 | MAX_IT (col, 0); |
2934 | /* find the edge of a word */ |
3017 | /* find the edge of a word */ |
2935 | stp = & (screen.text[row][col]); |
3018 | stp = & (screen.text[row][col]); |
2936 | w1 = DELIMIT_TEXT (*stp); |
3019 | w1 = DELIMIT_TEXT (*stp); |
2937 | |
3020 | |
2938 | if (selection_style != NEW_SELECT) |
|
|
2939 | { |
|
|
2940 | if (w1 == 1) |
|
|
2941 | { |
|
|
2942 | stp += dirnadd; |
|
|
2943 | if (DELIMIT_TEXT (*stp) == 1) |
|
|
2944 | goto Old_Word_Selection_You_Die; |
|
|
2945 | col += dirnadd; |
|
|
2946 | } |
|
|
2947 | w1 = 0; |
|
|
2948 | } |
|
|
2949 | srp = (&screen.rend[row][col]); |
3021 | srp = (&screen.rend[row][col]); |
2950 | w2 = DELIMIT_REND (*srp); |
3022 | w2 = DELIMIT_REND (*srp); |
2951 | |
3023 | |
2952 | for (;;) |
3024 | for (;;) |
2953 | { |
3025 | { |
2954 | for (; col != bound.col; col += dirnadd) |
3026 | for (; col != bound.col; col += dirnadd) |
2955 | { |
3027 | { |
2956 | stp += dirnadd; |
3028 | stp += dirnadd; |
|
|
3029 | srp += dirnadd; |
|
|
3030 | |
|
|
3031 | if (*stp == NOCHAR) |
|
|
3032 | continue; |
|
|
3033 | |
2957 | if (DELIMIT_TEXT (*stp) != w1) |
3034 | if (DELIMIT_TEXT (*stp) != w1) |
2958 | break; |
3035 | break; |
2959 | srp += dirnadd; |
|
|
2960 | if (DELIMIT_REND (*srp) != w2) |
3036 | if (DELIMIT_REND (*srp) != w2) |
2961 | break; |
3037 | break; |
2962 | } |
3038 | } |
|
|
3039 | |
2963 | if ((col == bound.col) && (row != bound.row)) |
3040 | if ((col == bound.col) && (row != bound.row)) |
2964 | { |
3041 | { |
2965 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3042 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
2966 | { |
3043 | { |
2967 | trow = row + dirnadd; |
3044 | trow = row + dirnadd; |
2968 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3045 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
|
|
3046 | |
2969 | if (screen.text[trow] == NULL) |
3047 | if (screen.text[trow] == NULL) |
2970 | break; |
3048 | break; |
|
|
3049 | |
2971 | stp = & (screen.text[trow][tcol]); |
3050 | stp = & (screen.text[trow][tcol]); |
2972 | srp = & (screen.rend[trow][tcol]); |
3051 | srp = & (screen.rend[trow][tcol]); |
|
|
3052 | |
2973 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3053 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
2974 | break; |
3054 | break; |
|
|
3055 | |
2975 | row = trow; |
3056 | row = trow; |
2976 | col = tcol; |
3057 | col = tcol; |
2977 | continue; |
3058 | continue; |
2978 | } |
3059 | } |
2979 | } |
3060 | } |
2980 | break; |
3061 | break; |
2981 | } |
3062 | } |
|
|
3063 | |
2982 | Old_Word_Selection_You_Die: |
3064 | Old_Word_Selection_You_Die: |
2983 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
3065 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
2984 | |
3066 | |
2985 | if (dirn == DN) |
3067 | if (dirn == DN) |
2986 | col++; /* put us on one past the end */ |
3068 | col++; /* put us on one past the end */ |
… | |
… | |
3008 | MAX_IT (row, 0); |
3090 | MAX_IT (row, 0); |
3009 | MIN_IT (row, (int)TermWin.nrow - 1); |
3091 | MIN_IT (row, (int)TermWin.nrow - 1); |
3010 | MAX_IT (col, 0); |
3092 | MAX_IT (col, 0); |
3011 | MIN_IT (col, (int)TermWin.ncol); |
3093 | MIN_IT (col, (int)TermWin.ncol); |
3012 | |
3094 | |
3013 | #ifndef NO_NEW_SELECTION |
|
|
3014 | /* |
3095 | /* |
3015 | * If we're selecting characters (single click) then we must check first |
3096 | * If we're selecting characters (single click) then we must check first |
3016 | * if we are at the same place as the original mark. If we are then |
3097 | * if we are at the same place as the original mark. If we are then |
3017 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3098 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3018 | * be _past_ a character for it to be selected. |
3099 | * be _past_ a character for it to be selected. |
3019 | */ |
3100 | */ |
3020 | if (selection_style != OLD_SELECT) |
|
|
3021 | { |
|
|
3022 | if (((selection.clicks % 3) == 1) && !flag |
3101 | if (((selection.clicks % 3) == 1) && !flag |
3023 | && (col == selection.mark.col |
3102 | && (col == selection.mark.col |
3024 | && (row == selection.mark.row + TermWin.view_start))) |
3103 | && (row == selection.mark.row + TermWin.view_start))) |
3025 | { |
3104 | { |
3026 | /* select nothing */ |
3105 | /* select nothing */ |
3027 | selection.beg.row = selection.end.row = 0; |
3106 | selection.beg.row = selection.end.row = 0; |
3028 | selection.beg.col = selection.end.col = 0; |
3107 | selection.beg.col = selection.end.col = 0; |
3029 | selection.clicks = 4; |
3108 | selection.clicks = 4; |
3030 | want_refresh = 1; |
3109 | want_refresh = 1; |
3031 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3110 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3032 | return; |
3111 | return; |
3033 | } |
|
|
3034 | } |
3112 | } |
3035 | #endif |
3113 | |
3036 | if (selection.clicks == 4) |
3114 | if (selection.clicks == 4) |
3037 | selection.clicks = 1; |
3115 | selection.clicks = 1; |
3038 | |
3116 | |
3039 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3117 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3040 | flag == 1 ? 1 : 0, /* ? button press */ |
3118 | flag == 1 ? 1 : 0, /* ? button press */ |
… | |
… | |
3046 | * Extend the selection to the specified col/row |
3124 | * Extend the selection to the specified col/row |
3047 | */ |
3125 | */ |
3048 | void |
3126 | void |
3049 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3127 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3050 | { |
3128 | { |
3051 | int16_t ncol = TermWin.ncol; |
3129 | int16_t ncol = TermWin.ncol; |
3052 | int end_col; |
3130 | int end_col; |
3053 | row_col_t pos; |
3131 | row_col_t pos; |
3054 | enum { |
3132 | enum { |
3055 | LEFT, RIGHT |
3133 | LEFT, RIGHT |
3056 | } closeto = RIGHT; |
3134 | } closeto = RIGHT; |
3057 | |
3135 | |
3058 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
3136 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
… | |
… | |
3094 | pos.col = col; |
3172 | pos.col = col; |
3095 | pos.row = row; |
3173 | pos.row = row; |
3096 | |
3174 | |
3097 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3175 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3098 | |
3176 | |
3099 | #ifndef NO_OLD_SELECTION |
|
|
3100 | /* |
|
|
3101 | * This mimics some of the selection behaviour of version 2.20 and before. |
|
|
3102 | * There are no ``selection modes'', button3 is always character extension. |
|
|
3103 | * Note: button3 drag is always available, c.f. v2.20 |
|
|
3104 | * Selection always terminates (left or right as appropriate) at the mark. |
|
|
3105 | */ |
|
|
3106 | if (selection_style == OLD_SELECT) |
|
|
3107 | { |
|
|
3108 | if (selection.clicks == 1 || button3) |
|
|
3109 | { |
|
|
3110 | if (hate_those_clicks) |
|
|
3111 | { |
|
|
3112 | hate_those_clicks = 0; |
|
|
3113 | if (selection.clicks == 1) |
|
|
3114 | { |
|
|
3115 | selection.beg.row = selection.mark.row; |
|
|
3116 | selection.beg.col = selection.mark.col; |
|
|
3117 | } |
|
|
3118 | else |
|
|
3119 | { |
|
|
3120 | selection.mark.row = selection.beg.row; |
|
|
3121 | selection.mark.col = selection.beg.col; |
|
|
3122 | } |
|
|
3123 | } |
|
|
3124 | if (ROWCOL_IS_BEFORE (pos, selection.mark)) |
|
|
3125 | { |
|
|
3126 | selection.end.row = selection.mark.row; |
|
|
3127 | selection.end.col = selection.mark.col + 1; |
|
|
3128 | selection.beg.row = pos.row; |
|
|
3129 | selection.beg.col = pos.col; |
|
|
3130 | } |
|
|
3131 | else |
|
|
3132 | { |
|
|
3133 | selection.beg.row = selection.mark.row; |
|
|
3134 | selection.beg.col = selection.mark.col; |
|
|
3135 | selection.end.row = pos.row; |
|
|
3136 | selection.end.col = pos.col + 1; |
|
|
3137 | } |
|
|
3138 | } |
|
|
3139 | else if (selection.clicks == 2) |
|
|
3140 | { |
|
|
3141 | selection_delimit_word (UP, & (selection.mark), |
|
|
3142 | & (selection.beg)); |
|
|
3143 | selection_delimit_word (DN, & (selection.mark), |
|
|
3144 | & (selection.end)); |
|
|
3145 | hate_those_clicks = 1; |
|
|
3146 | } |
|
|
3147 | else if (selection.clicks == 3) |
|
|
3148 | { |
|
|
3149 | selection.beg.row = selection.end.row = selection.mark.row; |
|
|
3150 | selection.beg.col = 0; |
|
|
3151 | selection.end.col = ncol; |
|
|
3152 | hate_those_clicks = 1; |
|
|
3153 | } |
|
|
3154 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3155 | return; |
|
|
3156 | } |
|
|
3157 | #endif /* ! NO_OLD_SELECTION */ |
|
|
3158 | #ifndef NO_NEW_SELECTION |
|
|
3159 | /* selection_style must not be OLD_SELECT to get here */ |
|
|
3160 | /* |
3177 | /* |
3161 | * This is mainly xterm style selection with a couple of differences, mainly |
3178 | * This is mainly xterm style selection with a couple of differences, mainly |
3162 | * in the way button3 drag extension works. |
3179 | * in the way button3 drag extension works. |
3163 | * We're either doing: button1 drag; button3 press; or button3 drag |
3180 | * We're either doing: button1 drag; button3 press; or button3 drag |
3164 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
3181 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
… | |
… | |
3169 | * a point/word/line which is either the start or end of the selection |
3186 | * a point/word/line which is either the start or end of the selection |
3170 | * and it was decided by whichever point/word/line was `fixed' at the |
3187 | * and it was decided by whichever point/word/line was `fixed' at the |
3171 | * time of the most recent button3 press |
3188 | * time of the most recent button3 press |
3172 | */ |
3189 | */ |
3173 | if (button3 && buttonpress) |
3190 | if (button3 && buttonpress) |
3174 | { /* button3 press */ |
3191 | { /* button3 press */ |
3175 | /* |
3192 | /* |
3176 | * first determine which edge of the selection we are closest to |
3193 | * first determine which edge of the selection we are closest to |
3177 | */ |
3194 | */ |
3178 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3195 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3179 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3196 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3180 | && (((pos.col - selection.beg.col) |
3197 | && (((pos.col - selection.beg.col) |
3181 | + ((pos.row - selection.beg.row) * ncol)) |
3198 | + ((pos.row - selection.beg.row) * ncol)) |
3182 | < ((selection.end.col - pos.col) |
3199 | < ((selection.end.col - pos.col) |
3183 | + ((selection.end.row - pos.row) * ncol))))) |
3200 | + ((selection.end.row - pos.row) * ncol))))) |
3184 | closeto = LEFT; |
3201 | closeto = LEFT; |
|
|
3202 | |
3185 | if (closeto == LEFT) |
3203 | if (closeto == LEFT) |
3186 | { |
3204 | { |
3187 | selection.beg.row = pos.row; |
3205 | selection.beg.row = pos.row; |
3188 | selection.beg.col = pos.col; |
3206 | selection.beg.col = pos.col; |
3189 | selection.mark.row = selection.end.row; |
3207 | selection.mark.row = selection.end.row; |
3190 | selection.mark.col = selection.end.col |
3208 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3191 | - (selection.clicks == 2); |
|
|
3192 | } |
3209 | } |
3193 | else |
3210 | else |
3194 | { |
3211 | { |
3195 | selection.end.row = pos.row; |
3212 | selection.end.row = pos.row; |
3196 | selection.end.col = pos.col; |
3213 | selection.end.col = pos.col; |
3197 | selection.mark.row = selection.beg.row; |
3214 | selection.mark.row = selection.beg.row; |
3198 | selection.mark.col = selection.beg.col; |
3215 | selection.mark.col = selection.beg.col; |
3199 | } |
3216 | } |
3200 | } |
3217 | } |
3201 | else |
3218 | else |
3202 | { /* button1 drag or button3 drag */ |
3219 | { /* button1 drag or button3 drag */ |
3203 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3220 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3204 | { |
3221 | { |
3205 | if ((selection.mark.row == selection.end.row) |
3222 | if ((selection.mark.row == selection.end.row) |
3206 | && (selection.mark.col == selection.end.col) |
3223 | && (selection.mark.col == selection.end.col) |
3207 | && clickchange && selection.clicks == 2) |
3224 | && clickchange && selection.clicks == 2) |
3208 | selection.mark.col--; |
3225 | selection.mark.col--; |
|
|
3226 | |
3209 | selection.beg.row = pos.row; |
3227 | selection.beg.row = pos.row; |
3210 | selection.beg.col = pos.col; |
3228 | selection.beg.col = pos.col; |
3211 | selection.end.row = selection.mark.row; |
3229 | selection.end.row = selection.mark.row; |
3212 | selection.end.col = selection.mark.col |
3230 | selection.end.col = selection.mark.col + (selection.clicks == 2); |
3213 | + (selection.clicks == 2); |
|
|
3214 | } |
3231 | } |
3215 | else |
3232 | else |
3216 | { |
3233 | { |
3217 | selection.beg.row = selection.mark.row; |
3234 | selection.beg.row = selection.mark.row; |
3218 | selection.beg.col = selection.mark.col; |
3235 | selection.beg.col = selection.mark.col; |
… | |
… | |
3222 | } |
3239 | } |
3223 | |
3240 | |
3224 | if (selection.clicks == 1) |
3241 | if (selection.clicks == 1) |
3225 | { |
3242 | { |
3226 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3243 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
|
|
3244 | |
3227 | if (end_col != -1 && selection.beg.col > end_col) |
3245 | if (end_col != -1 && selection.beg.col > end_col) |
3228 | { |
3246 | { |
3229 | #if 1 |
3247 | #if 1 |
3230 | selection.beg.col = ncol; |
3248 | selection.beg.col = ncol; |
3231 | #else |
3249 | #else |
3232 | if (selection.beg.row != selection.end.row) |
3250 | if (selection.beg.row != selection.end.row) |
3233 | selection.beg.col = ncol; |
3251 | selection.beg.col = ncol; |
3234 | else |
3252 | else |
3235 | selection.beg.col = selection.mark.col; |
3253 | selection.beg.col = selection.mark.col; |
3236 | #endif |
3254 | #endif |
3237 | |
|
|
3238 | } |
3255 | } |
|
|
3256 | |
3239 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3257 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3258 | |
3240 | if (end_col != -1 && selection.end.col > end_col) |
3259 | if (end_col != -1 && selection.end.col > end_col) |
3241 | selection.end.col = ncol; |
3260 | selection.end.col = ncol; |
3242 | |
|
|
3243 | } |
3261 | } |
3244 | else if (selection.clicks == 2) |
3262 | else if (selection.clicks == 2) |
3245 | { |
3263 | { |
3246 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3264 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3247 | selection.end.col--; |
3265 | selection.end.col--; |
|
|
3266 | |
3248 | selection_delimit_word (UP, & (selection.beg), |
3267 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3249 | & (selection.beg)); |
|
|
3250 | selection_delimit_word (DN, & (selection.end), |
3268 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3251 | & (selection.end)); |
|
|
3252 | } |
3269 | } |
3253 | else if (selection.clicks == 3) |
3270 | else if (selection.clicks == 3) |
3254 | { |
3271 | { |
3255 | #ifndef NO_FRILLS |
3272 | #ifndef NO_FRILLS |
3256 | if ((Options & Opt_tripleclickwords)) |
3273 | if ((Options & Opt_tripleclickwords)) |
3257 | { |
3274 | { |
3258 | int end_row; |
3275 | int end_row; |
3259 | |
3276 | |
3260 | selection_delimit_word (UP, & (selection.beg), |
3277 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3261 | & (selection.beg)); |
|
|
3262 | end_row = screen.tlen[selection.mark.row |
3278 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3263 | + TermWin.saveLines]; |
3279 | |
3264 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3280 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3265 | end_row++) |
|
|
3266 | { |
3281 | { |
3267 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3282 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
|
|
3283 | |
3268 | if (end_col != -1) |
3284 | if (end_col != -1) |
3269 | { |
3285 | { |
3270 | selection.end.row = end_row; |
3286 | selection.end.row = end_row; |
3271 | selection.end.col = end_col; |
3287 | selection.end.col = end_col; |
3272 | selection_remove_trailing_spaces (); |
3288 | selection_remove_trailing_spaces (); |
… | |
… | |
3274 | } |
3290 | } |
3275 | } |
3291 | } |
3276 | } |
3292 | } |
3277 | else |
3293 | else |
3278 | #endif |
3294 | #endif |
3279 | |
|
|
3280 | { |
3295 | { |
3281 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3296 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3282 | selection.mark.col++; |
3297 | selection.mark.col++; |
3283 | selection.beg.col = 0; |
3298 | selection.beg.col = 0; |
3284 | selection.end.col = ncol; |
3299 | selection.end.col = ncol; |
3285 | } |
3300 | } |
3286 | } |
3301 | } |
|
|
3302 | |
3287 | if (button3 && buttonpress) |
3303 | if (button3 && buttonpress) |
3288 | { /* mark may need to be changed */ |
3304 | { /* mark may need to be changed */ |
3289 | if (closeto == LEFT) |
3305 | if (closeto == LEFT) |
3290 | { |
3306 | { |
3291 | selection.mark.row = selection.end.row; |
3307 | selection.mark.row = selection.end.row; |
3292 | selection.mark.col = selection.end.col |
3308 | selection.mark.col = selection.end.col |
3293 | - (selection.clicks == 2); |
3309 | - (selection.clicks == 2); |
… | |
… | |
3297 | selection.mark.row = selection.beg.row; |
3313 | selection.mark.row = selection.beg.row; |
3298 | selection.mark.col = selection.beg.col; |
3314 | selection.mark.col = selection.beg.col; |
3299 | } |
3315 | } |
3300 | } |
3316 | } |
3301 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3317 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3302 | #endif /* ! NO_NEW_SELECTION */ |
|
|
3303 | } |
3318 | } |
3304 | |
3319 | |
3305 | #ifndef NO_FRILLS |
3320 | #ifndef NO_FRILLS |
3306 | void |
3321 | void |
3307 | rxvt_term::selection_remove_trailing_spaces () |
3322 | rxvt_term::selection_remove_trailing_spaces () |
… | |
… | |
3381 | ev.target = rq.target; |
3396 | ev.target = rq.target; |
3382 | ev.time = rq.time; |
3397 | ev.time = rq.time; |
3383 | |
3398 | |
3384 | if (rq.target == xa[XA_TARGETS]) |
3399 | if (rq.target == xa[XA_TARGETS]) |
3385 | { |
3400 | { |
3386 | Atom32 target_list[5]; |
3401 | Atom32 target_list[6]; |
3387 | Atom32 *target = target_list; |
3402 | Atom32 *target = target_list; |
3388 | |
3403 | |
3389 | *target++ = (Atom32) xa[XA_TARGETS]; |
3404 | *target++ = (Atom32) xa[XA_TARGETS]; |
|
|
3405 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3390 | *target++ = (Atom32) XA_STRING; |
3406 | *target++ = (Atom32) XA_STRING; |
3391 | *target++ = (Atom32) xa[XA_TEXT]; |
3407 | *target++ = (Atom32) xa[XA_TEXT]; |
3392 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3408 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3393 | #if X_HAVE_UTF8_STRING |
3409 | #if X_HAVE_UTF8_STRING |
3394 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3410 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3395 | #endif |
3411 | #endif |
|
|
3412 | |
3396 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3413 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3397 | (8 * sizeof (target_list[0])), PropModeReplace, |
3414 | (8 * sizeof (target_list[0])), PropModeReplace, |
3398 | (unsigned char *)target_list, |
3415 | (unsigned char *)target_list, |
3399 | target - target_list); |
3416 | target - target_list); |
3400 | ev.property = rq.property; |
3417 | ev.property = rq.property; |
3401 | } |
3418 | } |
3402 | else if (rq.target == xa[XA_MULTIPLE]) |
3419 | else if (rq.target == xa[XA_MULTIPLE]) |
3403 | { |
3420 | { |
3404 | /* TODO: Handle MULTIPLE */ |
3421 | /* TODO: Handle MULTIPLE */ |
3405 | } |
3422 | } |
3406 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3423 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3407 | { |
3424 | { |
3408 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3425 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3409 | (8 * sizeof (Time)), PropModeReplace, |
3426 | (8 * sizeof (Time)), PropModeReplace, |
3410 | (unsigned char *)&selection_time, 1); |
3427 | (unsigned char *)&selection_time, 1); |
3411 | ev.property = rq.property; |
3428 | ev.property = rq.property; |
3412 | } |
3429 | } |
3413 | else if (rq.target == XA_STRING |
3430 | else if (rq.target == XA_STRING |
3414 | || rq.target == xa[XA_TEXT] |
3431 | || rq.target == xa[XA_TEXT] |
3415 | || rq.target == xa[XA_COMPOUND_TEXT] |
3432 | || rq.target == xa[XA_COMPOUND_TEXT] |
3416 | || rq.target == xa[XA_UTF8_STRING] |
3433 | || rq.target == xa[XA_UTF8_STRING] |
3417 | ) |
3434 | ) |
3418 | { |
3435 | { |
3419 | short freect = 0; |
3436 | short freect = 0; |
3420 | int selectlen; |
3437 | int selectlen; |
3421 | char *cl; |
3438 | wchar_t *cl; |
3422 | |
3439 | |
3423 | target = rq.target; |
3440 | target = rq.target; |
3424 | |
3441 | |
3425 | if (target == XA_STRING) |
3442 | if (target == XA_STRING) |
3426 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3443 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3427 | // will ask for another format anyways. |
3444 | // will ask for another format anyways. |
3428 | style = XStringStyle; |
3445 | style = XStringStyle; |
3429 | else if (target == xa[XA_TEXT]) |
3446 | else if (target == xa[XA_TEXT]) |
3430 | style = XTextStyle; |
3447 | style = XStdICCTextStyle; |
3431 | else if (target == xa[XA_COMPOUND_TEXT]) |
3448 | else if (target == xa[XA_COMPOUND_TEXT]) |
3432 | style = XCompoundTextStyle; |
3449 | style = XCompoundTextStyle; |
3433 | #if X_HAVE_UTF8_STRING |
3450 | #if X_HAVE_UTF8_STRING |
3434 | else if (target == xa[XA_UTF8_STRING]) |
3451 | else if (target == xa[XA_UTF8_STRING]) |
3435 | style = XUTF8StringStyle; |
3452 | style = XUTF8StringStyle; |
… | |
… | |
3440 | style = XCompoundTextStyle; |
3457 | style = XCompoundTextStyle; |
3441 | } |
3458 | } |
3442 | |
3459 | |
3443 | if (selection.text) |
3460 | if (selection.text) |
3444 | { |
3461 | { |
3445 | cl = (char *)selection.text; |
3462 | cl = selection.text; |
3446 | selectlen = selection.len; |
3463 | selectlen = selection.len; |
3447 | } |
3464 | } |
3448 | else |
3465 | else |
3449 | { |
3466 | { |
3450 | cl = ""; |
3467 | cl = L""; |
3451 | selectlen = 0; |
3468 | selectlen = 0; |
3452 | } |
3469 | } |
3453 | |
3470 | |
|
|
3471 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
|
|
3472 | // manually for XUTF8StringStyle. |
3454 | if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3473 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3455 | freect = 1; |
3474 | freect = 1; |
3456 | else |
3475 | else |
3457 | { |
3476 | { |
3458 | /* if we failed to convert then send it raw */ |
3477 | /* if we failed to convert then send it raw */ |
3459 | ct.value = (unsigned char *)cl; |
3478 | ct.value = (unsigned char *)cl; |
… | |
… | |
3466 | ev.property = rq.property; |
3485 | ev.property = rq.property; |
3467 | |
3486 | |
3468 | if (freect) |
3487 | if (freect) |
3469 | XFree (ct.value); |
3488 | XFree (ct.value); |
3470 | } |
3489 | } |
|
|
3490 | |
3471 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3491 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3472 | } |
3492 | } |
3473 | |
3493 | |
3474 | /* ------------------------------------------------------------------------- * |
3494 | /* ------------------------------------------------------------------------- * |
3475 | * MOUSE ROUTINES * |
3495 | * MOUSE ROUTINES * |