ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.39 by pcg, Wed Feb 25 15:06:05 2004 UTC vs.
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC

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 */
502void 493void
503rxvt_term::scr_cursor (int mode) 494rxvt_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 */
553int 547int
554rxvt_term::scr_change_screen (int scrn) 548rxvt_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 */
766void 763void
767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 764rxvt_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)
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
894 do 900 do
895 { 901 {
896 stp[screen.cur.col] = c; 902 stp[screen.cur.col] = c;
897 srp[screen.cur.col] = rend; 903 srp[screen.cur.col] = rend;
898 904
899 if (screen.cur.col < last_col - 1) 905 if (screen.cur.col < last_col - 1)
900 screen.cur.col++; 906 screen.cur.col++;
901 else 907 else
902 { 908 {
903 screen.tlen[row] = last_col; 909 screen.tlen[row] = last_col;
904 if (screen.flags & Screen_Autowrap) 910 if (screen.flags & Screen_Autowrap)
905 screen.flags |= Screen_WrapNext; 911 screen.flags |= Screen_WrapNext;
906 break; 912 break;
907 } 913 }
908 914
909 c = NOCHAR; 915 c = NOCHAR;
910 } 916 }
911 while (--width > 0); 917 while (--width > 0);
918
919 // pad with spaces when overwriting wide character with smaller one
920 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
921 {
922 stp[c] = ' ';
923 srp[c] = rend;
924 }
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 }
912 else 948 else
913 (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 }
914 } 964 }
915 965
916 if (screen.tlen[row] != -1) /* XXX: think about this */ 966 if (screen.tlen[row] != -1) /* XXX: think about this */
917 MAX_IT (screen.tlen[row], screen.cur.col); 967 MAX_IT (screen.tlen[row], screen.cur.col);
918 968
… …
938 */ 988 */
939void 989void
940rxvt_term::scr_backspace () 990rxvt_term::scr_backspace ()
941{ 991{
942 want_refresh = 1; 992 want_refresh = 1;
993
943 if (screen.cur.col == 0) 994 if (screen.cur.col == 0)
944 { 995 {
945 if (screen.cur.row > 0) 996 if (screen.cur.row > 0)
946 { 997 {
947#ifdef TERMCAP_HAS_BW 998#ifdef TERMCAP_HAS_BW
… …
952 1003
953 } 1004 }
954 } 1005 }
955 else if ((screen.flags & Screen_WrapNext) == 0) 1006 else if ((screen.flags & Screen_WrapNext) == 0)
956 scr_gotorc (0, -1, RELATIVE); 1007 scr_gotorc (0, -1, RELATIVE);
1008
957 screen.flags &= ~Screen_WrapNext; 1009 screen.flags &= ~Screen_WrapNext;
958} 1010}
959 1011
960/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
961/* 1013/*
… …
964 * XTERM_SEQ: CTRL-I 1016 * XTERM_SEQ: CTRL-I
965 */ 1017 */
966void 1018void
967rxvt_term::scr_tab (int count) 1019rxvt_term::scr_tab (int count)
968{ 1020{
969 int i, x; 1021 int i, x;
970 1022
971 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
972 want_refresh = 1; 1024 want_refresh = 1;
973 i = x = screen.cur.col; 1025 i = x = screen.cur.col;
1026
974 if (count == 0) 1027 if (count == 0)
975 return; 1028 return;
976 else if (count > 0) 1029 else if (count > 0)
977 { 1030 {
978 for (; ++i < TermWin.ncol; ) 1031 for (; ++i < TermWin.ncol; )
… …
980 { 1033 {
981 x = i; 1034 x = i;
982 if (!--count) 1035 if (!--count)
983 break; 1036 break;
984 } 1037 }
1038
985 if (count) 1039 if (count)
986 x = TermWin.ncol - 1; 1040 x = TermWin.ncol - 1;
987 } 1041 }
988 else /* if (count < 0) */ 1042 else /* if (count < 0) */
989 { 1043 {
… …
992 { 1046 {
993 x = i; 1047 x = i;
994 if (!++count) 1048 if (!++count)
995 break; 1049 break;
996 } 1050 }
1051
997 if (count) 1052 if (count)
998 x = 0; 1053 x = 0;
999 } 1054 }
1055
1000 if (x != screen.cur.col) 1056 if (x != screen.cur.col)
1001 scr_gotorc (0, x, R_RELATIVE); 1057 scr_gotorc (0, x, R_RELATIVE);
1002} 1058}
1003 1059
1004/* ------------------------------------------------------------------------- */ 1060/* ------------------------------------------------------------------------- */
… …
1061 want_refresh = 1; 1117 want_refresh = 1;
1062 ZERO_SCROLLBACK (); 1118 ZERO_SCROLLBACK ();
1063 1119
1064 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));
1065 1121
1066 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1067 : col);
1068 MAX_IT (screen.cur.col, 0); 1123 MAX_IT (screen.cur.col, 0);
1069 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1070 1125
1071 screen.flags &= ~Screen_WrapNext; 1126 screen.flags &= ~Screen_WrapNext;
1072 if (relative & R_RELATIVE) 1127 if (relative & R_RELATIVE)
… …
1098 else 1153 else
1099 screen.cur.row = row; 1154 screen.cur.row = row;
1100 } 1155 }
1101 MAX_IT (screen.cur.row, 0); 1156 MAX_IT (screen.cur.row, 0);
1102 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1157 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1158
1159 while (screen.cur.col > 0
1160 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1161 screen.cur.col--;
1103} 1162}
1104 1163
1105/* ------------------------------------------------------------------------- */ 1164/* ------------------------------------------------------------------------- */
1106/* 1165/*
1107 * direction should be UP or DN 1166 * direction should be UP or DN
1108 */ 1167 */
1109void 1168void
1110rxvt_term::scr_index (enum page_dirn direction) 1169rxvt_term::scr_index (enum page_dirn direction)
1111{ 1170{
1112 int dirn; 1171 int dirn;
1113 1172
1114 want_refresh = 1; 1173 want_refresh = 1;
1115 dirn = ((direction == UP) ? 1 : -1); 1174 dirn = ((direction == UP) ? 1 : -1);
1116 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1117 1176
… …
1193 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1252 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1194 */ 1253 */
1195void 1254void
1196rxvt_term::scr_erase_screen (int mode) 1255rxvt_term::scr_erase_screen (int mode)
1197{ 1256{
1198 int num; 1257 int num;
1199 int32_t row, row_offset; 1258 int32_t row, row_offset;
1200 rend_t ren; 1259 rend_t ren;
1201 XGCValues gcvalue; 1260 XGCValues gcvalue;
1202 1261
1203 want_refresh = 1; 1262 want_refresh = 1;
1204 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));
1205 ZERO_SCROLLBACK (); 1264 ZERO_SCROLLBACK ();
1206 row_offset = (int32_t)TermWin.saveLines; 1265 row_offset = (int32_t)TermWin.saveLines;
… …
1225 num = TermWin.nrow; 1284 num = TermWin.nrow;
1226 break; 1285 break;
1227 default: 1286 default:
1228 return; 1287 return;
1229 } 1288 }
1289
1230 refresh_type |= REFRESH_BOUNDS; 1290 refresh_type |= REFRESH_BOUNDS;
1291
1231 if (selection.op && current_screen == selection.screen 1292 if (selection.op && current_screen == selection.screen
1232 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1293 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1233 || (selection.end.row >= row 1294 || (selection.end.row >= row
1234 && selection.end.row <= row + num))) 1295 && selection.end.row <= row + num)))
1235 CLEAR_SELECTION (); 1296 CLEAR_SELECTION ();
1297
1236 if (row >= TermWin.nrow) /* Out Of Bounds */ 1298 if (row >= TermWin.nrow) /* Out Of Bounds */
1237 return; 1299 return;
1300
1238 MIN_IT (num, (TermWin.nrow - row)); 1301 MIN_IT (num, (TermWin.nrow - row));
1302
1239 if (rstyle & (RS_RVid | RS_Uline)) 1303 if (rstyle & (RS_RVid | RS_Uline))
1240 ren = (rend_t) ~RS_None; 1304 ren = (rend_t) ~RS_None;
1241 else if (GET_BASEBG (rstyle) == Color_bg) 1305 else if (GET_BASEBG (rstyle) == Color_bg)
1242 { 1306 {
1243 ren = DEFAULT_RSTYLE; 1307 ren = DEFAULT_RSTYLE;
… …
1250 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1251 ERASE_ROWS (row, num); 1315 ERASE_ROWS (row, num);
1252 gcvalue.foreground = PixColors[Color_fg]; 1316 gcvalue.foreground = PixColors[Color_fg];
1253 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1254 } 1318 }
1319
1255 for (; num--; row++) 1320 for (; num--; row++)
1256 { 1321 {
1257 scr_blank_screen_mem (screen.text, screen.rend, 1322 scr_blank_screen_mem (screen.text, screen.rend,
1258 (unsigned int) (row + row_offset), rstyle); 1323 (unsigned int) (row + row_offset), rstyle);
1259 screen.tlen[row + row_offset] = 0; 1324 screen.tlen[row + row_offset] = 0;
… …
1293 * Insert/Delete <count> lines 1358 * Insert/Delete <count> lines
1294 */ 1359 */
1295void 1360void
1296rxvt_term::scr_insdel_lines (int count, int insdel) 1361rxvt_term::scr_insdel_lines (int count, int insdel)
1297{ 1362{
1298 int end; 1363 int end;
1299 1364
1300 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1301 1366
1302 selection_check (1); 1367 selection_check (1);
1303 1368
… …
1322 * Insert/Delete <count> characters from the current position 1387 * Insert/Delete <count> characters from the current position
1323 */ 1388 */
1324void 1389void
1325rxvt_term::scr_insdel_chars (int count, int insdel) 1390rxvt_term::scr_insdel_chars (int count, int insdel)
1326{ 1391{
1327 int col, row; 1392 int col, row;
1328 rend_t tr; 1393 rend_t tr;
1329 text_t *stp; 1394 text_t *stp;
1330 rend_t *srp; 1395 rend_t *srp;
1331 int16_t *slp; 1396 int16_t *slp;
1332 1397
1333 want_refresh = 1; 1398 want_refresh = 1;
1334 ZERO_SCROLLBACK (); 1399 ZERO_SCROLLBACK ();
1335 1400
1336 if (count <= 0) 1401 if (count <= 0)
… …
1343 screen.flags &= ~Screen_WrapNext; 1408 screen.flags &= ~Screen_WrapNext;
1344 1409
1345 stp = screen.text[row]; 1410 stp = screen.text[row];
1346 srp = screen.rend[row]; 1411 srp = screen.rend[row];
1347 slp = & (screen.tlen[row]); 1412 slp = & (screen.tlen[row]);
1413
1348 switch (insdel) 1414 switch (insdel)
1349 { 1415 {
1350 case INSERT: 1416 case INSERT:
1351 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1417 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1352 col--) 1418 col--)
1353 { 1419 {
1354 stp[col] = stp[col - count]; 1420 stp[col] = stp[col - count];
1355 srp[col] = srp[col - count]; 1421 srp[col] = srp[col - count];
1356 } 1422 }
1423
1357 if (*slp != -1) 1424 if (*slp != -1)
1358 { 1425 {
1359 *slp += count; 1426 *slp += count;
1360 MIN_IT (*slp, TermWin.ncol); 1427 MIN_IT (*slp, TermWin.ncol);
1361 } 1428 }
1429
1362 if (selection.op && current_screen == selection.screen 1430 if (selection.op && current_screen == selection.screen
1363 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1431 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1364 { 1432 {
1365 if (selection.end.row != screen.cur.row 1433 if (selection.end.row != screen.cur.row
1366 || (selection.end.col + count >= TermWin.ncol)) 1434 || (selection.end.col + count >= TermWin.ncol))
… …
1370 selection.beg.col += count; 1438 selection.beg.col += count;
1371 selection.mark.col += count; /* XXX: yes? */ 1439 selection.mark.col += count; /* XXX: yes? */
1372 selection.end.col += count; 1440 selection.end.col += count;
1373 } 1441 }
1374 } 1442 }
1443
1375 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1444 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1376 (unsigned int)count, rstyle); 1445 (unsigned int)count, rstyle);
1377 break; 1446 break;
1447
1378 case ERASE: 1448 case ERASE:
1379 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1449 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1380 selection_check (1); 1450 selection_check (1);
1381 screen.cur.col -= count; 1451 screen.cur.col -= count;
1382 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1452 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1383 (unsigned int)count, rstyle); 1453 (unsigned int)count, rstyle);
1384 break; 1454 break;
1455
1385 case DELETE: 1456 case DELETE:
1386 tr = srp[TermWin.ncol - 1]
1387 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1457 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1458
1388 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1459 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1389 { 1460 {
1390 stp[col] = stp[col + count]; 1461 stp[col] = stp[col + count];
1391 srp[col] = srp[col + count]; 1462 srp[col] = srp[col + count];
1392 } 1463 }
1464
1393 scr_blank_line (& (stp[TermWin.ncol - count]), 1465 scr_blank_line (& (stp[TermWin.ncol - count]),
1394 & (srp[TermWin.ncol - count]), 1466 & (srp[TermWin.ncol - count]),
1395 (unsigned int)count, tr); 1467 (unsigned int)count, tr);
1468
1396 if (*slp == -1) /* break line continuation */ 1469 if (*slp == -1) /* break line continuation */
1397 *slp = TermWin.ncol; 1470 *slp = TermWin.ncol;
1471
1398 *slp -= count; 1472 *slp -= count;
1399 MAX_IT (*slp, 0); 1473 MAX_IT (*slp, 0);
1474
1400 if (selection.op && current_screen == selection.screen 1475 if (selection.op && current_screen == selection.screen
1401 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1476 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1402 { 1477 {
1403 if (selection.end.row != screen.cur.row 1478 if (selection.end.row != screen.cur.row
1404 || (screen.cur.col >= selection.beg.col - count) 1479 || (screen.cur.col >= selection.beg.col - count)
… …
1410 selection.beg.col -= count; 1485 selection.beg.col -= count;
1411 selection.mark.col -= count; /* XXX: yes? */ 1486 selection.mark.col -= count; /* XXX: yes? */
1412 selection.end.col -= count; 1487 selection.end.col -= count;
1413 } 1488 }
1414 } 1489 }
1490
1415 break; 1491 break;
1416 } 1492 }
1417} 1493}
1418 1494
1419/* ------------------------------------------------------------------------- */ 1495/* ------------------------------------------------------------------------- */
… …
1424void 1500void
1425rxvt_term::scr_scroll_region (int top, int bot) 1501rxvt_term::scr_scroll_region (int top, int bot)
1426{ 1502{
1427 MAX_IT (top, 0); 1503 MAX_IT (top, 0);
1428 MIN_IT (bot, (int)TermWin.nrow - 1); 1504 MIN_IT (bot, (int)TermWin.nrow - 1);
1505
1429 if (top > bot) 1506 if (top > bot)
1430 return; 1507 return;
1508
1431 screen.tscroll = top; 1509 screen.tscroll = top;
1432 screen.bscroll = bot; 1510 screen.bscroll = bot;
1433 scr_gotorc (0, 0, 0); 1511 scr_gotorc (0, 0, 0);
1434} 1512}
1435 1513
… …
1441 */ 1519 */
1442void 1520void
1443rxvt_term::scr_cursor_visible (int mode) 1521rxvt_term::scr_cursor_visible (int mode)
1444{ 1522{
1445 want_refresh = 1; 1523 want_refresh = 1;
1524
1446 if (mode) 1525 if (mode)
1447 screen.flags |= Screen_VisibleCursor; 1526 screen.flags |= Screen_VisibleCursor;
1448 else 1527 else
1449 screen.flags &= ~Screen_VisibleCursor; 1528 screen.flags &= ~Screen_VisibleCursor;
1450} 1529}
… …
1766 if (TermWin.view_start != oldviewstart) 1845 if (TermWin.view_start != oldviewstart)
1767 { 1846 {
1768 want_refresh = 1; 1847 want_refresh = 1;
1769 num_scr -= (TermWin.view_start - oldviewstart); 1848 num_scr -= (TermWin.view_start - oldviewstart);
1770 } 1849 }
1850
1771 return (int) (TermWin.view_start - oldviewstart); 1851 return (int) (TermWin.view_start - oldviewstart);
1772} 1852}
1773 1853
1774/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1775void 1855void
… …
1893 1973
1894 /* 1974 /*
1895 * C: set the cursor character (s) 1975 * C: set the cursor character (s)
1896 */ 1976 */
1897 { 1977 {
1898 unsigned char setoldcursor; 1978 unsigned char setoldcursor;
1899 rend_t ccol1, /* Cursor colour */ 1979 rend_t ccol1, /* Cursor colour */
1900 ccol2; /* Cursor colour2 */ 1980 ccol2; /* Cursor colour2 */
1901 1981
1902 showcursor = (screen.flags & Screen_VisibleCursor); 1982 showcursor = (screen.flags & Screen_VisibleCursor);
1903#ifdef CURSOR_BLINK 1983#ifdef CURSOR_BLINK
1904 if (hidden_cursor) 1984 if (hidden_cursor)
1905 showcursor = 0; 1985 showcursor = 0;
1906#endif 1986#endif
1907 1987
1908 if (showcursor) 1988 if (showcursor)
1909 { 1989 {
1910 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1990 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1911 [screen.cur.col]);
1912 1991
1913 if (showcursor && TermWin.focus) 1992 if (showcursor && TermWin.focus)
1914 { 1993 {
1915 *srp ^= RS_RVid; 1994 *srp ^= RS_RVid;
1916#ifndef NO_CURSORCOLOR 1995#ifndef NO_CURSORCOLOR
… …
1944 if (screen.cur.row + TermWin.view_start != ocrow 2023 if (screen.cur.row + TermWin.view_start != ocrow
1945 || screen.cur.col != oldcursor.col) 2024 || screen.cur.col != oldcursor.col)
1946 { 2025 {
1947 if (ocrow < TermWin.nrow 2026 if (ocrow < TermWin.nrow
1948 && oldcursor.col < TermWin.ncol) 2027 && oldcursor.col < TermWin.ncol)
1949 {
1950 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2028 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1951 } 2029
1952 if (TermWin.focus || !showcursor) 2030 if (TermWin.focus || !showcursor)
1953 oldcursor.row = -1; 2031 oldcursor.row = -1;
1954 else 2032 else
1955 setoldcursor = 1; 2033 setoldcursor = 1;
1956 } 2034 }
1957 } 2035 }
1958 else if (!TermWin.focus) 2036 else if (!TermWin.focus)
1959 setoldcursor = 1; 2037 setoldcursor = 1;
2038
1960 if (setoldcursor) 2039 if (setoldcursor)
1961 { 2040 {
1962 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2041 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1963 oldcursor.row = -1; 2042 oldcursor.row = -1;
1964 else 2043 else
… …
1976 */ 2055 */
1977 i = num_scr; 2056 i = num_scr;
1978 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2057 if (refresh_type == FAST_REFRESH && num_scr_allow && i
1979 && abs (i) < TermWin.nrow && !must_clear) 2058 && abs (i) < TermWin.nrow && !must_clear)
1980 { 2059 {
1981 int16_t nits; 2060 int16_t nits;
1982 int j; 2061 int j;
1983 rend_t *drp2; 2062 rend_t *drp2;
1984 text_t *dtp2; 2063 text_t *dtp2;
1985 int len, wlen; 2064 int len, wlen;
1986 2065
1987 j = TermWin.nrow; 2066 j = TermWin.nrow;
1988 wlen = len = -1; 2067 wlen = len = -1;
1989 row = i > 0 ? 0 : j - 1; 2068 row = i > 0 ? 0 : j - 1;
1990 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2069 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2054 int ypixel = (int)Row2Pixel (row); 2133 int ypixel = (int)Row2Pixel (row);
2055 2134
2056 for (col = 0; col < TermWin.ncol; col++) 2135 for (col = 0; col < TermWin.ncol; col++)
2057 { 2136 {
2058 /* compare new text with old - if exactly the same then continue */ 2137 /* compare new text with old - if exactly the same then continue */
2138 if (stp[col] == dtp[col] /* Must match characters to skip. */
2139 && (srp[col] == drp[col] /* Either rendition the same or */
2140 || (stp[col] == ' ' /* space w/ no background change */
2141 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2142 continue;
2143
2144 // redraw one or more characters
2145
2146 // seek to the beginning if wide characters
2147 while (stp[col] == NOCHAR && col > 0)
2148 --col;
2149
2059 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2150 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2060
2061 if (stp[col] == dtp[col] /* Must match characters to skip. */
2062 && (rend == drp[col] /* Either rendition the same or */
2063 || (stp[col] == ' ' /* space w/ no background change */
2064 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2065 continue;
2066
2067 text_t *text = stp + col; 2151 text_t *text = stp + col;
2068 int count = 1; 2152 int count = 1;
2069 2153
2070 /* redraw one or more characters */
2071
2072 dtp[col] = stp[col]; 2154 dtp[col] = stp[col];
2073 drp[col] = rend; 2155 drp[col] = rend;
2074
2075 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2076 continue;
2077 2156
2078 int xpixel = Col2Pixel (col); 2157 int xpixel = Col2Pixel (col);
2079 2158
2080 // this loop looks very messy, it can probably be optimized 2159 // this loop looks very messy, it can probably be optimized
2081 // and cleaned a bit by you? 2160 // and cleaned a bit by you?
… …
2134 else 2213 else
2135 rvid = !rvid; 2214 rvid = !rvid;
2136 } 2215 }
2137 2216
2138 if (rend & RS_Uline) 2217 if (rend & RS_Uline)
2139 {
2140 if (ISSET_PIXCOLOR (Color_UL)) 2218 if (ISSET_PIXCOLOR (Color_UL))
2141 fore = Color_UL; 2219 fore = Color_UL;
2142 }
2143#endif 2220#endif
2144 2221
2145 if (rvid) 2222 if (rvid)
2146 { 2223 {
2147 SWAP_IT (fore, back, int); 2224 SWAP_IT (fore, back, int);
… …
2155 back = Color_RV; 2232 back = Color_RV;
2156#endif 2233#endif
2157 } 2234 }
2158 2235
2159#ifdef TEXT_BLINK 2236#ifdef TEXT_BLINK
2160 if (rend & RS_Blink) 2237 if (rend & RS_Blink && back == Color_bg)
2161 { 2238 {
2162 if (!text_blink_ev.active) 2239 if (!text_blink_ev.active)
2163 { 2240 {
2164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2241 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2165 hidden_text = 0; 2242 hidden_text = 0;
… …
2197 else 2274 else
2198 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2199 2276
2200 if ((rend & RS_Uline) && (font->descent > 1)) 2277 if ((rend & RS_Uline) && (font->descent > 1))
2201 XDrawLine (display->display, drawBuffer, TermWin.gc, 2278 XDrawLine (display->display, drawBuffer, TermWin.gc,
2202 xpixel, ypixel + font->ascent + 1, 2279 xpixel, ypixel + font->ascent + 1,
2203 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2280 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2204 } /* for (col....) */ 2281 } /* for (col....) */
2205 } /* for (row....) */ 2282 } /* for (row....) */
2206 2283
2207 /* 2284 /*
2208 * G: cleanup cursor and display outline cursor if necessary 2285 * G: cleanup cursor and display outline cursor if necessary
… …
2228 while (oldcursor.col + cursorwidth < TermWin.ncol 2305 while (oldcursor.col + cursorwidth < TermWin.ncol
2229 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2306 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2230 cursorwidth++; 2307 cursorwidth++;
2231 2308
2232 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2309 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2233 Col2Pixel (oldcursor.col), 2310 Col2Pixel (oldcursor.col),
2234 Row2Pixel (oldcursor.row), 2311 Row2Pixel (oldcursor.row),
2235 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2312 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2236 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2313 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2237 } 2314 }
2238 } 2315 }
2239 2316
2240 /* 2317 /*
2241 * H: cleanup selection 2318 * H: cleanup selection
… …
2249 /* 2326 /*
2250 * clear the whole screen height, note that width == 0 is treated 2327 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea 2328 * specially by XClearArea
2252 */ 2329 */
2253 XClearArea (display->display, TermWin.vt, 0, 0, 2330 XClearArea (display->display, TermWin.vt, 0, 0,
2254 (unsigned int)TermWin.int_bwidth, 2331 (unsigned int)TermWin.int_bwidth,
2255 (unsigned int)TermWin_TotalHeight (), False); 2332 (unsigned int)TermWin_TotalHeight (), False);
2333
2256 if (clearlast && TermWin.int_bwidth) 2334 if (clearlast && TermWin.int_bwidth)
2257 /* 2335 /*
2258 * clear the whole screen height, note that width == 0 is treated 2336 * clear the whole screen height, note that width == 0 is treated
2259 * specially by XClearArea 2337 * specially by XClearArea
2260 */ 2338 */
2261 XClearArea (display->display, TermWin.vt, 2339 XClearArea (display->display, TermWin.vt,
2262 TermWin.width + TermWin.int_bwidth, 0, 2340 TermWin.width + TermWin.int_bwidth, 0,
2263 (unsigned int)TermWin.int_bwidth, 2341 (unsigned int)TermWin.int_bwidth,
2264 (unsigned int)TermWin_TotalHeight (), False); 2342 (unsigned int)TermWin_TotalHeight (), False);
2343
2265 if (refresh_type & SMOOTH_REFRESH) 2344 if (refresh_type & SMOOTH_REFRESH)
2266 XSync (display->display, False); 2345 XSync (display->display, False);
2267 2346
2268 num_scr = 0; 2347 num_scr = 0;
2269 num_scr_allow = 1; 2348 num_scr_allow = 1;
… …
2293 } 2372 }
2294} 2373}
2295 2374
2296/* ------------------------------------------------------------------------- */ 2375/* ------------------------------------------------------------------------- */
2297void 2376void
2298rxvt_term::scr_clear () 2377rxvt_term::scr_clear (bool really)
2299{ 2378{
2300 if (!TermWin.mapped) 2379 if (!TermWin.mapped)
2301 return; 2380 return;
2302 2381
2303 num_scr_allow = 0; 2382 num_scr_allow = 0;
2304 want_refresh = 1; 2383 want_refresh = 1;
2384
2305#ifdef TRANSPARENT 2385#ifdef TRANSPARENT
2306 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2386 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2307 { 2387 {
2308 int i; 2388 int i;
2309 2389
… …
2316 if (TermWin.parent[i] != None) 2396 if (TermWin.parent[i] != None)
2317 XClearWindow (display->display, TermWin.parent[i]); 2397 XClearWindow (display->display, TermWin.parent[i]);
2318 } 2398 }
2319#endif 2399#endif
2320 2400
2401 if (really)
2321 XClearWindow (display->display, TermWin.vt); 2402 XClearWindow (display->display, TermWin.vt);
2322} 2403}
2323 2404
2324/* ------------------------------------------------------------------------- */ 2405/* ------------------------------------------------------------------------- */
2325void 2406void
2326rxvt_term::scr_reverse_selection () 2407rxvt_term::scr_reverse_selection ()
2327{ 2408{
2328 int i, col, row, end_row;
2329 rend_t *srp;
2330
2331 if (selection.op && current_screen == selection.screen) 2409 if (selection.op && current_screen == selection.screen)
2332 { 2410 {
2333 end_row = TermWin.saveLines - TermWin.view_start; 2411 int end_row = TermWin.saveLines - TermWin.view_start;
2334 i = selection.beg.row + TermWin.saveLines; 2412 int i = selection.beg.row + TermWin.saveLines;
2335 row = selection.end.row + TermWin.saveLines; 2413 int col, row = selection.end.row + TermWin.saveLines;
2414 rend_t *srp;
2415
2336 if (i >= end_row) 2416 if (i >= end_row)
2337 col = selection.beg.col; 2417 col = selection.beg.col;
2338 else 2418 else
2339 { 2419 {
2340 col = 0; 2420 col = 0;
2341 i = end_row; 2421 i = end_row;
2342 } 2422 }
2423
2343 end_row += TermWin.nrow; 2424 end_row += TermWin.nrow;
2344 for (; i < row && i < end_row; i++, col = 0) 2425 for (; i < row && i < end_row; i++, col = 0)
2345 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2426 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2346 srp[col] ^= RS_RVid; 2427 srp[col] ^= RS_RVid;
2428
2347 if (i == row && i < end_row) 2429 if (i == row && i < end_row)
2348 for (srp = screen.rend[i]; col < selection.end.col; col++) 2430 for (srp = screen.rend[i]; col < selection.end.col; col++)
2349 srp[col] ^= RS_RVid; 2431 srp[col] ^= RS_RVid;
2350 } 2432 }
2351} 2433}
… …
2439 { 2521 {
2440 n = min (len - i, PROP_SIZE); 2522 n = min (len - i, PROP_SIZE);
2441 MEMCPY (ds, data + i, n); 2523 MEMCPY (ds, data + i, n);
2442 2524
2443 for (j = 0; j < n; j++) 2525 for (j = 0; j < n; j++)
2444 if (ds[j] == '\n') 2526 if (ds[j] == C0_LF)
2445 ds[j] = '\r'; 2527 ds[j] = C0_CR;
2446 2528
2447 tt_write (ds, (int)n); 2529 tt_write (ds, (int)n);
2448 } 2530 }
2449 2531
2450 free (ds); 2532 free (ds);
… …
2511 } 2593 }
2512 2594
2513 if (ct.nitems == 0) 2595 if (ct.nitems == 0)
2514 { 2596 {
2515 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2597 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2598
2516 if (selection_wait == Sel_normal && nread == 0 2599 if (selection_wait == Sel_normal && nread == 0
2517 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2600 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2518 { 2601 {
2519 /* 2602 /*
2520 * pass through again trying CUT_BUFFER0 if we've come from 2603 * pass through again trying CUT_BUFFER0 if we've come from
… …
2562void 2645void
2563rxvt_term::incr_cb (time_watcher &w) 2646rxvt_term::incr_cb (time_watcher &w)
2564{ 2647{
2565 selection_wait = Sel_none; 2648 selection_wait = Sel_none;
2566 2649
2567 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2650 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2568} 2651}
2569 2652
2570/* 2653/*
2571 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2654 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2572 */ 2655 */
… …
2575{ 2658{
2576 int reget_time = 0; 2659 int reget_time = 0;
2577 2660
2578 if (prop == None) 2661 if (prop == None)
2579 return; 2662 return;
2663
2580 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));
2581 if (selection_wait == Sel_normal) 2665 if (selection_wait == Sel_normal)
2582 { 2666 {
2583 int a, afmt; 2667 int a, afmt;
2584 Atom atype; 2668 Atom atype;
2585 unsigned long bytes_after, nitems; 2669 unsigned long bytes_after, nitems;
2586 unsigned char *s = NULL; 2670 unsigned char *s = NULL;
2587 2671
2588 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2672 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2589 xa[XA_INCR], &atype, &afmt, &nitems, 2673 xa[XA_INCR], &atype, &afmt, &nitems,
2590 &bytes_after, &s); 2674 &bytes_after, &s);
2591 if (s) 2675 if (s)
2592 XFree (s); 2676 XFree (s);
2593 if (a != Success) 2677 if (a != Success)
2594 return; 2678 return;
2679
2595#ifndef __CYGWIN32__ 2680#ifndef __CYGWIN32__
2596 if (atype == xa[XA_INCR]) 2681 if (atype == xa[XA_INCR])
2597 { /* start an INCR transfer */ 2682 { /* start an INCR transfer */
2598 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2683 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2599 XDeleteProperty (display->display, win, prop); 2684 XDeleteProperty (display->display, win, prop);
… …
2605 2690
2606 } 2691 }
2607 else if (selection_wait == Sel_incr) 2692 else if (selection_wait == Sel_incr)
2608 { 2693 {
2609 reget_time = 1; 2694 reget_time = 1;
2695
2610 if (selection_paste (win, prop, True) == -1) 2696 if (selection_paste (win, prop, True) == -1)
2611 { 2697 {
2612 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2698 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2613 selection_wait = Sel_none; 2699 selection_wait = Sel_none;
2614 incr_ev.stop (); 2700 incr_ev.stop ();
2615 } 2701 }
2616 } 2702 }
2617 if (reget_time) /* received more data so reget time */ 2703 if (reget_time) /* received more data so reget time */
2618 incr_ev.start (NOW + 10); 2704 incr_ev.start (NOW + 10);
2619} 2705}
2706
2620/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2621/* 2708/*
2622 * Request the current selection: 2709 * Request the current selection:
2623 * Order: > internal selection if available 2710 * Order: > internal selection if available
2624 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2711 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2629 */ 2716 */
2630void 2717void
2631rxvt_term::selection_request (Time tm, int x, int y) 2718rxvt_term::selection_request (Time tm, int x, int y)
2632{ 2719{
2633 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
2634 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2722 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2635 return; /* outside window */ 2723 return; /* outside window */
2636 2724
2637 if (selection.text != NULL) 2725 if (selection.text)
2638 { /* internal selection */ 2726 { /* internal selection */
2639 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2727 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2640 paste (selection.text, selection.len); 2728 char *str = rxvt_wcstombs (selection.text, selection.len);
2729 paste ((unsigned char *)str, strlen (str));
2730 free (str);
2641 return; 2731 return;
2642 } 2732 }
2643 else 2733 else
2644 { 2734 {
2645 int i; 2735 int i;
2646 2736
2647 selection_request_time = tm; 2737 selection_request_time = tm;
2648 selection_wait = Sel_normal; 2738 selection_wait = Sel_normal;
2739
2649 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2740 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2650 { 2741 {
2651#if X_HAVE_UTF8_STRING 2742#if X_HAVE_UTF8_STRING
2652 selection_type = Sel_UTF8String; 2743 selection_type = Sel_UTF8String;
2653 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2744 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2658 return; 2749 return;
2659#endif 2750#endif
2660 2751
2661 } 2752 }
2662 } 2753 }
2754
2663 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2755 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2664 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2756 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2665 selection_paste (display->root, XA_CUT_BUFFER0, False); 2757 selection_paste (display->root, XA_CUT_BUFFER0, False);
2666} 2758}
2667 2759
2668int 2760int
2669rxvt_term::selection_request_other (Atom target, int selnum) 2761rxvt_term::selection_request_other (Atom target, int selnum)
2670{ 2762{
2671 Atom sel; 2763 Atom sel;
2672#ifdef DEBUG_SELECT 2764#ifdef DEBUG_SELECT
2673 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2765 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2674#endif 2766#endif
2675 2767
2676 selection_type |= selnum; 2768 selection_type |= selnum;
2769
2677 if (selnum == Sel_Primary) 2770 if (selnum == Sel_Primary)
2678 sel = XA_PRIMARY; 2771 sel = XA_PRIMARY;
2679 else if (selnum == Sel_Secondary) 2772 else if (selnum == Sel_Secondary)
2680 sel = XA_SECONDARY; 2773 sel = XA_SECONDARY;
2681 else 2774 else
2682 sel = xa[XA_CLIPBOARD]; 2775 sel = xa[XA_CLIPBOARD];
2776
2683 if (XGetSelectionOwner (display->display, sel) != None) 2777 if (XGetSelectionOwner (display->display, sel) != None)
2684 { 2778 {
2685 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]));
2686 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2780 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2687 TermWin.vt, selection_request_time); 2781 TermWin.vt, selection_request_time);
2688 return 1; 2782 return 1;
2689 } 2783 }
2784
2690 return 0; 2785 return 0;
2691} 2786}
2692 2787
2693/* ------------------------------------------------------------------------- */ 2788/* ------------------------------------------------------------------------- */
2694/* 2789/*
… …
2703 want_refresh = 1; 2798 want_refresh = 1;
2704 free (selection.text); 2799 free (selection.text);
2705 selection.text = NULL; 2800 selection.text = NULL;
2706 selection.len = 0; 2801 selection.len = 0;
2707 CLEAR_SELECTION (); 2802 CLEAR_SELECTION ();
2803
2804 if (display->selection_owner == this)
2805 display->selection_owner = 0;
2708} 2806}
2709 2807
2710/* ------------------------------------------------------------------------- */ 2808/* ------------------------------------------------------------------------- */
2711/* 2809/*
2712 * Copy a selection into the cut buffer 2810 * Copy a selection into the cut buffer
2713 * EXT: button 1 or 3 release 2811 * EXT: button 1 or 3 release
2714 */ 2812 */
2715void 2813void
2716rxvt_term::selection_make (Time tm) 2814rxvt_term::selection_make (Time tm)
2717{ 2815{
2718 int i, col, end_col, row, end_row; 2816 int i, col, end_col, row, end_row;
2719 unsigned char *new_selection_text; 2817 wchar_t *new_selection_text;
2720 char *str;
2721 text_t *t; 2818 text_t *t;
2722#ifdef ACS_ASCII
2723 rend_t *re;
2724#endif
2725 2819
2726 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));
2727 switch (selection.op) 2821 switch (selection.op)
2728 { 2822 {
2729 case SELECTION_CONT: 2823 case SELECTION_CONT:
… …
2741 selection.op = SELECTION_DONE; 2835 selection.op = SELECTION_DONE;
2742 2836
2743 if (selection.clicks == 4) 2837 if (selection.clicks == 4)
2744 return; /* nothing selected, go away */ 2838 return; /* nothing selected, go away */
2745 2839
2746 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2840 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2747 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2841 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2748
2749 new_selection_text = (unsigned char *)str;
2750 2842
2751 col = selection.beg.col; 2843 col = selection.beg.col;
2752 MAX_IT (col, 0); 2844 MAX_IT (col, 0);
2753 row = selection.beg.row + TermWin.saveLines; 2845 row = selection.beg.row + TermWin.saveLines;
2754 end_row = selection.end.row + TermWin.saveLines; 2846 end_row = selection.end.row + TermWin.saveLines;
2847 int ofs = 0;
2848 int extra = 0;
2755 2849
2756 for (; row <= end_row; row++, col = 0) 2850 for (; row <= end_row; row++, col = 0)
2757 { 2851 {
2758 t = & (screen.text[row][col]); 2852 t = &(screen.text[row][col]);
2759 2853
2760 end_col = screen.tlen[row]; 2854 end_col = screen.tlen[row];
2761 2855
2762 if (end_col == -1) 2856 if (end_col == -1)
2763 end_col = TermWin.ncol; 2857 end_col = TermWin.ncol;
2764 2858
2765 if (row == end_row) 2859 if (row == end_row)
2766 MIN_IT (end_col, selection.end.col); 2860 MIN_IT (end_col, selection.end.col);
2767 2861
2768 for (; col < end_col; col++) 2862 for (; col < end_col; col++)
2863 {
2769 if (*t == NOCHAR) 2864 if (*t == NOCHAR)
2770 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
2771 else 2883 else
2772 { 2884 new_selection_text[ofs++] = *t++;
2773 int len = wctomb (str, *t++);
2774 if (len > 0)
2775 str += len;
2776 } 2885 }
2777 2886
2778 if (screen.tlen[row] != -1 && row != end_row) 2887 if (screen.tlen[row] != -1 && row != end_row)
2779 *str++ = '\n'; 2888 new_selection_text[ofs++] = C0_LF;
2780 } 2889 }
2781 2890
2782#ifndef NO_OLD_SELECTION
2783 if (selection_style == OLD_SELECT)
2784 if (end_col == TermWin.ncol)
2785 *str++ = '\n';
2786#endif
2787#ifndef NO_NEW_SELECTION
2788 if (selection_style != OLD_SELECT)
2789 if (end_col != selection.end.col) 2891 if (end_col != selection.end.col)
2790 *str++ = '\n'; 2892 new_selection_text[ofs++] = C0_LF;
2791#endif
2792 *str = '\0';
2793 2893
2794 i = str - (char *)new_selection_text; 2894 new_selection_text[ofs] = 0;
2895
2795 if (i == 0) 2896 if (ofs == 0)
2796 { 2897 {
2797 free (new_selection_text); 2898 free (new_selection_text);
2798 return; 2899 return;
2799 } 2900 }
2800 2901
2801 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2802 if (str - (char *)new_selection_text > 1024)
2803 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2804
2805 selection.len = i;
2806
2807 if (selection.text)
2808 free (selection.text); 2902 free (selection.text);
2809 2903
2810 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));
2811 2907
2812 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2908 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2813 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2909 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2814 display->set_selection_owner (this); 2910 display->set_selection_owner (this);
2815 else 2911 else
2816 rxvt_print_error ("can't get primary selection"); 2912 rxvt_warn ("can't get primary selection, ignoring.\n");
2817 2913
2818 { 2914#if 0
2819 XTextProperty ct; 2915 XTextProperty ct;
2820 char *cl = (char *)selection.text;
2821 2916
2822 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2917 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2823 { 2918 {
2824 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2825 PropModeReplace, ct.value, ct.nitems);
2826 XFree (ct.value);
2827 }
2828 else
2829 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2919 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2830 PropModeReplace, selection.text, (int)selection.len); 2920 PropModeReplace, ct.value, ct.nitems);
2921 XFree (ct.value);
2831 } 2922 }
2923#endif
2832 2924
2833 selection_time = tm; 2925 selection_time = tm;
2834 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2926 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2835} 2927}
2836 2928
… …
2865rxvt_term::selection_start_colrow (int col, int row) 2957rxvt_term::selection_start_colrow (int col, int row)
2866{ 2958{
2867 want_refresh = 1; 2959 want_refresh = 1;
2868 selection.mark.col = col; 2960 selection.mark.col = col;
2869 selection.mark.row = row - TermWin.view_start; 2961 selection.mark.row = row - TermWin.view_start;
2962
2870 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2963 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2871 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2964 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2872 MAX_IT (selection.mark.col, 0); 2965 MAX_IT (selection.mark.col, 0);
2873 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2966 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2874 2967
2968 while (selection.mark.col > 0
2969 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2970 --selection.mark.col;
2971
2875 if (selection.op) 2972 if (selection.op)
2876 { /* clear the old selection */ 2973 { /* clear the old selection */
2877 selection.beg.row = selection.end.row = selection.mark.row; 2974 selection.beg.row = selection.end.row = selection.mark.row;
2878 selection.beg.col = selection.end.col = selection.mark.col; 2975 selection.beg.col = selection.end.col = selection.mark.col;
2879 } 2976 }
2977
2880 selection.op = SELECTION_INIT; 2978 selection.op = SELECTION_INIT;
2881 selection.screen = current_screen; 2979 selection.screen = current_screen;
2882} 2980}
2883 2981
2884/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
… …
2886 * Word select: select text for 2 clicks 2984 * Word select: select text for 2 clicks
2887 * We now only find out the boundary in one direction 2985 * We now only find out the boundary in one direction
2888 */ 2986 */
2889 2987
2890/* 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 */
2891#define DELIMIT_TEXT(x) \ 2989#define DELIMIT_TEXT(x) \
2892 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2990 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2893#define DELIMIT_REND(x) 1 2991#define DELIMIT_REND(x) 1
2894 2992
2895void 2993void
2896rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2994rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2897{ 2995{
2898 int col, row, dirnadd, tcol, trow, w1, w2; 2996 int col, row, dirnadd, tcol, trow, w1, w2;
2899 row_col_t bound; 2997 row_col_t bound;
2900 text_t *stp; 2998 text_t *stp;
2901 rend_t *srp; 2999 rend_t *srp;
2902 3000
2903 if (dirn == UP) 3001 if (dirn == UP)
2904 { 3002 {
2905 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3003 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2906 bound.col = 0; 3004 bound.col = 0;
… …
2910 { 3008 {
2911 bound.row = TermWin.saveLines + TermWin.nrow; 3009 bound.row = TermWin.saveLines + TermWin.nrow;
2912 bound.col = TermWin.ncol - 1; 3010 bound.col = TermWin.ncol - 1;
2913 dirnadd = 1; 3011 dirnadd = 1;
2914 } 3012 }
3013
2915 row = mark->row + TermWin.saveLines; 3014 row = mark->row + TermWin.saveLines;
2916 col = mark->col; 3015 col = mark->col;
2917 MAX_IT (col, 0); 3016 MAX_IT (col, 0);
2918 /* find the edge of a word */ 3017 /* find the edge of a word */
2919 stp = & (screen.text[row][col]); 3018 stp = & (screen.text[row][col]);
2920 w1 = DELIMIT_TEXT (*stp); 3019 w1 = DELIMIT_TEXT (*stp);
2921 3020
2922 if (selection_style != NEW_SELECT)
2923 {
2924 if (w1 == 1)
2925 {
2926 stp += dirnadd;
2927 if (DELIMIT_TEXT (*stp) == 1)
2928 goto Old_Word_Selection_You_Die;
2929 col += dirnadd;
2930 }
2931 w1 = 0;
2932 }
2933 srp = (&screen.rend[row][col]); 3021 srp = (&screen.rend[row][col]);
2934 w2 = DELIMIT_REND (*srp); 3022 w2 = DELIMIT_REND (*srp);
2935 3023
2936 for (;;) 3024 for (;;)
2937 { 3025 {
2938 for (; col != bound.col; col += dirnadd) 3026 for (; col != bound.col; col += dirnadd)
2939 { 3027 {
2940 stp += dirnadd; 3028 stp += dirnadd;
3029 srp += dirnadd;
3030
3031 if (*stp == NOCHAR)
3032 continue;
3033
2941 if (DELIMIT_TEXT (*stp) != w1) 3034 if (DELIMIT_TEXT (*stp) != w1)
2942 break; 3035 break;
2943 srp += dirnadd;
2944 if (DELIMIT_REND (*srp) != w2) 3036 if (DELIMIT_REND (*srp) != w2)
2945 break; 3037 break;
2946 } 3038 }
3039
2947 if ((col == bound.col) && (row != bound.row)) 3040 if ((col == bound.col) && (row != bound.row))
2948 { 3041 {
2949 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3042 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2950 { 3043 {
2951 trow = row + dirnadd; 3044 trow = row + dirnadd;
2952 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3045 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3046
2953 if (screen.text[trow] == NULL) 3047 if (screen.text[trow] == NULL)
2954 break; 3048 break;
3049
2955 stp = & (screen.text[trow][tcol]); 3050 stp = & (screen.text[trow][tcol]);
2956 srp = & (screen.rend[trow][tcol]); 3051 srp = & (screen.rend[trow][tcol]);
3052
2957 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3053 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2958 break; 3054 break;
3055
2959 row = trow; 3056 row = trow;
2960 col = tcol; 3057 col = tcol;
2961 continue; 3058 continue;
2962 } 3059 }
2963 } 3060 }
2964 break; 3061 break;
2965 } 3062 }
3063
2966Old_Word_Selection_You_Die: 3064Old_Word_Selection_You_Die:
2967 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));
2968 3066
2969 if (dirn == DN) 3067 if (dirn == DN)
2970 col++; /* put us on one past the end */ 3068 col++; /* put us on one past the end */
… …
2992 MAX_IT (row, 0); 3090 MAX_IT (row, 0);
2993 MIN_IT (row, (int)TermWin.nrow - 1); 3091 MIN_IT (row, (int)TermWin.nrow - 1);
2994 MAX_IT (col, 0); 3092 MAX_IT (col, 0);
2995 MIN_IT (col, (int)TermWin.ncol); 3093 MIN_IT (col, (int)TermWin.ncol);
2996 3094
2997#ifndef NO_NEW_SELECTION
2998 /* 3095 /*
2999 * 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
3000 * 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
3001 * 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
3002 * be _past_ a character for it to be selected. 3099 * be _past_ a character for it to be selected.
3003 */ 3100 */
3004 if (selection_style != OLD_SELECT)
3005 {
3006 if (((selection.clicks % 3) == 1) && !flag 3101 if (((selection.clicks % 3) == 1) && !flag
3007 && (col == selection.mark.col 3102 && (col == selection.mark.col
3008 && (row == selection.mark.row + TermWin.view_start))) 3103 && (row == selection.mark.row + TermWin.view_start)))
3009 { 3104 {
3010 /* select nothing */ 3105 /* select nothing */
3011 selection.beg.row = selection.end.row = 0; 3106 selection.beg.row = selection.end.row = 0;
3012 selection.beg.col = selection.end.col = 0; 3107 selection.beg.col = selection.end.col = 0;
3013 selection.clicks = 4; 3108 selection.clicks = 4;
3014 want_refresh = 1; 3109 want_refresh = 1;
3015 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3110 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3016 return; 3111 return;
3017 }
3018 } 3112 }
3019#endif 3113
3020 if (selection.clicks == 4) 3114 if (selection.clicks == 4)
3021 selection.clicks = 1; 3115 selection.clicks = 1;
3022 3116
3023 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3117 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3024 flag == 1 ? 1 : 0, /* ? button press */ 3118 flag == 1 ? 1 : 0, /* ? button press */
… …
3030 * Extend the selection to the specified col/row 3124 * Extend the selection to the specified col/row
3031 */ 3125 */
3032void 3126void
3033rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3127rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3034{ 3128{
3035 int16_t ncol = TermWin.ncol; 3129 int16_t ncol = TermWin.ncol;
3036 int end_col; 3130 int end_col;
3037 row_col_t pos; 3131 row_col_t pos;
3038 enum { 3132 enum {
3039 LEFT, RIGHT 3133 LEFT, RIGHT
3040 } closeto = RIGHT; 3134 } closeto = RIGHT;
3041 3135
3042 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));
… …
3078 pos.col = col; 3172 pos.col = col;
3079 pos.row = row; 3173 pos.row = row;
3080 3174
3081 pos.row -= TermWin.view_start; /* adjust for scroll */ 3175 pos.row -= TermWin.view_start; /* adjust for scroll */
3082 3176
3083#ifndef NO_OLD_SELECTION
3084 /*
3085 * This mimics some of the selection behaviour of version 2.20 and before.
3086 * There are no ``selection modes'', button3 is always character extension.
3087 * Note: button3 drag is always available, c.f. v2.20
3088 * Selection always terminates (left or right as appropriate) at the mark.
3089 */
3090 if (selection_style == OLD_SELECT)
3091 {
3092 if (selection.clicks == 1 || button3)
3093 {
3094 if (hate_those_clicks)
3095 {
3096 hate_those_clicks = 0;
3097 if (selection.clicks == 1)
3098 {
3099 selection.beg.row = selection.mark.row;
3100 selection.beg.col = selection.mark.col;
3101 }
3102 else
3103 {
3104 selection.mark.row = selection.beg.row;
3105 selection.mark.col = selection.beg.col;
3106 }
3107 }
3108 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3109 {
3110 selection.end.row = selection.mark.row;
3111 selection.end.col = selection.mark.col + 1;
3112 selection.beg.row = pos.row;
3113 selection.beg.col = pos.col;
3114 }
3115 else
3116 {
3117 selection.beg.row = selection.mark.row;
3118 selection.beg.col = selection.mark.col;
3119 selection.end.row = pos.row;
3120 selection.end.col = pos.col + 1;
3121 }
3122 }
3123 else if (selection.clicks == 2)
3124 {
3125 selection_delimit_word (UP, & (selection.mark),
3126 & (selection.beg));
3127 selection_delimit_word (DN, & (selection.mark),
3128 & (selection.end));
3129 hate_those_clicks = 1;
3130 }
3131 else if (selection.clicks == 3)
3132 {
3133 selection.beg.row = selection.end.row = selection.mark.row;
3134 selection.beg.col = 0;
3135 selection.end.col = ncol;
3136 hate_those_clicks = 1;
3137 }
3138 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));
3139 return;
3140 }
3141#endif /* ! NO_OLD_SELECTION */
3142#ifndef NO_NEW_SELECTION
3143 /* selection_style must not be OLD_SELECT to get here */
3144 /* 3177 /*
3145 * 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
3146 * in the way button3 drag extension works. 3179 * in the way button3 drag extension works.
3147 * We're either doing: button1 drag; button3 press; or button3 drag 3180 * We're either doing: button1 drag; button3 press; or button3 drag
3148 * 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
… …
3153 * 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
3154 * 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
3155 * time of the most recent button3 press 3188 * time of the most recent button3 press
3156 */ 3189 */
3157 if (button3 && buttonpress) 3190 if (button3 && buttonpress)
3158 { /* button3 press */ 3191 { /* button3 press */
3159 /* 3192 /*
3160 * first determine which edge of the selection we are closest to 3193 * first determine which edge of the selection we are closest to
3161 */ 3194 */
3162 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3195 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3163 || (!ROWCOL_IS_AFTER (pos, selection.end) 3196 || (!ROWCOL_IS_AFTER (pos, selection.end)
3164 && (((pos.col - selection.beg.col) 3197 && (((pos.col - selection.beg.col)
3165 + ((pos.row - selection.beg.row) * ncol)) 3198 + ((pos.row - selection.beg.row) * ncol))
3166 < ((selection.end.col - pos.col) 3199 < ((selection.end.col - pos.col)
3167 + ((selection.end.row - pos.row) * ncol))))) 3200 + ((selection.end.row - pos.row) * ncol)))))
3168 closeto = LEFT; 3201 closeto = LEFT;
3202
3169 if (closeto == LEFT) 3203 if (closeto == LEFT)
3170 { 3204 {
3171 selection.beg.row = pos.row; 3205 selection.beg.row = pos.row;
3172 selection.beg.col = pos.col; 3206 selection.beg.col = pos.col;
3173 selection.mark.row = selection.end.row; 3207 selection.mark.row = selection.end.row;
3174 selection.mark.col = selection.end.col 3208 selection.mark.col = selection.end.col - (selection.clicks == 2);
3175 - (selection.clicks == 2);
3176 } 3209 }
3177 else 3210 else
3178 { 3211 {
3179 selection.end.row = pos.row; 3212 selection.end.row = pos.row;
3180 selection.end.col = pos.col; 3213 selection.end.col = pos.col;
3181 selection.mark.row = selection.beg.row; 3214 selection.mark.row = selection.beg.row;
3182 selection.mark.col = selection.beg.col; 3215 selection.mark.col = selection.beg.col;
3183 } 3216 }
3184 } 3217 }
3185 else 3218 else
3186 { /* button1 drag or button3 drag */ 3219 { /* button1 drag or button3 drag */
3187 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3220 if (ROWCOL_IS_AFTER (selection.mark, pos))
3188 { 3221 {
3189 if ((selection.mark.row == selection.end.row) 3222 if ((selection.mark.row == selection.end.row)
3190 && (selection.mark.col == selection.end.col) 3223 && (selection.mark.col == selection.end.col)
3191 && clickchange && selection.clicks == 2) 3224 && clickchange && selection.clicks == 2)
3192 selection.mark.col--; 3225 selection.mark.col--;
3226
3193 selection.beg.row = pos.row; 3227 selection.beg.row = pos.row;
3194 selection.beg.col = pos.col; 3228 selection.beg.col = pos.col;
3195 selection.end.row = selection.mark.row; 3229 selection.end.row = selection.mark.row;
3196 selection.end.col = selection.mark.col 3230 selection.end.col = selection.mark.col + (selection.clicks == 2);
3197 + (selection.clicks == 2);
3198 } 3231 }
3199 else 3232 else
3200 { 3233 {
3201 selection.beg.row = selection.mark.row; 3234 selection.beg.row = selection.mark.row;
3202 selection.beg.col = selection.mark.col; 3235 selection.beg.col = selection.mark.col;
… …
3206 } 3239 }
3207 3240
3208 if (selection.clicks == 1) 3241 if (selection.clicks == 1)
3209 { 3242 {
3210 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3243 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3244
3211 if (end_col != -1 && selection.beg.col > end_col) 3245 if (end_col != -1 && selection.beg.col > end_col)
3212 { 3246 {
3213#if 1 3247#if 1
3214 selection.beg.col = ncol; 3248 selection.beg.col = ncol;
3215#else 3249#else
3216 if (selection.beg.row != selection.end.row) 3250 if (selection.beg.row != selection.end.row)
3217 selection.beg.col = ncol; 3251 selection.beg.col = ncol;
3218 else 3252 else
3219 selection.beg.col = selection.mark.col; 3253 selection.beg.col = selection.mark.col;
3220#endif 3254#endif
3221
3222 } 3255 }
3256
3223 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3257 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3258
3224 if (end_col != -1 && selection.end.col > end_col) 3259 if (end_col != -1 && selection.end.col > end_col)
3225 selection.end.col = ncol; 3260 selection.end.col = ncol;
3226
3227 } 3261 }
3228 else if (selection.clicks == 2) 3262 else if (selection.clicks == 2)
3229 { 3263 {
3230 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3264 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3231 selection.end.col--; 3265 selection.end.col--;
3266
3232 selection_delimit_word (UP, & (selection.beg), 3267 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3233 & (selection.beg));
3234 selection_delimit_word (DN, & (selection.end), 3268 selection_delimit_word (DN, & (selection.end), & (selection.end));
3235 & (selection.end));
3236 } 3269 }
3237 else if (selection.clicks == 3) 3270 else if (selection.clicks == 3)
3238 { 3271 {
3239#ifndef NO_FRILLS 3272#ifndef NO_FRILLS
3240 if ((Options & Opt_tripleclickwords)) 3273 if ((Options & Opt_tripleclickwords))
3241 { 3274 {
3242 int end_row; 3275 int end_row;
3243 3276
3244 selection_delimit_word (UP, & (selection.beg), 3277 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3245 & (selection.beg));
3246 end_row = screen.tlen[selection.mark.row 3278 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3247 + TermWin.saveLines]; 3279
3248 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3280 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3249 end_row++)
3250 { 3281 {
3251 end_col = screen.tlen[end_row + TermWin.saveLines]; 3282 end_col = screen.tlen[end_row + TermWin.saveLines];
3283
3252 if (end_col != -1) 3284 if (end_col != -1)
3253 { 3285 {
3254 selection.end.row = end_row; 3286 selection.end.row = end_row;
3255 selection.end.col = end_col; 3287 selection.end.col = end_col;
3256 selection_remove_trailing_spaces (); 3288 selection_remove_trailing_spaces ();
… …
3258 } 3290 }
3259 } 3291 }
3260 } 3292 }
3261 else 3293 else
3262#endif 3294#endif
3263
3264 { 3295 {
3265 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3296 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3266 selection.mark.col++; 3297 selection.mark.col++;
3267 selection.beg.col = 0; 3298 selection.beg.col = 0;
3268 selection.end.col = ncol; 3299 selection.end.col = ncol;
3269 } 3300 }
3270 } 3301 }
3302
3271 if (button3 && buttonpress) 3303 if (button3 && buttonpress)
3272 { /* mark may need to be changed */ 3304 { /* mark may need to be changed */
3273 if (closeto == LEFT) 3305 if (closeto == LEFT)
3274 { 3306 {
3275 selection.mark.row = selection.end.row; 3307 selection.mark.row = selection.end.row;
3276 selection.mark.col = selection.end.col 3308 selection.mark.col = selection.end.col
3277 - (selection.clicks == 2); 3309 - (selection.clicks == 2);
… …
3281 selection.mark.row = selection.beg.row; 3313 selection.mark.row = selection.beg.row;
3282 selection.mark.col = selection.beg.col; 3314 selection.mark.col = selection.beg.col;
3283 } 3315 }
3284 } 3316 }
3285 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));
3286#endif /* ! NO_NEW_SELECTION */
3287} 3318}
3288 3319
3289#ifndef NO_FRILLS 3320#ifndef NO_FRILLS
3290void 3321void
3291rxvt_term::selection_remove_trailing_spaces () 3322rxvt_term::selection_remove_trailing_spaces ()
… …
3365 ev.target = rq.target; 3396 ev.target = rq.target;
3366 ev.time = rq.time; 3397 ev.time = rq.time;
3367 3398
3368 if (rq.target == xa[XA_TARGETS]) 3399 if (rq.target == xa[XA_TARGETS])
3369 { 3400 {
3370 Atom32 target_list[5]; 3401 Atom32 target_list[6];
3371 Atom32 *target = target_list; 3402 Atom32 *target = target_list;
3372 3403
3373 *target++ = (Atom32) xa[XA_TARGETS]; 3404 *target++ = (Atom32) xa[XA_TARGETS];
3405 *target++ = (Atom32) xa[XA_TIMESTAMP];
3374 *target++ = (Atom32) XA_STRING; 3406 *target++ = (Atom32) XA_STRING;
3375 *target++ = (Atom32) xa[XA_TEXT]; 3407 *target++ = (Atom32) xa[XA_TEXT];
3376 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3408 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3377#if X_HAVE_UTF8_STRING 3409#if X_HAVE_UTF8_STRING
3378 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3410 *target++ = (Atom32) xa[XA_UTF8_STRING];
3379#endif 3411#endif
3412
3380 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3413 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3381 (8 * sizeof (target_list[0])), PropModeReplace, 3414 (8 * sizeof (target_list[0])), PropModeReplace,
3382 (unsigned char *)target_list, 3415 (unsigned char *)target_list,
3383 target - target_list); 3416 target - target_list);
3384 ev.property = rq.property; 3417 ev.property = rq.property;
3385 } 3418 }
3386 else if (rq.target == xa[XA_MULTIPLE]) 3419 else if (rq.target == xa[XA_MULTIPLE])
3387 { 3420 {
3388 /* TODO: Handle MULTIPLE */ 3421 /* TODO: Handle MULTIPLE */
3389 } 3422 }
3390 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3423 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3391 { 3424 {
3392 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3425 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3393 (8 * sizeof (Time)), PropModeReplace, 3426 (8 * sizeof (Time)), PropModeReplace,
3394 (unsigned char *)&selection_time, 1); 3427 (unsigned char *)&selection_time, 1);
3395 ev.property = rq.property; 3428 ev.property = rq.property;
3396 } 3429 }
3397 else if (rq.target == XA_STRING 3430 else if (rq.target == XA_STRING
3398 || rq.target == xa[XA_TEXT] 3431 || rq.target == xa[XA_TEXT]
3399 || rq.target == xa[XA_COMPOUND_TEXT] 3432 || rq.target == xa[XA_COMPOUND_TEXT]
3400 || rq.target == xa[XA_UTF8_STRING] 3433 || rq.target == xa[XA_UTF8_STRING]
3401 ) 3434 )
3402 { 3435 {
3403 short freect = 0; 3436 short freect = 0;
3404 int selectlen; 3437 int selectlen;
3405 char *cl; 3438 wchar_t *cl;
3406 3439
3407 target = rq.target; 3440 target = rq.target;
3408 3441
3409 if (target == XA_STRING) 3442 if (target == XA_STRING)
3410 // 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
3411 // will ask for another format anyways. 3444 // will ask for another format anyways.
3412 style = XStringStyle; 3445 style = XStringStyle;
3413 else if (target == xa[XA_TEXT]) 3446 else if (target == xa[XA_TEXT])
3414 style = XTextStyle; 3447 style = XStdICCTextStyle;
3415 else if (target == xa[XA_COMPOUND_TEXT]) 3448 else if (target == xa[XA_COMPOUND_TEXT])
3416 style = XCompoundTextStyle; 3449 style = XCompoundTextStyle;
3417#if X_HAVE_UTF8_STRING 3450#if X_HAVE_UTF8_STRING
3418 else if (target == xa[XA_UTF8_STRING]) 3451 else if (target == xa[XA_UTF8_STRING])
3419 style = XUTF8StringStyle; 3452 style = XUTF8StringStyle;
… …
3424 style = XCompoundTextStyle; 3457 style = XCompoundTextStyle;
3425 } 3458 }
3426 3459
3427 if (selection.text) 3460 if (selection.text)
3428 { 3461 {
3429 cl = (char *)selection.text; 3462 cl = selection.text;
3430 selectlen = selection.len; 3463 selectlen = selection.len;
3431 } 3464 }
3432 else 3465 else
3433 { 3466 {
3434 cl = ""; 3467 cl = L"";
3435 selectlen = 0; 3468 selectlen = 0;
3436 } 3469 }
3437 3470
3471 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3472 // manually for XUTF8StringStyle.
3438 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3473 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3439 freect = 1; 3474 freect = 1;
3440 else 3475 else
3441 { 3476 {
3442 /* if we failed to convert then send it raw */ 3477 /* if we failed to convert then send it raw */
3443 ct.value = (unsigned char *)cl; 3478 ct.value = (unsigned char *)cl;
… …
3450 ev.property = rq.property; 3485 ev.property = rq.property;
3451 3486
3452 if (freect) 3487 if (freect)
3453 XFree (ct.value); 3488 XFree (ct.value);
3454 } 3489 }
3490
3455 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3491 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3456} 3492}
3457 3493
3458/* ------------------------------------------------------------------------- * 3494/* ------------------------------------------------------------------------- *
3459 * MOUSE ROUTINES * 3495 * MOUSE ROUTINES *

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines