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.37 by pcg, Tue Feb 24 23:58:13 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 * 7 *
7 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 11 * (at your option) any later version.
… …
16 * 17 *
17 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
21/* 23/*
22 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
23 */ 25 */
24 26
25#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN 28#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
… …
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 33
32#include <stdint.h> 34#include <stdint.h>
33#include <wchar.h> 35#include <wchar.h>
34 36
35#include "salloc.C" // HACK!! 37#include "salloc.C" // HACK, should be a seperate compile!
36 38
37inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
38{ 40{
39 while (len--) 41 while (len--)
40 *start++ = value; 42 *start++ = value;
… …
437 uint16_t total_rows; 439 uint16_t total_rows;
438 int i; 440 int i;
439 441
440 total_rows = TermWin.nrow + TermWin.saveLines; 442 total_rows = TermWin.nrow + TermWin.saveLines;
441 443
442#ifdef DEBUG_STRICT
443 for (i = 0; i < total_rows; i++)
444 {
445 if (screen.text[i])
446 /* then so is screen.rend[i] */
447 assert (screen.rend[i]);
448 }
449#endif
450
451 delete talloc; talloc = 0; 444 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 445 delete ralloc; ralloc = 0;
453 446
454 free (screen.text); 447 free (screen.text);
455 free (screen.tlen); 448 free (screen.tlen);
… …
498 * XTERM_SEQ: Restore cursor: ESC 8 491 * XTERM_SEQ: Restore cursor: ESC 8
499 */ 492 */
500void 493void
501rxvt_term::scr_cursor (int mode) 494rxvt_term::scr_cursor (int mode)
502{ 495{
503 screen_t *s; 496 screen_t *s;
504 497
505 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
506 499
507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
508 if (current_screen == SECONDARY) 501 if (current_screen == SECONDARY)
509 s = & (swap); 502 s = &swap;
510 else 503 else
511#endif 504#endif
512 s = & (screen); 505 s = &screen;
506
513 switch (mode) 507 switch (mode)
514 { 508 {
515 case SAVE: 509 case SAVE:
516 s->s_cur.row = s->cur.row; 510 s->s_cur.row = s->cur.row;
517 s->s_cur.col = s->cur.col; 511 s->s_cur.col = s->cur.col;
518 s->s_rstyle = rstyle; 512 s->s_rstyle = rstyle;
519 s->s_charset = s->charset; 513 s->s_charset = s->charset;
520 s->s_charset_char = charsets[s->charset]; 514 s->s_charset_char = charsets[s->charset];
521 break; 515 break;
516
522 case RESTORE: 517 case RESTORE:
523 want_refresh = 1; 518 want_refresh = 1;
524 s->cur.row = s->s_cur.row; 519 s->cur.row = s->s_cur.row;
525 s->cur.col = s->s_cur.col; 520 s->cur.col = s->s_cur.col;
526 s->flags &= ~Screen_WrapNext; 521 s->flags &= ~Screen_WrapNext;
… …
528 s->charset = s->s_charset; 523 s->charset = s->s_charset;
529 charsets[s->charset] = s->s_charset_char; 524 charsets[s->charset] = s->s_charset_char;
530 set_font_style (); 525 set_font_style ();
531 break; 526 break;
532 } 527 }
528
533 /* boundary check in case screen size changed between SAVE and RESTORE */ 529 /* boundary check in case screen size changed between SAVE and RESTORE */
534 MIN_IT (s->cur.row, TermWin.nrow - 1); 530 MIN_IT (s->cur.row, TermWin.nrow - 1);
535 MIN_IT (s->cur.col, TermWin.ncol - 1); 531 MIN_IT (s->cur.col, TermWin.ncol - 1);
536#ifdef DEBUG_STRICT 532#ifdef DEBUG_STRICT
537 assert (s->cur.row >= 0); 533 assert (s->cur.row >= 0);
… …
549 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 545 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
550 */ 546 */
551int 547int
552rxvt_term::scr_change_screen (int scrn) 548rxvt_term::scr_change_screen (int scrn)
553{ 549{
554 int i; 550 int i;
555#if NSCREENS 551#if NSCREENS
556 int offset; 552 int offset;
557#endif 553#endif
558 554
559 want_refresh = 1; 555 want_refresh = 1;
560 556
561 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 557 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
562 558
563 TermWin.view_start = 0; 559 TermWin.view_start = 0;
564 560
565 if (current_screen == scrn) 561 if (current_screen == scrn)
566 return current_screen; 562 return scrn;
567 563
568 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
569 565
570 SWAP_IT (current_screen, scrn, int); 566 SWAP_IT (current_screen, scrn, int);
571#if NSCREENS 567#if NSCREENS
568 if (Options & Opt_secondaryScreen)
569 {
572 num_scr = 0; 570 num_scr = 0;
573 offset = TermWin.saveLines; 571 offset = TermWin.saveLines;
574 for (i = prev_nrow; i--;) 572 for (i = prev_nrow; i--;)
575 { 573 {
576 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 574 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
577 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 575 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
578 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 576 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
579 } 577 }
580 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 578 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
581 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 579 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
582# ifdef DEBUG_STRICT 580# ifdef DEBUG_STRICT
583 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 581 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
584 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 582 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
585# else /* drive with your eyes closed */ 583# else /* drive with your eyes closed */
586 MAX_IT (screen.cur.row, 0); 584 MAX_IT (screen.cur.row, 0);
587 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 585 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
588 MAX_IT (screen.cur.col, 0); 586 MAX_IT (screen.cur.col, 0);
589 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 587 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
590# endif 588# endif
591 SWAP_IT (screen.charset, swap.charset, int16_t); 589 SWAP_IT (screen.charset, swap.charset, int16_t);
592 SWAP_IT (screen.flags, swap.flags, int); 590 SWAP_IT (screen.flags, swap.flags, int);
593 screen.flags |= Screen_VisibleCursor; 591 screen.flags |= Screen_VisibleCursor;
594 swap.flags |= Screen_VisibleCursor; 592 swap.flags |= Screen_VisibleCursor;
595#else 593 }
596# ifdef SCROLL_ON_NO_SECONDARY 594 else
595#endif
596 if (Options & Opt_secondaryScroll)
597 if (current_screen == PRIMARY) 597 //if (current_screen == PRIMARY)
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
599# endif
600#endif
601 return scrn; 599 return scrn;
602} 600}
603 601
604/* ------------------------------------------------------------------------- */ 602/* ------------------------------------------------------------------------- */
605/* 603/*
… …
647 return 0; 645 return 0;
648 646
649 want_refresh = 1; 647 want_refresh = 1;
650 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"));
651 649
652 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 650 if (row1 == 0 && count > 0
651 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
653 { 652 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 653 nscrolled = (long)TermWin.nscrolled + (long)count;
655 654
656 if (nscrolled > (long)TermWin.saveLines) 655 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 656 TermWin.nscrolled = TermWin.saveLines;
… …
760/* ------------------------------------------------------------------------- */ 759/* ------------------------------------------------------------------------- */
761/* 760/*
762 * Add text given in <str> of length <len> to screen struct 761 * Add text given in <str> of length <len> to screen struct
763 */ 762 */
764void 763void
765rxvt_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)
766{ 765{
767 unsigned char checksel, clearsel; 766 unsigned char checksel, clearsel;
768 uint32_t c; 767 unicode_t c;
769 int i, row, last_col; 768 int i, row, last_col;
770 text_t *stp; 769 text_t *stp;
771 rend_t *srp; 770 rend_t *srp;
772 771
773 if (len <= 0) /* sanity */ 772 if (len <= 0) /* sanity */
774 return; 773 return;
775 774
776 want_refresh = 1; 775 want_refresh = 1;
… …
799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 798 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 799 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
801#endif 800#endif
802 row = screen.cur.row + TermWin.saveLines; 801 row = screen.cur.row + TermWin.saveLines;
803 802
804 checksel = (selection.op 803 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
805 && current_screen == selection.screen) ? 1 : 0;
806 clearsel = 0; 804 clearsel = 0;
807 805
808 stp = screen.text[row]; 806 stp = screen.text[row];
809 srp = screen.rend[row]; 807 srp = screen.rend[row];
810 808
811 for (i = 0; i < len;) 809 while (len--)
812 { 810 {
813 c = str[i++]; 811 c = *str++;
812
813 if (c < 0x20)
814 switch (c) 814 switch (c)
815 { 815 {
816 case '\t': 816 case C0_HT:
817 scr_tab (1); 817 scr_tab (1);
818 continue; 818 continue;
819 case '\n': 819
820 case C0_LF:
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 821 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 822 MAX_IT (screen.tlen[row], screen.cur.col);
823
822 screen.flags &= ~Screen_WrapNext; 824 screen.flags &= ~Screen_WrapNext;
825
823 if (screen.cur.row == screen.bscroll) 826 if (screen.cur.row == screen.bscroll)
824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 827 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
825 else if (screen.cur.row < (TermWin.nrow - 1)) 828 else if (screen.cur.row < (TermWin.nrow - 1))
826 row = (++screen.cur.row) + TermWin.saveLines; 829 row = (++screen.cur.row) + TermWin.saveLines;
830
827 stp = screen.text[row]; /* _must_ refresh */ 831 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */ 832 srp = screen.rend[row]; /* _must_ refresh */
829 continue; 833 continue;
830 case '\r': 834
835 case C0_CR:
831 if (screen.tlen[row] != -1) /* XXX: think about this */ 836 if (screen.tlen[row] != -1) /* XXX: think about this */
832 MAX_IT (screen.tlen[row], screen.cur.col); 837 MAX_IT (screen.tlen[row], screen.cur.col);
838
833 screen.flags &= ~Screen_WrapNext; 839 screen.flags &= ~Screen_WrapNext;
834 screen.cur.col = 0; 840 screen.cur.col = 0;
835 continue; 841 continue;
836 default:
837 if (c == 127)
838 continue; /* yummmm..... */
839 break;
840 } 842 }
841 843
842 if (checksel /* see if we're writing within selection */ 844 if (checksel /* see if we're writing within selection */
843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 846 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 847 {
846 checksel = 0; 848 checksel = 0;
847 clearsel = 1; 849 clearsel = 1;
848 } 850 }
851
849 if (screen.flags & Screen_WrapNext) 852 if (screen.flags & Screen_WrapNext)
850 { 853 {
851 screen.tlen[row] = -1; 854 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll) 855 if (screen.cur.row == screen.bscroll)
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
854 else if (screen.cur.row < (TermWin.nrow - 1)) 857 else if (screen.cur.row < (TermWin.nrow - 1))
855 row = (++screen.cur.row) + TermWin.saveLines; 858 row = (++screen.cur.row) + TermWin.saveLines;
859
856 stp = screen.text[row]; /* _must_ refresh */ 860 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 861 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 862 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext; 863 screen.flags &= ~Screen_WrapNext;
860 } 864 }
865
861 if (screen.flags & Screen_Insert) 866 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 867 scr_insdel_chars (1, INSERT);
863 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
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 874 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c)
866 { 875 {
867 // dunno where these come from
868#if 0
869 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
870 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
871#endif
872 // vt100 special graphics and line drawing 876 // vt100 special graphics and line drawing
873 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 877 static uint16_t vt100_0[32] = { // 5f .. 7e
874 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 878 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
875 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 879 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
876 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 880 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
877 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 881 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
878 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
879 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
880 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
881 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
882 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
883 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
884 } 882 };
885 883
886 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 884 if (c >= 0x5f && c <= 0x7e)
887 // rely on wcwidth to tell us the character width, at least for non-ascii 885 {
888 int width = c <= 128 ? 1 : wcwidth (c); 886 c = vt100_0[c - 0x5f];
887 width = 1;
888 }
889 }
889 890
890 // width -1 characters (e.g. combining chars) are ignored currently.
891 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
892 do 900 do
893 { 901 {
894 stp[screen.cur.col] = c; 902 stp[screen.cur.col] = c;
895 srp[screen.cur.col] = rend; 903 srp[screen.cur.col] = rend;
896 904
897 if (screen.cur.col < last_col - 1) 905 if (screen.cur.col < last_col - 1)
898 screen.cur.col++; 906 screen.cur.col++;
899 else 907 else
900 { 908 {
901 screen.tlen[row] = last_col; 909 screen.tlen[row] = last_col;
902 if (screen.flags & Screen_Autowrap) 910 if (screen.flags & Screen_Autowrap)
903 screen.flags |= Screen_WrapNext; 911 screen.flags |= Screen_WrapNext;
904 break; 912 break;
905 } 913 }
906 914
907 c = NOCHAR; 915 c = NOCHAR;
908 } 916 }
909 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 }
910 else 948 else
911 (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 }
912 } 964 }
913 965
914 if (screen.tlen[row] != -1) /* XXX: think about this */ 966 if (screen.tlen[row] != -1) /* XXX: think about this */
915 MAX_IT (screen.tlen[row], screen.cur.col); 967 MAX_IT (screen.tlen[row], screen.cur.col);
916 968
… …
936 */ 988 */
937void 989void
938rxvt_term::scr_backspace () 990rxvt_term::scr_backspace ()
939{ 991{
940 want_refresh = 1; 992 want_refresh = 1;
993
941 if (screen.cur.col == 0) 994 if (screen.cur.col == 0)
942 { 995 {
943 if (screen.cur.row > 0) 996 if (screen.cur.row > 0)
944 { 997 {
945#ifdef TERMCAP_HAS_BW 998#ifdef TERMCAP_HAS_BW
… …
950 1003
951 } 1004 }
952 } 1005 }
953 else if ((screen.flags & Screen_WrapNext) == 0) 1006 else if ((screen.flags & Screen_WrapNext) == 0)
954 scr_gotorc (0, -1, RELATIVE); 1007 scr_gotorc (0, -1, RELATIVE);
1008
955 screen.flags &= ~Screen_WrapNext; 1009 screen.flags &= ~Screen_WrapNext;
956} 1010}
957 1011
958/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
959/* 1013/*
… …
962 * XTERM_SEQ: CTRL-I 1016 * XTERM_SEQ: CTRL-I
963 */ 1017 */
964void 1018void
965rxvt_term::scr_tab (int count) 1019rxvt_term::scr_tab (int count)
966{ 1020{
967 int i, x; 1021 int i, x;
968 1022
969 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
970 want_refresh = 1; 1024 want_refresh = 1;
971 i = x = screen.cur.col; 1025 i = x = screen.cur.col;
1026
972 if (count == 0) 1027 if (count == 0)
973 return; 1028 return;
974 else if (count > 0) 1029 else if (count > 0)
975 { 1030 {
976 for (; ++i < TermWin.ncol; ) 1031 for (; ++i < TermWin.ncol; )
… …
978 { 1033 {
979 x = i; 1034 x = i;
980 if (!--count) 1035 if (!--count)
981 break; 1036 break;
982 } 1037 }
1038
983 if (count) 1039 if (count)
984 x = TermWin.ncol - 1; 1040 x = TermWin.ncol - 1;
985 } 1041 }
986 else /* if (count < 0) */ 1042 else /* if (count < 0) */
987 { 1043 {
… …
990 { 1046 {
991 x = i; 1047 x = i;
992 if (!++count) 1048 if (!++count)
993 break; 1049 break;
994 } 1050 }
1051
995 if (count) 1052 if (count)
996 x = 0; 1053 x = 0;
997 } 1054 }
1055
998 if (x != screen.cur.col) 1056 if (x != screen.cur.col)
999 scr_gotorc (0, x, R_RELATIVE); 1057 scr_gotorc (0, x, R_RELATIVE);
1000} 1058}
1001 1059
1002/* ------------------------------------------------------------------------- */ 1060/* ------------------------------------------------------------------------- */
… …
1059 want_refresh = 1; 1117 want_refresh = 1;
1060 ZERO_SCROLLBACK (); 1118 ZERO_SCROLLBACK ();
1061 1119
1062 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));
1063 1121
1064 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1065 : col);
1066 MAX_IT (screen.cur.col, 0); 1123 MAX_IT (screen.cur.col, 0);
1067 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1068 1125
1069 screen.flags &= ~Screen_WrapNext; 1126 screen.flags &= ~Screen_WrapNext;
1070 if (relative & R_RELATIVE) 1127 if (relative & R_RELATIVE)
… …
1096 else 1153 else
1097 screen.cur.row = row; 1154 screen.cur.row = row;
1098 } 1155 }
1099 MAX_IT (screen.cur.row, 0); 1156 MAX_IT (screen.cur.row, 0);
1100 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--;
1101} 1162}
1102 1163
1103/* ------------------------------------------------------------------------- */ 1164/* ------------------------------------------------------------------------- */
1104/* 1165/*
1105 * direction should be UP or DN 1166 * direction should be UP or DN
1106 */ 1167 */
1107void 1168void
1108rxvt_term::scr_index (enum page_dirn direction) 1169rxvt_term::scr_index (enum page_dirn direction)
1109{ 1170{
1110 int dirn; 1171 int dirn;
1111 1172
1112 want_refresh = 1; 1173 want_refresh = 1;
1113 dirn = ((direction == UP) ? 1 : -1); 1174 dirn = ((direction == UP) ? 1 : -1);
1114 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1115 1176
… …
1191 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1252 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1192 */ 1253 */
1193void 1254void
1194rxvt_term::scr_erase_screen (int mode) 1255rxvt_term::scr_erase_screen (int mode)
1195{ 1256{
1196 int num; 1257 int num;
1197 int32_t row, row_offset; 1258 int32_t row, row_offset;
1198 rend_t ren; 1259 rend_t ren;
1199 XGCValues gcvalue; 1260 XGCValues gcvalue;
1200 1261
1201 want_refresh = 1; 1262 want_refresh = 1;
1202 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));
1203 ZERO_SCROLLBACK (); 1264 ZERO_SCROLLBACK ();
1204 row_offset = (int32_t)TermWin.saveLines; 1265 row_offset = (int32_t)TermWin.saveLines;
… …
1223 num = TermWin.nrow; 1284 num = TermWin.nrow;
1224 break; 1285 break;
1225 default: 1286 default:
1226 return; 1287 return;
1227 } 1288 }
1289
1228 refresh_type |= REFRESH_BOUNDS; 1290 refresh_type |= REFRESH_BOUNDS;
1291
1229 if (selection.op && current_screen == selection.screen 1292 if (selection.op && current_screen == selection.screen
1230 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1293 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1231 || (selection.end.row >= row 1294 || (selection.end.row >= row
1232 && selection.end.row <= row + num))) 1295 && selection.end.row <= row + num)))
1233 CLEAR_SELECTION (); 1296 CLEAR_SELECTION ();
1297
1234 if (row >= TermWin.nrow) /* Out Of Bounds */ 1298 if (row >= TermWin.nrow) /* Out Of Bounds */
1235 return; 1299 return;
1300
1236 MIN_IT (num, (TermWin.nrow - row)); 1301 MIN_IT (num, (TermWin.nrow - row));
1302
1237 if (rstyle & (RS_RVid | RS_Uline)) 1303 if (rstyle & (RS_RVid | RS_Uline))
1238 ren = (rend_t) ~RS_None; 1304 ren = (rend_t) ~RS_None;
1239 else if (GET_BASEBG (rstyle) == Color_bg) 1305 else if (GET_BASEBG (rstyle) == Color_bg)
1240 { 1306 {
1241 ren = DEFAULT_RSTYLE; 1307 ren = DEFAULT_RSTYLE;
… …
1248 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1315 ERASE_ROWS (row, num);
1250 gcvalue.foreground = PixColors[Color_fg]; 1316 gcvalue.foreground = PixColors[Color_fg];
1251 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1252 } 1318 }
1319
1253 for (; num--; row++) 1320 for (; num--; row++)
1254 { 1321 {
1255 scr_blank_screen_mem (screen.text, screen.rend, 1322 scr_blank_screen_mem (screen.text, screen.rend,
1256 (unsigned int) (row + row_offset), rstyle); 1323 (unsigned int) (row + row_offset), rstyle);
1257 screen.tlen[row + row_offset] = 0; 1324 screen.tlen[row + row_offset] = 0;
… …
1291 * Insert/Delete <count> lines 1358 * Insert/Delete <count> lines
1292 */ 1359 */
1293void 1360void
1294rxvt_term::scr_insdel_lines (int count, int insdel) 1361rxvt_term::scr_insdel_lines (int count, int insdel)
1295{ 1362{
1296 int end; 1363 int end;
1297 1364
1298 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1299 1366
1300 selection_check (1); 1367 selection_check (1);
1301 1368
… …
1320 * Insert/Delete <count> characters from the current position 1387 * Insert/Delete <count> characters from the current position
1321 */ 1388 */
1322void 1389void
1323rxvt_term::scr_insdel_chars (int count, int insdel) 1390rxvt_term::scr_insdel_chars (int count, int insdel)
1324{ 1391{
1325 int col, row; 1392 int col, row;
1326 rend_t tr; 1393 rend_t tr;
1327 text_t *stp; 1394 text_t *stp;
1328 rend_t *srp; 1395 rend_t *srp;
1329 int16_t *slp; 1396 int16_t *slp;
1330 1397
1331 want_refresh = 1; 1398 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1399 ZERO_SCROLLBACK ();
1333 1400
1334 if (count <= 0) 1401 if (count <= 0)
… …
1341 screen.flags &= ~Screen_WrapNext; 1408 screen.flags &= ~Screen_WrapNext;
1342 1409
1343 stp = screen.text[row]; 1410 stp = screen.text[row];
1344 srp = screen.rend[row]; 1411 srp = screen.rend[row];
1345 slp = & (screen.tlen[row]); 1412 slp = & (screen.tlen[row]);
1413
1346 switch (insdel) 1414 switch (insdel)
1347 { 1415 {
1348 case INSERT: 1416 case INSERT:
1349 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1417 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1350 col--) 1418 col--)
1351 { 1419 {
1352 stp[col] = stp[col - count]; 1420 stp[col] = stp[col - count];
1353 srp[col] = srp[col - count]; 1421 srp[col] = srp[col - count];
1354 } 1422 }
1423
1355 if (*slp != -1) 1424 if (*slp != -1)
1356 { 1425 {
1357 *slp += count; 1426 *slp += count;
1358 MIN_IT (*slp, TermWin.ncol); 1427 MIN_IT (*slp, TermWin.ncol);
1359 } 1428 }
1429
1360 if (selection.op && current_screen == selection.screen 1430 if (selection.op && current_screen == selection.screen
1361 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1431 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1362 { 1432 {
1363 if (selection.end.row != screen.cur.row 1433 if (selection.end.row != screen.cur.row
1364 || (selection.end.col + count >= TermWin.ncol)) 1434 || (selection.end.col + count >= TermWin.ncol))
… …
1368 selection.beg.col += count; 1438 selection.beg.col += count;
1369 selection.mark.col += count; /* XXX: yes? */ 1439 selection.mark.col += count; /* XXX: yes? */
1370 selection.end.col += count; 1440 selection.end.col += count;
1371 } 1441 }
1372 } 1442 }
1443
1373 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1444 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1374 (unsigned int)count, rstyle); 1445 (unsigned int)count, rstyle);
1375 break; 1446 break;
1447
1376 case ERASE: 1448 case ERASE:
1377 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1449 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1378 selection_check (1); 1450 selection_check (1);
1379 screen.cur.col -= count; 1451 screen.cur.col -= count;
1380 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1452 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1381 (unsigned int)count, rstyle); 1453 (unsigned int)count, rstyle);
1382 break; 1454 break;
1455
1383 case DELETE: 1456 case DELETE:
1384 tr = srp[TermWin.ncol - 1]
1385 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1457 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1458
1386 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1459 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1387 { 1460 {
1388 stp[col] = stp[col + count]; 1461 stp[col] = stp[col + count];
1389 srp[col] = srp[col + count]; 1462 srp[col] = srp[col + count];
1390 } 1463 }
1464
1391 scr_blank_line (& (stp[TermWin.ncol - count]), 1465 scr_blank_line (& (stp[TermWin.ncol - count]),
1392 & (srp[TermWin.ncol - count]), 1466 & (srp[TermWin.ncol - count]),
1393 (unsigned int)count, tr); 1467 (unsigned int)count, tr);
1468
1394 if (*slp == -1) /* break line continuation */ 1469 if (*slp == -1) /* break line continuation */
1395 *slp = TermWin.ncol; 1470 *slp = TermWin.ncol;
1471
1396 *slp -= count; 1472 *slp -= count;
1397 MAX_IT (*slp, 0); 1473 MAX_IT (*slp, 0);
1474
1398 if (selection.op && current_screen == selection.screen 1475 if (selection.op && current_screen == selection.screen
1399 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1476 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1400 { 1477 {
1401 if (selection.end.row != screen.cur.row 1478 if (selection.end.row != screen.cur.row
1402 || (screen.cur.col >= selection.beg.col - count) 1479 || (screen.cur.col >= selection.beg.col - count)
… …
1408 selection.beg.col -= count; 1485 selection.beg.col -= count;
1409 selection.mark.col -= count; /* XXX: yes? */ 1486 selection.mark.col -= count; /* XXX: yes? */
1410 selection.end.col -= count; 1487 selection.end.col -= count;
1411 } 1488 }
1412 } 1489 }
1490
1413 break; 1491 break;
1414 } 1492 }
1415} 1493}
1416 1494
1417/* ------------------------------------------------------------------------- */ 1495/* ------------------------------------------------------------------------- */
… …
1422void 1500void
1423rxvt_term::scr_scroll_region (int top, int bot) 1501rxvt_term::scr_scroll_region (int top, int bot)
1424{ 1502{
1425 MAX_IT (top, 0); 1503 MAX_IT (top, 0);
1426 MIN_IT (bot, (int)TermWin.nrow - 1); 1504 MIN_IT (bot, (int)TermWin.nrow - 1);
1505
1427 if (top > bot) 1506 if (top > bot)
1428 return; 1507 return;
1508
1429 screen.tscroll = top; 1509 screen.tscroll = top;
1430 screen.bscroll = bot; 1510 screen.bscroll = bot;
1431 scr_gotorc (0, 0, 0); 1511 scr_gotorc (0, 0, 0);
1432} 1512}
1433 1513
… …
1439 */ 1519 */
1440void 1520void
1441rxvt_term::scr_cursor_visible (int mode) 1521rxvt_term::scr_cursor_visible (int mode)
1442{ 1522{
1443 want_refresh = 1; 1523 want_refresh = 1;
1524
1444 if (mode) 1525 if (mode)
1445 screen.flags |= Screen_VisibleCursor; 1526 screen.flags |= Screen_VisibleCursor;
1446 else 1527 else
1447 screen.flags &= ~Screen_VisibleCursor; 1528 screen.flags &= ~Screen_VisibleCursor;
1448} 1529}
… …
1764 if (TermWin.view_start != oldviewstart) 1845 if (TermWin.view_start != oldviewstart)
1765 { 1846 {
1766 want_refresh = 1; 1847 want_refresh = 1;
1767 num_scr -= (TermWin.view_start - oldviewstart); 1848 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1849 }
1850
1769 return (int) (TermWin.view_start - oldviewstart); 1851 return (int) (TermWin.view_start - oldviewstart);
1770} 1852}
1771 1853
1772/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1773void 1855void
… …
1891 1973
1892 /* 1974 /*
1893 * C: set the cursor character (s) 1975 * C: set the cursor character (s)
1894 */ 1976 */
1895 { 1977 {
1896 unsigned char setoldcursor; 1978 unsigned char setoldcursor;
1897 rend_t ccol1, /* Cursor colour */ 1979 rend_t ccol1, /* Cursor colour */
1898 ccol2; /* Cursor colour2 */ 1980 ccol2; /* Cursor colour2 */
1899 1981
1900 showcursor = (screen.flags & Screen_VisibleCursor); 1982 showcursor = (screen.flags & Screen_VisibleCursor);
1901#ifdef CURSOR_BLINK 1983#ifdef CURSOR_BLINK
1902 if (hidden_cursor) 1984 if (hidden_cursor)
1903 showcursor = 0; 1985 showcursor = 0;
1904#endif 1986#endif
1905 1987
1906 if (showcursor) 1988 if (showcursor)
1907 { 1989 {
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1990 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1909 [screen.cur.col]);
1910 1991
1911 if (showcursor && TermWin.focus) 1992 if (showcursor && TermWin.focus)
1912 { 1993 {
1913 *srp ^= RS_RVid; 1994 *srp ^= RS_RVid;
1914#ifndef NO_CURSORCOLOR 1995#ifndef NO_CURSORCOLOR
… …
1942 if (screen.cur.row + TermWin.view_start != ocrow 2023 if (screen.cur.row + TermWin.view_start != ocrow
1943 || screen.cur.col != oldcursor.col) 2024 || screen.cur.col != oldcursor.col)
1944 { 2025 {
1945 if (ocrow < TermWin.nrow 2026 if (ocrow < TermWin.nrow
1946 && oldcursor.col < TermWin.ncol) 2027 && oldcursor.col < TermWin.ncol)
1947 {
1948 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2028 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1949 } 2029
1950 if (TermWin.focus || !showcursor) 2030 if (TermWin.focus || !showcursor)
1951 oldcursor.row = -1; 2031 oldcursor.row = -1;
1952 else 2032 else
1953 setoldcursor = 1; 2033 setoldcursor = 1;
1954 } 2034 }
1955 } 2035 }
1956 else if (!TermWin.focus) 2036 else if (!TermWin.focus)
1957 setoldcursor = 1; 2037 setoldcursor = 1;
2038
1958 if (setoldcursor) 2039 if (setoldcursor)
1959 { 2040 {
1960 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2041 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1961 oldcursor.row = -1; 2042 oldcursor.row = -1;
1962 else 2043 else
… …
1974 */ 2055 */
1975 i = num_scr; 2056 i = num_scr;
1976 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2057 if (refresh_type == FAST_REFRESH && num_scr_allow && i
1977 && abs (i) < TermWin.nrow && !must_clear) 2058 && abs (i) < TermWin.nrow && !must_clear)
1978 { 2059 {
1979 int16_t nits; 2060 int16_t nits;
1980 int j; 2061 int j;
1981 rend_t *drp2; 2062 rend_t *drp2;
1982 text_t *dtp2; 2063 text_t *dtp2;
1983 int len, wlen; 2064 int len, wlen;
1984 2065
1985 j = TermWin.nrow; 2066 j = TermWin.nrow;
1986 wlen = len = -1; 2067 wlen = len = -1;
1987 row = i > 0 ? 0 : j - 1; 2068 row = i > 0 ? 0 : j - 1;
1988 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2069 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2052 int ypixel = (int)Row2Pixel (row); 2133 int ypixel = (int)Row2Pixel (row);
2053 2134
2054 for (col = 0; col < TermWin.ncol; col++) 2135 for (col = 0; col < TermWin.ncol; col++)
2055 { 2136 {
2056 /* 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
2057 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2150 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2058
2059 if (stp[col] == dtp[col] /* Must match characters to skip. */
2060 && (rend == drp[col] /* Either rendition the same or */
2061 || (stp[col] == ' ' /* space w/ no background change */
2062 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2063 continue;
2064
2065 text_t *text = stp + col; 2151 text_t *text = stp + col;
2066 int count = 1; 2152 int count = 1;
2067 2153
2068 /* redraw one or more characters */
2069
2070 dtp[col] = stp[col]; 2154 dtp[col] = stp[col];
2071 drp[col] = rend; 2155 drp[col] = rend;
2072
2073 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2074 continue;
2075 2156
2076 int xpixel = Col2Pixel (col); 2157 int xpixel = Col2Pixel (col);
2077 2158
2078 // this loop looks very messy, it can probably be optimized 2159 // this loop looks very messy, it can probably be optimized
2079 // and cleaned a bit by you? 2160 // and cleaned a bit by you?
… …
2132 else 2213 else
2133 rvid = !rvid; 2214 rvid = !rvid;
2134 } 2215 }
2135 2216
2136 if (rend & RS_Uline) 2217 if (rend & RS_Uline)
2137 {
2138 if (ISSET_PIXCOLOR (Color_UL)) 2218 if (ISSET_PIXCOLOR (Color_UL))
2139 fore = Color_UL; 2219 fore = Color_UL;
2140 }
2141#endif 2220#endif
2142 2221
2143 if (rvid) 2222 if (rvid)
2144 { 2223 {
2145 SWAP_IT (fore, back, int); 2224 SWAP_IT (fore, back, int);
… …
2153 back = Color_RV; 2232 back = Color_RV;
2154#endif 2233#endif
2155 } 2234 }
2156 2235
2157#ifdef TEXT_BLINK 2236#ifdef TEXT_BLINK
2158 if (rend & RS_Blink) 2237 if (rend & RS_Blink && back == Color_bg)
2159 { 2238 {
2160 if (!text_blink_ev.active) 2239 if (!text_blink_ev.active)
2161 { 2240 {
2162 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2241 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2163 hidden_text = 0; 2242 hidden_text = 0;
… …
2195 else 2274 else
2196 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2197 2276
2198 if ((rend & RS_Uline) && (font->descent > 1)) 2277 if ((rend & RS_Uline) && (font->descent > 1))
2199 XDrawLine (display->display, drawBuffer, TermWin.gc, 2278 XDrawLine (display->display, drawBuffer, TermWin.gc,
2200 xpixel, ypixel + font->ascent + 1, 2279 xpixel, ypixel + font->ascent + 1,
2201 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2280 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2202 } /* for (col....) */ 2281 } /* for (col....) */
2203 } /* for (row....) */ 2282 } /* for (row....) */
2204 2283
2205 /* 2284 /*
2206 * G: cleanup cursor and display outline cursor if necessary 2285 * G: cleanup cursor and display outline cursor if necessary
… …
2226 while (oldcursor.col + cursorwidth < TermWin.ncol 2305 while (oldcursor.col + cursorwidth < TermWin.ncol
2227 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2306 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2228 cursorwidth++; 2307 cursorwidth++;
2229 2308
2230 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2309 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2231 Col2Pixel (oldcursor.col), 2310 Col2Pixel (oldcursor.col),
2232 Row2Pixel (oldcursor.row), 2311 Row2Pixel (oldcursor.row),
2233 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2312 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2234 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2313 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2235 } 2314 }
2236 } 2315 }
2237 2316
2238 /* 2317 /*
2239 * H: cleanup selection 2318 * H: cleanup selection
… …
2247 /* 2326 /*
2248 * clear the whole screen height, note that width == 0 is treated 2327 * clear the whole screen height, note that width == 0 is treated
2249 * specially by XClearArea 2328 * specially by XClearArea
2250 */ 2329 */
2251 XClearArea (display->display, TermWin.vt, 0, 0, 2330 XClearArea (display->display, TermWin.vt, 0, 0,
2252 (unsigned int)TermWin.int_bwidth, 2331 (unsigned int)TermWin.int_bwidth,
2253 (unsigned int)TermWin_TotalHeight (), False); 2332 (unsigned int)TermWin_TotalHeight (), False);
2333
2254 if (clearlast && TermWin.int_bwidth) 2334 if (clearlast && TermWin.int_bwidth)
2255 /* 2335 /*
2256 * clear the whole screen height, note that width == 0 is treated 2336 * clear the whole screen height, note that width == 0 is treated
2257 * specially by XClearArea 2337 * specially by XClearArea
2258 */ 2338 */
2259 XClearArea (display->display, TermWin.vt, 2339 XClearArea (display->display, TermWin.vt,
2260 TermWin.width + TermWin.int_bwidth, 0, 2340 TermWin.width + TermWin.int_bwidth, 0,
2261 (unsigned int)TermWin.int_bwidth, 2341 (unsigned int)TermWin.int_bwidth,
2262 (unsigned int)TermWin_TotalHeight (), False); 2342 (unsigned int)TermWin_TotalHeight (), False);
2343
2263 if (refresh_type & SMOOTH_REFRESH) 2344 if (refresh_type & SMOOTH_REFRESH)
2264 XSync (display->display, False); 2345 XSync (display->display, False);
2265 2346
2266 num_scr = 0; 2347 num_scr = 0;
2267 num_scr_allow = 1; 2348 num_scr_allow = 1;
… …
2291 } 2372 }
2292} 2373}
2293 2374
2294/* ------------------------------------------------------------------------- */ 2375/* ------------------------------------------------------------------------- */
2295void 2376void
2296rxvt_term::scr_clear () 2377rxvt_term::scr_clear (bool really)
2297{ 2378{
2298 if (!TermWin.mapped) 2379 if (!TermWin.mapped)
2299 return; 2380 return;
2300 2381
2301 num_scr_allow = 0; 2382 num_scr_allow = 0;
2302 want_refresh = 1; 2383 want_refresh = 1;
2384
2303#ifdef TRANSPARENT 2385#ifdef TRANSPARENT
2304 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2386 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2305 { 2387 {
2306 int i; 2388 int i;
2307 2389
… …
2314 if (TermWin.parent[i] != None) 2396 if (TermWin.parent[i] != None)
2315 XClearWindow (display->display, TermWin.parent[i]); 2397 XClearWindow (display->display, TermWin.parent[i]);
2316 } 2398 }
2317#endif 2399#endif
2318 2400
2401 if (really)
2319 XClearWindow (display->display, TermWin.vt); 2402 XClearWindow (display->display, TermWin.vt);
2320} 2403}
2321 2404
2322/* ------------------------------------------------------------------------- */ 2405/* ------------------------------------------------------------------------- */
2323void 2406void
2324rxvt_term::scr_reverse_selection () 2407rxvt_term::scr_reverse_selection ()
2325{ 2408{
2326 int i, col, row, end_row;
2327 rend_t *srp;
2328
2329 if (selection.op && current_screen == selection.screen) 2409 if (selection.op && current_screen == selection.screen)
2330 { 2410 {
2331 end_row = TermWin.saveLines - TermWin.view_start; 2411 int end_row = TermWin.saveLines - TermWin.view_start;
2332 i = selection.beg.row + TermWin.saveLines; 2412 int i = selection.beg.row + TermWin.saveLines;
2333 row = selection.end.row + TermWin.saveLines; 2413 int col, row = selection.end.row + TermWin.saveLines;
2414 rend_t *srp;
2415
2334 if (i >= end_row) 2416 if (i >= end_row)
2335 col = selection.beg.col; 2417 col = selection.beg.col;
2336 else 2418 else
2337 { 2419 {
2338 col = 0; 2420 col = 0;
2339 i = end_row; 2421 i = end_row;
2340 } 2422 }
2423
2341 end_row += TermWin.nrow; 2424 end_row += TermWin.nrow;
2342 for (; i < row && i < end_row; i++, col = 0) 2425 for (; i < row && i < end_row; i++, col = 0)
2343 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2426 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2344 srp[col] ^= RS_RVid; 2427 srp[col] ^= RS_RVid;
2428
2345 if (i == row && i < end_row) 2429 if (i == row && i < end_row)
2346 for (srp = screen.rend[i]; col < selection.end.col; col++) 2430 for (srp = screen.rend[i]; col < selection.end.col; col++)
2347 srp[col] ^= RS_RVid; 2431 srp[col] ^= RS_RVid;
2348 } 2432 }
2349} 2433}
… …
2437 { 2521 {
2438 n = min (len - i, PROP_SIZE); 2522 n = min (len - i, PROP_SIZE);
2439 MEMCPY (ds, data + i, n); 2523 MEMCPY (ds, data + i, n);
2440 2524
2441 for (j = 0; j < n; j++) 2525 for (j = 0; j < n; j++)
2442 if (ds[j] == '\n') 2526 if (ds[j] == C0_LF)
2443 ds[j] = '\r'; 2527 ds[j] = C0_CR;
2444 2528
2445 tt_write (ds, (int)n); 2529 tt_write (ds, (int)n);
2446 } 2530 }
2447 2531
2448 free (ds); 2532 free (ds);
… …
2488 } 2572 }
2489 2573
2490 for (;;) 2574 for (;;)
2491 { 2575 {
2492 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2576 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2493 (long) (PROP_SIZE / 4), delete_prop, 2577 (long) (PROP_SIZE / 4), delete_prop,
2494 AnyPropertyType, &ct.encoding, &ct.format, 2578 AnyPropertyType, &ct.encoding, &ct.format,
2495 &ct.nitems, &bytes_after, 2579 &ct.nitems, &bytes_after,
2496 &ct.value) != Success) 2580 &ct.value) != Success)
2497 break; 2581 break;
2498 2582
2499 if (ct.encoding == 0) 2583 if (ct.encoding == 0)
2500 { 2584 {
2501 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2585 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2509 } 2593 }
2510 2594
2511 if (ct.nitems == 0) 2595 if (ct.nitems == 0)
2512 { 2596 {
2513 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2597 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2598
2514 if (selection_wait == Sel_normal && nread == 0) 2599 if (selection_wait == Sel_normal && nread == 0
2600 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2515 { 2601 {
2516 /* 2602 /*
2517 * pass through again trying CUT_BUFFER0 if we've come from 2603 * pass through again trying CUT_BUFFER0 if we've come from
2518 * XConvertSelection () but nothing was presented 2604 * XConvertSelection () but nothing was presented
2519 */ 2605 */
… …
2559void 2645void
2560rxvt_term::incr_cb (time_watcher &w) 2646rxvt_term::incr_cb (time_watcher &w)
2561{ 2647{
2562 selection_wait = Sel_none; 2648 selection_wait = Sel_none;
2563 2649
2564 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2650 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2565} 2651}
2566 2652
2567/* 2653/*
2568 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2654 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2569 */ 2655 */
… …
2572{ 2658{
2573 int reget_time = 0; 2659 int reget_time = 0;
2574 2660
2575 if (prop == None) 2661 if (prop == None)
2576 return; 2662 return;
2663
2577 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));
2578 if (selection_wait == Sel_normal) 2665 if (selection_wait == Sel_normal)
2579 { 2666 {
2580 int a, afmt; 2667 int a, afmt;
2581 Atom atype; 2668 Atom atype;
2582 unsigned long bytes_after, nitems; 2669 unsigned long bytes_after, nitems;
2583 unsigned char *s = NULL; 2670 unsigned char *s = NULL;
2584 2671
2585 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2672 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2586 xa[XA_INCR], &atype, &afmt, &nitems, 2673 xa[XA_INCR], &atype, &afmt, &nitems,
2587 &bytes_after, &s); 2674 &bytes_after, &s);
2588 if (s) 2675 if (s)
2589 XFree (s); 2676 XFree (s);
2590 if (a != Success) 2677 if (a != Success)
2591 return; 2678 return;
2679
2592#ifndef __CYGWIN32__ 2680#ifndef __CYGWIN32__
2593 if (atype == xa[XA_INCR]) 2681 if (atype == xa[XA_INCR])
2594 { /* start an INCR transfer */ 2682 { /* start an INCR transfer */
2595 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2683 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2596 XDeleteProperty (display->display, win, prop); 2684 XDeleteProperty (display->display, win, prop);
… …
2602 2690
2603 } 2691 }
2604 else if (selection_wait == Sel_incr) 2692 else if (selection_wait == Sel_incr)
2605 { 2693 {
2606 reget_time = 1; 2694 reget_time = 1;
2695
2607 if (selection_paste (win, prop, True) == -1) 2696 if (selection_paste (win, prop, True) == -1)
2608 { 2697 {
2609 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2698 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2610 selection_wait = Sel_none; 2699 selection_wait = Sel_none;
2611 incr_ev.stop (); 2700 incr_ev.stop ();
2612 } 2701 }
2613 } 2702 }
2614 if (reget_time) /* received more data so reget time */ 2703 if (reget_time) /* received more data so reget time */
2615 incr_ev.start (NOW + 10); 2704 incr_ev.start (NOW + 10);
2616} 2705}
2706
2617/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2618/* 2708/*
2619 * Request the current selection: 2709 * Request the current selection:
2620 * Order: > internal selection if available 2710 * Order: > internal selection if available
2621 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2711 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2626 */ 2716 */
2627void 2717void
2628rxvt_term::selection_request (Time tm, int x, int y) 2718rxvt_term::selection_request (Time tm, int x, int y)
2629{ 2719{
2630 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
2631 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2722 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2632 return; /* outside window */ 2723 return; /* outside window */
2633 2724
2634 if (selection.text != NULL) 2725 if (selection.text)
2635 { /* internal selection */ 2726 { /* internal selection */
2636 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2727 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2637 paste (selection.text, selection.len); 2728 char *str = rxvt_wcstombs (selection.text, selection.len);
2729 paste ((unsigned char *)str, strlen (str));
2730 free (str);
2638 return; 2731 return;
2639 } 2732 }
2640 else 2733 else
2641 { 2734 {
2642 int i; 2735 int i;
2643 2736
2644 selection_request_time = tm; 2737 selection_request_time = tm;
2645 selection_wait = Sel_normal; 2738 selection_wait = Sel_normal;
2739
2646 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2740 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2647 { 2741 {
2648#if X_HAVE_UTF8_STRING 2742#if X_HAVE_UTF8_STRING
2649 selection_type = Sel_UTF8String; 2743 selection_type = Sel_UTF8String;
2650 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2744 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2655 return; 2749 return;
2656#endif 2750#endif
2657 2751
2658 } 2752 }
2659 } 2753 }
2754
2660 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2755 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2661 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2756 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2662 selection_paste (display->root, XA_CUT_BUFFER0, False); 2757 selection_paste (display->root, XA_CUT_BUFFER0, False);
2663} 2758}
2664 2759
2665int 2760int
2666rxvt_term::selection_request_other (Atom target, int selnum) 2761rxvt_term::selection_request_other (Atom target, int selnum)
2667{ 2762{
2668 Atom sel; 2763 Atom sel;
2669#ifdef DEBUG_SELECT 2764#ifdef DEBUG_SELECT
2670 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2765 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2671#endif 2766#endif
2672 2767
2673 selection_type |= selnum; 2768 selection_type |= selnum;
2769
2674 if (selnum == Sel_Primary) 2770 if (selnum == Sel_Primary)
2675 sel = XA_PRIMARY; 2771 sel = XA_PRIMARY;
2676 else if (selnum == Sel_Secondary) 2772 else if (selnum == Sel_Secondary)
2677 sel = XA_SECONDARY; 2773 sel = XA_SECONDARY;
2678 else 2774 else
2679 sel = xa[XA_CLIPBOARD]; 2775 sel = xa[XA_CLIPBOARD];
2776
2680 if (XGetSelectionOwner (display->display, sel) != None) 2777 if (XGetSelectionOwner (display->display, sel) != None)
2681 { 2778 {
2682 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]));
2683 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2780 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2684 TermWin.vt, selection_request_time); 2781 TermWin.vt, selection_request_time);
2685 return 1; 2782 return 1;
2686 } 2783 }
2784
2687 return 0; 2785 return 0;
2688} 2786}
2689 2787
2690/* ------------------------------------------------------------------------- */ 2788/* ------------------------------------------------------------------------- */
2691/* 2789/*
… …
2700 want_refresh = 1; 2798 want_refresh = 1;
2701 free (selection.text); 2799 free (selection.text);
2702 selection.text = NULL; 2800 selection.text = NULL;
2703 selection.len = 0; 2801 selection.len = 0;
2704 CLEAR_SELECTION (); 2802 CLEAR_SELECTION ();
2803
2804 if (display->selection_owner == this)
2805 display->selection_owner = 0;
2705} 2806}
2706 2807
2707/* ------------------------------------------------------------------------- */ 2808/* ------------------------------------------------------------------------- */
2708/* 2809/*
2709 * Copy a selection into the cut buffer 2810 * Copy a selection into the cut buffer
2710 * EXT: button 1 or 3 release 2811 * EXT: button 1 or 3 release
2711 */ 2812 */
2712void 2813void
2713rxvt_term::selection_make (Time tm) 2814rxvt_term::selection_make (Time tm)
2714{ 2815{
2715 int i, col, end_col, row, end_row; 2816 int i, col, end_col, row, end_row;
2716 unsigned char *new_selection_text; 2817 wchar_t *new_selection_text;
2717 char *str;
2718 text_t *t; 2818 text_t *t;
2719#ifdef ACS_ASCII
2720 rend_t *re;
2721#endif
2722 2819
2723 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));
2724 switch (selection.op) 2821 switch (selection.op)
2725 { 2822 {
2726 case SELECTION_CONT: 2823 case SELECTION_CONT:
… …
2732 selection.op = SELECTION_DONE; 2829 selection.op = SELECTION_DONE;
2733 /* FALLTHROUGH */ 2830 /* FALLTHROUGH */
2734 default: 2831 default:
2735 return; 2832 return;
2736 } 2833 }
2834
2737 selection.op = SELECTION_DONE; 2835 selection.op = SELECTION_DONE;
2738 2836
2739 if (selection.clicks == 4) 2837 if (selection.clicks == 4)
2740 return; /* nothing selected, go away */ 2838 return; /* nothing selected, go away */
2741 2839
2742 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2840 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2743 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2841 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2744
2745 new_selection_text = (unsigned char *)str;
2746 2842
2747 col = selection.beg.col; 2843 col = selection.beg.col;
2748 MAX_IT (col, 0); 2844 MAX_IT (col, 0);
2749 row = selection.beg.row + TermWin.saveLines; 2845 row = selection.beg.row + TermWin.saveLines;
2750 end_row = selection.end.row + TermWin.saveLines; 2846 end_row = selection.end.row + TermWin.saveLines;
2847 int ofs = 0;
2848 int extra = 0;
2751 2849
2752 for (; row <= end_row; row++, col = 0) 2850 for (; row <= end_row; row++, col = 0)
2753 { 2851 {
2754 t = & (screen.text[row][col]); 2852 t = &(screen.text[row][col]);
2755 2853
2756 end_col = screen.tlen[row]; 2854 end_col = screen.tlen[row];
2757 2855
2758 if (end_col == -1) 2856 if (end_col == -1)
2759 end_col = TermWin.ncol; 2857 end_col = TermWin.ncol;
2760 2858
2761 if (row == end_row) 2859 if (row == end_row)
2762 MIN_IT (end_col, selection.end.col); 2860 MIN_IT (end_col, selection.end.col);
2763 2861
2764 for (; col < end_col; col++) 2862 for (; col < end_col; col++)
2863 {
2765 if (*t == NOCHAR) 2864 if (*t == NOCHAR)
2766 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
2767 else 2883 else
2768 { 2884 new_selection_text[ofs++] = *t++;
2769 int len = wctomb (str, *t++);
2770 if (len > 0)
2771 str += len;
2772 } 2885 }
2773 2886
2774 if (screen.tlen[row] != -1 && row != end_row) 2887 if (screen.tlen[row] != -1 && row != end_row)
2775 *str++ = '\n'; 2888 new_selection_text[ofs++] = C0_LF;
2776 } 2889 }
2777 2890
2778#ifndef NO_OLD_SELECTION
2779 if (selection_style == OLD_SELECT)
2780 if (end_col == TermWin.ncol)
2781 *str++ = '\n';
2782#endif
2783#ifndef NO_NEW_SELECTION
2784 if (selection_style != OLD_SELECT)
2785 if (end_col != selection.end.col) 2891 if (end_col != selection.end.col)
2786 *str++ = '\n'; 2892 new_selection_text[ofs++] = C0_LF;
2787#endif
2788 *str = '\0';
2789 2893
2790 i = str - (char *)new_selection_text; 2894 new_selection_text[ofs] = 0;
2895
2791 if (i == 0) 2896 if (ofs == 0)
2792 { 2897 {
2793 free (new_selection_text); 2898 free (new_selection_text);
2794 return; 2899 return;
2795 } 2900 }
2796 2901
2797 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2798 if (str - (char *)new_selection_text > 1024)
2799 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2800
2801 selection.len = i;
2802
2803 if (selection.text)
2804 free (selection.text); 2902 free (selection.text);
2805 2903
2806 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));
2807 2907
2808 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2908 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2809 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2909 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2810 display->set_selection_owner (this); 2910 display->set_selection_owner (this);
2811 else 2911 else
2812 rxvt_print_error ("can't get primary selection"); 2912 rxvt_warn ("can't get primary selection, ignoring.\n");
2813 2913
2814 { 2914#if 0
2815 XTextProperty ct; 2915 XTextProperty ct;
2816 char *cl = (char *)selection.text;
2817 2916
2818 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2917 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2819 { 2918 {
2820 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2821 PropModeReplace, ct.value, ct.nitems);
2822 XFree (ct.value);
2823 }
2824 else
2825 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2919 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2826 PropModeReplace, selection.text, (int)selection.len); 2920 PropModeReplace, ct.value, ct.nitems);
2921 XFree (ct.value);
2827 } 2922 }
2923#endif
2828 2924
2829 selection_time = tm; 2925 selection_time = tm;
2830 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2926 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2831} 2927}
2832 2928
… …
2861rxvt_term::selection_start_colrow (int col, int row) 2957rxvt_term::selection_start_colrow (int col, int row)
2862{ 2958{
2863 want_refresh = 1; 2959 want_refresh = 1;
2864 selection.mark.col = col; 2960 selection.mark.col = col;
2865 selection.mark.row = row - TermWin.view_start; 2961 selection.mark.row = row - TermWin.view_start;
2962
2866 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2963 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2867 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2964 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2868 MAX_IT (selection.mark.col, 0); 2965 MAX_IT (selection.mark.col, 0);
2869 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2966 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2870 2967
2968 while (selection.mark.col > 0
2969 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2970 --selection.mark.col;
2971
2871 if (selection.op) 2972 if (selection.op)
2872 { /* clear the old selection */ 2973 { /* clear the old selection */
2873 selection.beg.row = selection.end.row = selection.mark.row; 2974 selection.beg.row = selection.end.row = selection.mark.row;
2874 selection.beg.col = selection.end.col = selection.mark.col; 2975 selection.beg.col = selection.end.col = selection.mark.col;
2875 } 2976 }
2977
2876 selection.op = SELECTION_INIT; 2978 selection.op = SELECTION_INIT;
2877 selection.screen = current_screen; 2979 selection.screen = current_screen;
2878} 2980}
2879 2981
2880/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
… …
2882 * Word select: select text for 2 clicks 2984 * Word select: select text for 2 clicks
2883 * We now only find out the boundary in one direction 2985 * We now only find out the boundary in one direction
2884 */ 2986 */
2885 2987
2886/* 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 */
2887#define DELIMIT_TEXT(x) \ 2989#define DELIMIT_TEXT(x) \
2888 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2990 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2889#define DELIMIT_REND(x) 1 2991#define DELIMIT_REND(x) 1
2890 2992
2891void 2993void
2892rxvt_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)
2893{ 2995{
2894 int col, row, dirnadd, tcol, trow, w1, w2; 2996 int col, row, dirnadd, tcol, trow, w1, w2;
2895 row_col_t bound; 2997 row_col_t bound;
2896 text_t *stp; 2998 text_t *stp;
2897 rend_t *srp; 2999 rend_t *srp;
2898 3000
2899 if (dirn == UP) 3001 if (dirn == UP)
2900 { 3002 {
2901 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3003 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2902 bound.col = 0; 3004 bound.col = 0;
… …
2906 { 3008 {
2907 bound.row = TermWin.saveLines + TermWin.nrow; 3009 bound.row = TermWin.saveLines + TermWin.nrow;
2908 bound.col = TermWin.ncol - 1; 3010 bound.col = TermWin.ncol - 1;
2909 dirnadd = 1; 3011 dirnadd = 1;
2910 } 3012 }
3013
2911 row = mark->row + TermWin.saveLines; 3014 row = mark->row + TermWin.saveLines;
2912 col = mark->col; 3015 col = mark->col;
2913 MAX_IT (col, 0); 3016 MAX_IT (col, 0);
2914 /* find the edge of a word */ 3017 /* find the edge of a word */
2915 stp = & (screen.text[row][col]); 3018 stp = & (screen.text[row][col]);
2916 w1 = DELIMIT_TEXT (*stp); 3019 w1 = DELIMIT_TEXT (*stp);
2917 3020
2918 if (selection_style != NEW_SELECT)
2919 {
2920 if (w1 == 1)
2921 {
2922 stp += dirnadd;
2923 if (DELIMIT_TEXT (*stp) == 1)
2924 goto Old_Word_Selection_You_Die;
2925 col += dirnadd;
2926 }
2927 w1 = 0;
2928 }
2929 srp = (&screen.rend[row][col]); 3021 srp = (&screen.rend[row][col]);
2930 w2 = DELIMIT_REND (*srp); 3022 w2 = DELIMIT_REND (*srp);
2931 3023
2932 for (;;) 3024 for (;;)
2933 { 3025 {
2934 for (; col != bound.col; col += dirnadd) 3026 for (; col != bound.col; col += dirnadd)
2935 { 3027 {
2936 stp += dirnadd; 3028 stp += dirnadd;
3029 srp += dirnadd;
3030
3031 if (*stp == NOCHAR)
3032 continue;
3033
2937 if (DELIMIT_TEXT (*stp) != w1) 3034 if (DELIMIT_TEXT (*stp) != w1)
2938 break; 3035 break;
2939 srp += dirnadd;
2940 if (DELIMIT_REND (*srp) != w2) 3036 if (DELIMIT_REND (*srp) != w2)
2941 break; 3037 break;
2942 } 3038 }
3039
2943 if ((col == bound.col) && (row != bound.row)) 3040 if ((col == bound.col) && (row != bound.row))
2944 { 3041 {
2945 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3042 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2946 { 3043 {
2947 trow = row + dirnadd; 3044 trow = row + dirnadd;
2948 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3045 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3046
2949 if (screen.text[trow] == NULL) 3047 if (screen.text[trow] == NULL)
2950 break; 3048 break;
3049
2951 stp = & (screen.text[trow][tcol]); 3050 stp = & (screen.text[trow][tcol]);
2952 srp = & (screen.rend[trow][tcol]); 3051 srp = & (screen.rend[trow][tcol]);
3052
2953 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3053 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2954 break; 3054 break;
3055
2955 row = trow; 3056 row = trow;
2956 col = tcol; 3057 col = tcol;
2957 continue; 3058 continue;
2958 } 3059 }
2959 } 3060 }
2960 break; 3061 break;
2961 } 3062 }
3063
2962Old_Word_Selection_You_Die: 3064Old_Word_Selection_You_Die:
2963 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));
2964 3066
2965 if (dirn == DN) 3067 if (dirn == DN)
2966 col++; /* put us on one past the end */ 3068 col++; /* put us on one past the end */
… …
2988 MAX_IT (row, 0); 3090 MAX_IT (row, 0);
2989 MIN_IT (row, (int)TermWin.nrow - 1); 3091 MIN_IT (row, (int)TermWin.nrow - 1);
2990 MAX_IT (col, 0); 3092 MAX_IT (col, 0);
2991 MIN_IT (col, (int)TermWin.ncol); 3093 MIN_IT (col, (int)TermWin.ncol);
2992 3094
2993#ifndef NO_NEW_SELECTION
2994 /* 3095 /*
2995 * 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
2996 * 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
2997 * 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
2998 * be _past_ a character for it to be selected. 3099 * be _past_ a character for it to be selected.
2999 */ 3100 */
3000 if (selection_style != OLD_SELECT)
3001 {
3002 if (((selection.clicks % 3) == 1) && !flag 3101 if (((selection.clicks % 3) == 1) && !flag
3003 && (col == selection.mark.col 3102 && (col == selection.mark.col
3004 && (row == selection.mark.row + TermWin.view_start))) 3103 && (row == selection.mark.row + TermWin.view_start)))
3005 { 3104 {
3006 /* select nothing */ 3105 /* select nothing */
3007 selection.beg.row = selection.end.row = 0; 3106 selection.beg.row = selection.end.row = 0;
3008 selection.beg.col = selection.end.col = 0; 3107 selection.beg.col = selection.end.col = 0;
3009 selection.clicks = 4; 3108 selection.clicks = 4;
3010 want_refresh = 1; 3109 want_refresh = 1;
3011 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3110 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3012 return; 3111 return;
3013 }
3014 } 3112 }
3015#endif 3113
3016 if (selection.clicks == 4) 3114 if (selection.clicks == 4)
3017 selection.clicks = 1; 3115 selection.clicks = 1;
3018 3116
3019 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3117 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3020 flag == 1 ? 1 : 0, /* ? button press */ 3118 flag == 1 ? 1 : 0, /* ? button press */
… …
3026 * Extend the selection to the specified col/row 3124 * Extend the selection to the specified col/row
3027 */ 3125 */
3028void 3126void
3029rxvt_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)
3030{ 3128{
3031 int16_t ncol = TermWin.ncol; 3129 int16_t ncol = TermWin.ncol;
3032 int end_col; 3130 int end_col;
3033 row_col_t pos; 3131 row_col_t pos;
3034 enum { 3132 enum {
3035 LEFT, RIGHT 3133 LEFT, RIGHT
3036 } closeto = RIGHT; 3134 } closeto = RIGHT;
3037 3135
3038 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));
… …
3074 pos.col = col; 3172 pos.col = col;
3075 pos.row = row; 3173 pos.row = row;
3076 3174
3077 pos.row -= TermWin.view_start; /* adjust for scroll */ 3175 pos.row -= TermWin.view_start; /* adjust for scroll */
3078 3176
3079#ifndef NO_OLD_SELECTION
3080 /*
3081 * This mimics some of the selection behaviour of version 2.20 and before.
3082 * There are no ``selection modes'', button3 is always character extension.
3083 * Note: button3 drag is always available, c.f. v2.20
3084 * Selection always terminates (left or right as appropriate) at the mark.
3085 */
3086 if (selection_style == OLD_SELECT)
3087 {
3088 if (selection.clicks == 1 || button3)
3089 {
3090 if (hate_those_clicks)
3091 {
3092 hate_those_clicks = 0;
3093 if (selection.clicks == 1)
3094 {
3095 selection.beg.row = selection.mark.row;
3096 selection.beg.col = selection.mark.col;
3097 }
3098 else
3099 {
3100 selection.mark.row = selection.beg.row;
3101 selection.mark.col = selection.beg.col;
3102 }
3103 }
3104 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3105 {
3106 selection.end.row = selection.mark.row;
3107 selection.end.col = selection.mark.col + 1;
3108 selection.beg.row = pos.row;
3109 selection.beg.col = pos.col;
3110 }
3111 else
3112 {
3113 selection.beg.row = selection.mark.row;
3114 selection.beg.col = selection.mark.col;
3115 selection.end.row = pos.row;
3116 selection.end.col = pos.col + 1;
3117 }
3118 }
3119 else if (selection.clicks == 2)
3120 {
3121 selection_delimit_word (UP, & (selection.mark),
3122 & (selection.beg));
3123 selection_delimit_word (DN, & (selection.mark),
3124 & (selection.end));
3125 hate_those_clicks = 1;
3126 }
3127 else if (selection.clicks == 3)
3128 {
3129 selection.beg.row = selection.end.row = selection.mark.row;
3130 selection.beg.col = 0;
3131 selection.end.col = ncol;
3132 hate_those_clicks = 1;
3133 }
3134 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));
3135 return;
3136 }
3137#endif /* ! NO_OLD_SELECTION */
3138#ifndef NO_NEW_SELECTION
3139 /* selection_style must not be OLD_SELECT to get here */
3140 /* 3177 /*
3141 * 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
3142 * in the way button3 drag extension works. 3179 * in the way button3 drag extension works.
3143 * We're either doing: button1 drag; button3 press; or button3 drag 3180 * We're either doing: button1 drag; button3 press; or button3 drag
3144 * 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
… …
3149 * 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
3150 * 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
3151 * time of the most recent button3 press 3188 * time of the most recent button3 press
3152 */ 3189 */
3153 if (button3 && buttonpress) 3190 if (button3 && buttonpress)
3154 { /* button3 press */ 3191 { /* button3 press */
3155 /* 3192 /*
3156 * first determine which edge of the selection we are closest to 3193 * first determine which edge of the selection we are closest to
3157 */ 3194 */
3158 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3195 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3159 || (!ROWCOL_IS_AFTER (pos, selection.end) 3196 || (!ROWCOL_IS_AFTER (pos, selection.end)
3160 && (((pos.col - selection.beg.col) 3197 && (((pos.col - selection.beg.col)
3161 + ((pos.row - selection.beg.row) * ncol)) 3198 + ((pos.row - selection.beg.row) * ncol))
3162 < ((selection.end.col - pos.col) 3199 < ((selection.end.col - pos.col)
3163 + ((selection.end.row - pos.row) * ncol))))) 3200 + ((selection.end.row - pos.row) * ncol)))))
3164 closeto = LEFT; 3201 closeto = LEFT;
3202
3165 if (closeto == LEFT) 3203 if (closeto == LEFT)
3166 { 3204 {
3167 selection.beg.row = pos.row; 3205 selection.beg.row = pos.row;
3168 selection.beg.col = pos.col; 3206 selection.beg.col = pos.col;
3169 selection.mark.row = selection.end.row; 3207 selection.mark.row = selection.end.row;
3170 selection.mark.col = selection.end.col 3208 selection.mark.col = selection.end.col - (selection.clicks == 2);
3171 - (selection.clicks == 2);
3172 } 3209 }
3173 else 3210 else
3174 { 3211 {
3175 selection.end.row = pos.row; 3212 selection.end.row = pos.row;
3176 selection.end.col = pos.col; 3213 selection.end.col = pos.col;
3177 selection.mark.row = selection.beg.row; 3214 selection.mark.row = selection.beg.row;
3178 selection.mark.col = selection.beg.col; 3215 selection.mark.col = selection.beg.col;
3179 } 3216 }
3180 } 3217 }
3181 else 3218 else
3182 { /* button1 drag or button3 drag */ 3219 { /* button1 drag or button3 drag */
3183 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3220 if (ROWCOL_IS_AFTER (selection.mark, pos))
3184 { 3221 {
3185 if ((selection.mark.row == selection.end.row) 3222 if ((selection.mark.row == selection.end.row)
3186 && (selection.mark.col == selection.end.col) 3223 && (selection.mark.col == selection.end.col)
3187 && clickchange && selection.clicks == 2) 3224 && clickchange && selection.clicks == 2)
3188 selection.mark.col--; 3225 selection.mark.col--;
3226
3189 selection.beg.row = pos.row; 3227 selection.beg.row = pos.row;
3190 selection.beg.col = pos.col; 3228 selection.beg.col = pos.col;
3191 selection.end.row = selection.mark.row; 3229 selection.end.row = selection.mark.row;
3192 selection.end.col = selection.mark.col 3230 selection.end.col = selection.mark.col + (selection.clicks == 2);
3193 + (selection.clicks == 2);
3194 } 3231 }
3195 else 3232 else
3196 { 3233 {
3197 selection.beg.row = selection.mark.row; 3234 selection.beg.row = selection.mark.row;
3198 selection.beg.col = selection.mark.col; 3235 selection.beg.col = selection.mark.col;
… …
3202 } 3239 }
3203 3240
3204 if (selection.clicks == 1) 3241 if (selection.clicks == 1)
3205 { 3242 {
3206 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3243 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3244
3207 if (end_col != -1 && selection.beg.col > end_col) 3245 if (end_col != -1 && selection.beg.col > end_col)
3208 { 3246 {
3209#if 1 3247#if 1
3210 selection.beg.col = ncol; 3248 selection.beg.col = ncol;
3211#else 3249#else
3212 if (selection.beg.row != selection.end.row) 3250 if (selection.beg.row != selection.end.row)
3213 selection.beg.col = ncol; 3251 selection.beg.col = ncol;
3214 else 3252 else
3215 selection.beg.col = selection.mark.col; 3253 selection.beg.col = selection.mark.col;
3216#endif 3254#endif
3217
3218 } 3255 }
3256
3219 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3257 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3258
3220 if (end_col != -1 && selection.end.col > end_col) 3259 if (end_col != -1 && selection.end.col > end_col)
3221 selection.end.col = ncol; 3260 selection.end.col = ncol;
3222
3223 } 3261 }
3224 else if (selection.clicks == 2) 3262 else if (selection.clicks == 2)
3225 { 3263 {
3226 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3264 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3227 selection.end.col--; 3265 selection.end.col--;
3266
3228 selection_delimit_word (UP, & (selection.beg), 3267 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3229 & (selection.beg));
3230 selection_delimit_word (DN, & (selection.end), 3268 selection_delimit_word (DN, & (selection.end), & (selection.end));
3231 & (selection.end));
3232 } 3269 }
3233 else if (selection.clicks == 3) 3270 else if (selection.clicks == 3)
3234 { 3271 {
3235#ifndef NO_FRILLS 3272#ifndef NO_FRILLS
3236 if ((Options & Opt_tripleclickwords)) 3273 if ((Options & Opt_tripleclickwords))
3237 { 3274 {
3238 int end_row; 3275 int end_row;
3239 3276
3240 selection_delimit_word (UP, & (selection.beg), 3277 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3241 & (selection.beg));
3242 end_row = screen.tlen[selection.mark.row 3278 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3243 + TermWin.saveLines]; 3279
3244 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3280 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3245 end_row++)
3246 { 3281 {
3247 end_col = screen.tlen[end_row + TermWin.saveLines]; 3282 end_col = screen.tlen[end_row + TermWin.saveLines];
3283
3248 if (end_col != -1) 3284 if (end_col != -1)
3249 { 3285 {
3250 selection.end.row = end_row; 3286 selection.end.row = end_row;
3251 selection.end.col = end_col; 3287 selection.end.col = end_col;
3252 selection_remove_trailing_spaces (); 3288 selection_remove_trailing_spaces ();
… …
3254 } 3290 }
3255 } 3291 }
3256 } 3292 }
3257 else 3293 else
3258#endif 3294#endif
3259
3260 { 3295 {
3261 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3296 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3262 selection.mark.col++; 3297 selection.mark.col++;
3263 selection.beg.col = 0; 3298 selection.beg.col = 0;
3264 selection.end.col = ncol; 3299 selection.end.col = ncol;
3265 } 3300 }
3266 } 3301 }
3302
3267 if (button3 && buttonpress) 3303 if (button3 && buttonpress)
3268 { /* mark may need to be changed */ 3304 { /* mark may need to be changed */
3269 if (closeto == LEFT) 3305 if (closeto == LEFT)
3270 { 3306 {
3271 selection.mark.row = selection.end.row; 3307 selection.mark.row = selection.end.row;
3272 selection.mark.col = selection.end.col 3308 selection.mark.col = selection.end.col
3273 - (selection.clicks == 2); 3309 - (selection.clicks == 2);
… …
3277 selection.mark.row = selection.beg.row; 3313 selection.mark.row = selection.beg.row;
3278 selection.mark.col = selection.beg.col; 3314 selection.mark.col = selection.beg.col;
3279 } 3315 }
3280 } 3316 }
3281 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));
3282#endif /* ! NO_NEW_SELECTION */
3283} 3318}
3284 3319
3285#ifndef NO_FRILLS 3320#ifndef NO_FRILLS
3286void 3321void
3287rxvt_term::selection_remove_trailing_spaces () 3322rxvt_term::selection_remove_trailing_spaces ()
… …
3361 ev.target = rq.target; 3396 ev.target = rq.target;
3362 ev.time = rq.time; 3397 ev.time = rq.time;
3363 3398
3364 if (rq.target == xa[XA_TARGETS]) 3399 if (rq.target == xa[XA_TARGETS])
3365 { 3400 {
3366 Atom32 target_list[5]; 3401 Atom32 target_list[6];
3367 Atom32 *target = target_list; 3402 Atom32 *target = target_list;
3368 3403
3369 *target++ = (Atom32) xa[XA_TARGETS]; 3404 *target++ = (Atom32) xa[XA_TARGETS];
3405 *target++ = (Atom32) xa[XA_TIMESTAMP];
3370 *target++ = (Atom32) XA_STRING; 3406 *target++ = (Atom32) XA_STRING;
3371 *target++ = (Atom32) xa[XA_TEXT]; 3407 *target++ = (Atom32) xa[XA_TEXT];
3372 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3408 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3373#if X_HAVE_UTF8_STRING 3409#if X_HAVE_UTF8_STRING
3374 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3410 *target++ = (Atom32) xa[XA_UTF8_STRING];
3375#endif 3411#endif
3412
3376 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3413 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3377 (8 * sizeof (target_list[0])), PropModeReplace, 3414 (8 * sizeof (target_list[0])), PropModeReplace,
3378 (unsigned char *)target_list, 3415 (unsigned char *)target_list,
3379 target - target_list); 3416 target - target_list);
3380 ev.property = rq.property; 3417 ev.property = rq.property;
3381 } 3418 }
3382 else if (rq.target == xa[XA_MULTIPLE]) 3419 else if (rq.target == xa[XA_MULTIPLE])
3383 { 3420 {
3384 /* TODO: Handle MULTIPLE */ 3421 /* TODO: Handle MULTIPLE */
3385 } 3422 }
3386 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3423 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3387 { 3424 {
3388 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3425 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3389 (8 * sizeof (Time)), PropModeReplace, 3426 (8 * sizeof (Time)), PropModeReplace,
3390 (unsigned char *)&selection_time, 1); 3427 (unsigned char *)&selection_time, 1);
3391 ev.property = rq.property; 3428 ev.property = rq.property;
3392 } 3429 }
3393 else if (rq.target == XA_STRING 3430 else if (rq.target == XA_STRING
3394 || rq.target == xa[XA_TEXT] 3431 || rq.target == xa[XA_TEXT]
3395 || rq.target == xa[XA_COMPOUND_TEXT] 3432 || rq.target == xa[XA_COMPOUND_TEXT]
3396 || rq.target == xa[XA_UTF8_STRING] 3433 || rq.target == xa[XA_UTF8_STRING]
3397 ) 3434 )
3398 { 3435 {
3399 short freect = 0; 3436 short freect = 0;
3400 int selectlen; 3437 int selectlen;
3401 char *cl; 3438 wchar_t *cl;
3402 3439
3403 target = rq.target; 3440 target = rq.target;
3404 3441
3405 if (target == XA_STRING) 3442 if (target == XA_STRING)
3406 // 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
3407 // will ask for another format anyways. 3444 // will ask for another format anyways.
3408 style = XStringStyle; 3445 style = XStringStyle;
3409 else if (target == xa[XA_TEXT]) 3446 else if (target == xa[XA_TEXT])
3410 style = XTextStyle; 3447 style = XStdICCTextStyle;
3411 else if (target == xa[XA_COMPOUND_TEXT]) 3448 else if (target == xa[XA_COMPOUND_TEXT])
3412 style = XCompoundTextStyle; 3449 style = XCompoundTextStyle;
3413#if X_HAVE_UTF8_STRING 3450#if X_HAVE_UTF8_STRING
3414 else if (target == xa[XA_UTF8_STRING]) 3451 else if (target == xa[XA_UTF8_STRING])
3415 style = XUTF8StringStyle; 3452 style = XUTF8StringStyle;
… …
3420 style = XCompoundTextStyle; 3457 style = XCompoundTextStyle;
3421 } 3458 }
3422 3459
3423 if (selection.text) 3460 if (selection.text)
3424 { 3461 {
3425 cl = (char *)selection.text; 3462 cl = selection.text;
3426 selectlen = selection.len; 3463 selectlen = selection.len;
3427 } 3464 }
3428 else 3465 else
3429 { 3466 {
3430 cl = ""; 3467 cl = L"";
3431 selectlen = 0; 3468 selectlen = 0;
3432 } 3469 }
3433 3470
3471 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3472 // manually for XUTF8StringStyle.
3434 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3473 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3435 freect = 1; 3474 freect = 1;
3436 else 3475 else
3437 { 3476 {
3438 /* if we failed to convert then send it raw */ 3477 /* if we failed to convert then send it raw */
3439 ct.value = (unsigned char *)cl; 3478 ct.value = (unsigned char *)cl;
… …
3446 ev.property = rq.property; 3485 ev.property = rq.property;
3447 3486
3448 if (freect) 3487 if (freect)
3449 XFree (ct.value); 3488 XFree (ct.value);
3450 } 3489 }
3490
3451 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3491 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3452} 3492}
3453 3493
3454/* ------------------------------------------------------------------------- * 3494/* ------------------------------------------------------------------------- *
3455 * MOUSE ROUTINES * 3495 * MOUSE ROUTINES *

Diff Legend

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