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.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC

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

Diff Legend

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