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.33 by pcg, Sun Feb 22 17:13:21 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 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 876 // vt100 special graphics and line drawing
868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 877 static uint16_t vt100_0[32] = { // 5f .. 7e
869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 878 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
870 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; 879 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
871 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 880 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
872 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 881 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
873 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
874 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
875 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
876 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
878 } 882 };
879 883
880 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 884 if (c >= 0x5f && c <= 0x7e)
881 // rely on wcwidth to tell us the character width, at least for non-ascii 885 {
882 int width = c <= 128 ? 1 : wcwidth (c); 886 c = vt100_0[c - 0x5f];
887 width = 1;
888 }
889 }
883 890
884 // width -1 characters (e.g. combining chars) are ignored currently.
885 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
886 do 900 do
887 { 901 {
888 stp[screen.cur.col] = c; 902 stp[screen.cur.col] = c;
889 srp[screen.cur.col] = rend; 903 srp[screen.cur.col] = rend;
890 904
891 if (screen.cur.col < last_col - 1) 905 if (screen.cur.col < last_col - 1)
892 screen.cur.col++; 906 screen.cur.col++;
893 else 907 else
894 { 908 {
895 screen.tlen[row] = last_col; 909 screen.tlen[row] = last_col;
896 if (screen.flags & Screen_Autowrap) 910 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 911 screen.flags |= Screen_WrapNext;
898 break; 912 break;
899 } 913 }
900 914
901 c = NOCHAR; 915 c = NOCHAR;
902 } 916 }
903 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 }
904 else 948 else
905 (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 }
906 } 964 }
907 965
908 if (screen.tlen[row] != -1) /* XXX: think about this */ 966 if (screen.tlen[row] != -1) /* XXX: think about this */
909 MAX_IT (screen.tlen[row], screen.cur.col); 967 MAX_IT (screen.tlen[row], screen.cur.col);
910 968
… …
930 */ 988 */
931void 989void
932rxvt_term::scr_backspace () 990rxvt_term::scr_backspace ()
933{ 991{
934 want_refresh = 1; 992 want_refresh = 1;
993
935 if (screen.cur.col == 0) 994 if (screen.cur.col == 0)
936 { 995 {
937 if (screen.cur.row > 0) 996 if (screen.cur.row > 0)
938 { 997 {
939#ifdef TERMCAP_HAS_BW 998#ifdef TERMCAP_HAS_BW
… …
944 1003
945 } 1004 }
946 } 1005 }
947 else if ((screen.flags & Screen_WrapNext) == 0) 1006 else if ((screen.flags & Screen_WrapNext) == 0)
948 scr_gotorc (0, -1, RELATIVE); 1007 scr_gotorc (0, -1, RELATIVE);
1008
949 screen.flags &= ~Screen_WrapNext; 1009 screen.flags &= ~Screen_WrapNext;
950} 1010}
951 1011
952/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
953/* 1013/*
… …
956 * XTERM_SEQ: CTRL-I 1016 * XTERM_SEQ: CTRL-I
957 */ 1017 */
958void 1018void
959rxvt_term::scr_tab (int count) 1019rxvt_term::scr_tab (int count)
960{ 1020{
961 int i, x; 1021 int i, x;
962 1022
963 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
964 want_refresh = 1; 1024 want_refresh = 1;
965 i = x = screen.cur.col; 1025 i = x = screen.cur.col;
1026
966 if (count == 0) 1027 if (count == 0)
967 return; 1028 return;
968 else if (count > 0) 1029 else if (count > 0)
969 { 1030 {
970 for (; ++i < TermWin.ncol; ) 1031 for (; ++i < TermWin.ncol; )
… …
972 { 1033 {
973 x = i; 1034 x = i;
974 if (!--count) 1035 if (!--count)
975 break; 1036 break;
976 } 1037 }
1038
977 if (count) 1039 if (count)
978 x = TermWin.ncol - 1; 1040 x = TermWin.ncol - 1;
979 } 1041 }
980 else /* if (count < 0) */ 1042 else /* if (count < 0) */
981 { 1043 {
… …
984 { 1046 {
985 x = i; 1047 x = i;
986 if (!++count) 1048 if (!++count)
987 break; 1049 break;
988 } 1050 }
1051
989 if (count) 1052 if (count)
990 x = 0; 1053 x = 0;
991 } 1054 }
1055
992 if (x != screen.cur.col) 1056 if (x != screen.cur.col)
993 scr_gotorc (0, x, R_RELATIVE); 1057 scr_gotorc (0, x, R_RELATIVE);
994} 1058}
995 1059
996/* ------------------------------------------------------------------------- */ 1060/* ------------------------------------------------------------------------- */
… …
1053 want_refresh = 1; 1117 want_refresh = 1;
1054 ZERO_SCROLLBACK (); 1118 ZERO_SCROLLBACK ();
1055 1119
1056 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));
1057 1121
1058 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1059 : col);
1060 MAX_IT (screen.cur.col, 0); 1123 MAX_IT (screen.cur.col, 0);
1061 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1062 1125
1063 screen.flags &= ~Screen_WrapNext; 1126 screen.flags &= ~Screen_WrapNext;
1064 if (relative & R_RELATIVE) 1127 if (relative & R_RELATIVE)
… …
1090 else 1153 else
1091 screen.cur.row = row; 1154 screen.cur.row = row;
1092 } 1155 }
1093 MAX_IT (screen.cur.row, 0); 1156 MAX_IT (screen.cur.row, 0);
1094 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--;
1095} 1162}
1096 1163
1097/* ------------------------------------------------------------------------- */ 1164/* ------------------------------------------------------------------------- */
1098/* 1165/*
1099 * direction should be UP or DN 1166 * direction should be UP or DN
1100 */ 1167 */
1101void 1168void
1102rxvt_term::scr_index (enum page_dirn direction) 1169rxvt_term::scr_index (enum page_dirn direction)
1103{ 1170{
1104 int dirn; 1171 int dirn;
1105 1172
1106 want_refresh = 1; 1173 want_refresh = 1;
1107 dirn = ((direction == UP) ? 1 : -1); 1174 dirn = ((direction == UP) ? 1 : -1);
1108 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1109 1176
… …
1185 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1252 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1186 */ 1253 */
1187void 1254void
1188rxvt_term::scr_erase_screen (int mode) 1255rxvt_term::scr_erase_screen (int mode)
1189{ 1256{
1190 int num; 1257 int num;
1191 int32_t row, row_offset; 1258 int32_t row, row_offset;
1192 rend_t ren; 1259 rend_t ren;
1193 XGCValues gcvalue; 1260 XGCValues gcvalue;
1194 1261
1195 want_refresh = 1; 1262 want_refresh = 1;
1196 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));
1197 ZERO_SCROLLBACK (); 1264 ZERO_SCROLLBACK ();
1198 row_offset = (int32_t)TermWin.saveLines; 1265 row_offset = (int32_t)TermWin.saveLines;
… …
1217 num = TermWin.nrow; 1284 num = TermWin.nrow;
1218 break; 1285 break;
1219 default: 1286 default:
1220 return; 1287 return;
1221 } 1288 }
1289
1222 refresh_type |= REFRESH_BOUNDS; 1290 refresh_type |= REFRESH_BOUNDS;
1291
1223 if (selection.op && current_screen == selection.screen 1292 if (selection.op && current_screen == selection.screen
1224 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1293 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1225 || (selection.end.row >= row 1294 || (selection.end.row >= row
1226 && selection.end.row <= row + num))) 1295 && selection.end.row <= row + num)))
1227 CLEAR_SELECTION (); 1296 CLEAR_SELECTION ();
1297
1228 if (row >= TermWin.nrow) /* Out Of Bounds */ 1298 if (row >= TermWin.nrow) /* Out Of Bounds */
1229 return; 1299 return;
1300
1230 MIN_IT (num, (TermWin.nrow - row)); 1301 MIN_IT (num, (TermWin.nrow - row));
1302
1231 if (rstyle & (RS_RVid | RS_Uline)) 1303 if (rstyle & (RS_RVid | RS_Uline))
1232 ren = (rend_t) ~RS_None; 1304 ren = (rend_t) ~RS_None;
1233 else if (GET_BASEBG (rstyle) == Color_bg) 1305 else if (GET_BASEBG (rstyle) == Color_bg)
1234 { 1306 {
1235 ren = DEFAULT_RSTYLE; 1307 ren = DEFAULT_RSTYLE;
… …
1242 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1243 ERASE_ROWS (row, num); 1315 ERASE_ROWS (row, num);
1244 gcvalue.foreground = PixColors[Color_fg]; 1316 gcvalue.foreground = PixColors[Color_fg];
1245 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1246 } 1318 }
1319
1247 for (; num--; row++) 1320 for (; num--; row++)
1248 { 1321 {
1249 scr_blank_screen_mem (screen.text, screen.rend, 1322 scr_blank_screen_mem (screen.text, screen.rend,
1250 (unsigned int) (row + row_offset), rstyle); 1323 (unsigned int) (row + row_offset), rstyle);
1251 screen.tlen[row + row_offset] = 0; 1324 screen.tlen[row + row_offset] = 0;
… …
1285 * Insert/Delete <count> lines 1358 * Insert/Delete <count> lines
1286 */ 1359 */
1287void 1360void
1288rxvt_term::scr_insdel_lines (int count, int insdel) 1361rxvt_term::scr_insdel_lines (int count, int insdel)
1289{ 1362{
1290 int end; 1363 int end;
1291 1364
1292 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1293 1366
1294 selection_check (1); 1367 selection_check (1);
1295 1368
… …
1314 * Insert/Delete <count> characters from the current position 1387 * Insert/Delete <count> characters from the current position
1315 */ 1388 */
1316void 1389void
1317rxvt_term::scr_insdel_chars (int count, int insdel) 1390rxvt_term::scr_insdel_chars (int count, int insdel)
1318{ 1391{
1319 int col, row; 1392 int col, row;
1320 rend_t tr; 1393 rend_t tr;
1321 text_t *stp; 1394 text_t *stp;
1322 rend_t *srp; 1395 rend_t *srp;
1323 int16_t *slp; 1396 int16_t *slp;
1324 1397
1325 want_refresh = 1; 1398 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1399 ZERO_SCROLLBACK ();
1327 1400
1328 if (count <= 0) 1401 if (count <= 0)
… …
1335 screen.flags &= ~Screen_WrapNext; 1408 screen.flags &= ~Screen_WrapNext;
1336 1409
1337 stp = screen.text[row]; 1410 stp = screen.text[row];
1338 srp = screen.rend[row]; 1411 srp = screen.rend[row];
1339 slp = & (screen.tlen[row]); 1412 slp = & (screen.tlen[row]);
1413
1340 switch (insdel) 1414 switch (insdel)
1341 { 1415 {
1342 case INSERT: 1416 case INSERT:
1343 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1417 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1344 col--) 1418 col--)
1345 { 1419 {
1346 stp[col] = stp[col - count]; 1420 stp[col] = stp[col - count];
1347 srp[col] = srp[col - count]; 1421 srp[col] = srp[col - count];
1348 } 1422 }
1423
1349 if (*slp != -1) 1424 if (*slp != -1)
1350 { 1425 {
1351 *slp += count; 1426 *slp += count;
1352 MIN_IT (*slp, TermWin.ncol); 1427 MIN_IT (*slp, TermWin.ncol);
1353 } 1428 }
1429
1354 if (selection.op && current_screen == selection.screen 1430 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1431 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1356 { 1432 {
1357 if (selection.end.row != screen.cur.row 1433 if (selection.end.row != screen.cur.row
1358 || (selection.end.col + count >= TermWin.ncol)) 1434 || (selection.end.col + count >= TermWin.ncol))
… …
1362 selection.beg.col += count; 1438 selection.beg.col += count;
1363 selection.mark.col += count; /* XXX: yes? */ 1439 selection.mark.col += count; /* XXX: yes? */
1364 selection.end.col += count; 1440 selection.end.col += count;
1365 } 1441 }
1366 } 1442 }
1443
1367 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1444 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1368 (unsigned int)count, rstyle); 1445 (unsigned int)count, rstyle);
1369 break; 1446 break;
1447
1370 case ERASE: 1448 case ERASE:
1371 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1449 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1372 selection_check (1); 1450 selection_check (1);
1373 screen.cur.col -= count; 1451 screen.cur.col -= count;
1374 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1452 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1375 (unsigned int)count, rstyle); 1453 (unsigned int)count, rstyle);
1376 break; 1454 break;
1455
1377 case DELETE: 1456 case DELETE:
1378 tr = srp[TermWin.ncol - 1]
1379 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1457 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1458
1380 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1459 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1381 { 1460 {
1382 stp[col] = stp[col + count]; 1461 stp[col] = stp[col + count];
1383 srp[col] = srp[col + count]; 1462 srp[col] = srp[col + count];
1384 } 1463 }
1464
1385 scr_blank_line (& (stp[TermWin.ncol - count]), 1465 scr_blank_line (& (stp[TermWin.ncol - count]),
1386 & (srp[TermWin.ncol - count]), 1466 & (srp[TermWin.ncol - count]),
1387 (unsigned int)count, tr); 1467 (unsigned int)count, tr);
1468
1388 if (*slp == -1) /* break line continuation */ 1469 if (*slp == -1) /* break line continuation */
1389 *slp = TermWin.ncol; 1470 *slp = TermWin.ncol;
1471
1390 *slp -= count; 1472 *slp -= count;
1391 MAX_IT (*slp, 0); 1473 MAX_IT (*slp, 0);
1474
1392 if (selection.op && current_screen == selection.screen 1475 if (selection.op && current_screen == selection.screen
1393 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1476 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1394 { 1477 {
1395 if (selection.end.row != screen.cur.row 1478 if (selection.end.row != screen.cur.row
1396 || (screen.cur.col >= selection.beg.col - count) 1479 || (screen.cur.col >= selection.beg.col - count)
… …
1402 selection.beg.col -= count; 1485 selection.beg.col -= count;
1403 selection.mark.col -= count; /* XXX: yes? */ 1486 selection.mark.col -= count; /* XXX: yes? */
1404 selection.end.col -= count; 1487 selection.end.col -= count;
1405 } 1488 }
1406 } 1489 }
1490
1407 break; 1491 break;
1408 } 1492 }
1409} 1493}
1410 1494
1411/* ------------------------------------------------------------------------- */ 1495/* ------------------------------------------------------------------------- */
… …
1416void 1500void
1417rxvt_term::scr_scroll_region (int top, int bot) 1501rxvt_term::scr_scroll_region (int top, int bot)
1418{ 1502{
1419 MAX_IT (top, 0); 1503 MAX_IT (top, 0);
1420 MIN_IT (bot, (int)TermWin.nrow - 1); 1504 MIN_IT (bot, (int)TermWin.nrow - 1);
1505
1421 if (top > bot) 1506 if (top > bot)
1422 return; 1507 return;
1508
1423 screen.tscroll = top; 1509 screen.tscroll = top;
1424 screen.bscroll = bot; 1510 screen.bscroll = bot;
1425 scr_gotorc (0, 0, 0); 1511 scr_gotorc (0, 0, 0);
1426} 1512}
1427 1513
… …
1433 */ 1519 */
1434void 1520void
1435rxvt_term::scr_cursor_visible (int mode) 1521rxvt_term::scr_cursor_visible (int mode)
1436{ 1522{
1437 want_refresh = 1; 1523 want_refresh = 1;
1524
1438 if (mode) 1525 if (mode)
1439 screen.flags |= Screen_VisibleCursor; 1526 screen.flags |= Screen_VisibleCursor;
1440 else 1527 else
1441 screen.flags &= ~Screen_VisibleCursor; 1528 screen.flags &= ~Screen_VisibleCursor;
1442} 1529}
… …
1758 if (TermWin.view_start != oldviewstart) 1845 if (TermWin.view_start != oldviewstart)
1759 { 1846 {
1760 want_refresh = 1; 1847 want_refresh = 1;
1761 num_scr -= (TermWin.view_start - oldviewstart); 1848 num_scr -= (TermWin.view_start - oldviewstart);
1762 } 1849 }
1850
1763 return (int) (TermWin.view_start - oldviewstart); 1851 return (int) (TermWin.view_start - oldviewstart);
1764} 1852}
1765 1853
1766/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1767void 1855void
… …
1835 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1923 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1836 1924
1837void 1925void
1838rxvt_term::scr_refresh (unsigned char refresh_type) 1926rxvt_term::scr_refresh (unsigned char refresh_type)
1839{ 1927{
1840 unsigned char clearfirst, /* first character writes before cell */ 1928 unsigned char clearfirst, /* first character writes before cell */
1841 clearlast, /* last character writes beyond cell */ 1929 clearlast, /* last character writes beyond cell */
1842 must_clear, /* use draw_string not draw_image_string */ 1930 must_clear, /* use draw_string not draw_image_string */
1843 rvid, /* reverse video this position */ 1931 rvid, /* reverse video this position */
1844 showcursor; /* show the cursor */ 1932 showcursor; /* show the cursor */
1845 int16_t col, row, /* column/row we're processing */ 1933 int16_t col, row, /* column/row we're processing */
1846 ocrow; /* old cursor row */ 1934 ocrow; /* old cursor row */
1847 int cursorwidth;
1848 int i, /* tmp */ 1935 int i, /* tmp */
1849 row_offset; /* basic offset in screen structure */ 1936 row_offset; /* basic offset in screen structure */
1850#ifndef NO_CURSORCOLOR 1937#ifndef NO_CURSORCOLOR
1851 rend_t cc1; /* store colours at cursor position (s) */ 1938 rend_t cc1; /* store colours at cursor position (s) */
1852#endif 1939#endif
1853 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1940 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1854 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1941 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1855 1942
1856 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1943 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1857 return; 1944 return;
1858 1945
1859 /* 1946 /*
… …
1886 1973
1887 /* 1974 /*
1888 * C: set the cursor character (s) 1975 * C: set the cursor character (s)
1889 */ 1976 */
1890 { 1977 {
1891 unsigned char setoldcursor; 1978 unsigned char setoldcursor;
1892 rend_t ccol1, /* Cursor colour */ 1979 rend_t ccol1, /* Cursor colour */
1893 ccol2; /* Cursor colour2 */ 1980 ccol2; /* Cursor colour2 */
1894 1981
1895 showcursor = (screen.flags & Screen_VisibleCursor); 1982 showcursor = (screen.flags & Screen_VisibleCursor);
1896 cursorwidth = 0;
1897#ifdef CURSOR_BLINK 1983#ifdef CURSOR_BLINK
1898 if (hidden_cursor) 1984 if (hidden_cursor)
1899 showcursor = 0; 1985 showcursor = 0;
1900#endif 1986#endif
1901 1987
1902 cursorwidth = 0;
1903
1904 if (showcursor) 1988 if (showcursor)
1905 { 1989 {
1906 cursorwidth++;
1907
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
… …
1930 ccol2 = Color_bg; 2011 ccol2 = Color_bg;
1931#endif 2012#endif
1932 *srp = SET_FGCOLOR (*srp, ccol1); 2013 *srp = SET_FGCOLOR (*srp, ccol1);
1933 *srp = SET_BGCOLOR (*srp, ccol2); 2014 *srp = SET_BGCOLOR (*srp, ccol2);
1934#endif 2015#endif
1935
1936 } 2016 }
1937 } 2017 }
1938 2018
1939 /* make sure no outline cursor is left around */ 2019 /* make sure no outline cursor is left around */
1940 setoldcursor = 0; 2020 setoldcursor = 0;
… …
1943 if (screen.cur.row + TermWin.view_start != ocrow 2023 if (screen.cur.row + TermWin.view_start != ocrow
1944 || screen.cur.col != oldcursor.col) 2024 || screen.cur.col != oldcursor.col)
1945 { 2025 {
1946 if (ocrow < TermWin.nrow 2026 if (ocrow < TermWin.nrow
1947 && oldcursor.col < TermWin.ncol) 2027 && oldcursor.col < TermWin.ncol)
1948 {
1949 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2028 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1950 } 2029
1951 if (TermWin.focus || !showcursor) 2030 if (TermWin.focus || !showcursor)
1952 oldcursor.row = -1; 2031 oldcursor.row = -1;
1953 else 2032 else
1954 setoldcursor = 1; 2033 setoldcursor = 1;
1955 } 2034 }
1956 } 2035 }
1957 else if (!TermWin.focus) 2036 else if (!TermWin.focus)
1958 setoldcursor = 1; 2037 setoldcursor = 1;
2038
1959 if (setoldcursor) 2039 if (setoldcursor)
1960 { 2040 {
1961 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2041 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1962 oldcursor.row = -1; 2042 oldcursor.row = -1;
1963 else 2043 else
… …
1975 */ 2055 */
1976 i = num_scr; 2056 i = num_scr;
1977 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2057 if (refresh_type == FAST_REFRESH && num_scr_allow && i
1978 && abs (i) < TermWin.nrow && !must_clear) 2058 && abs (i) < TermWin.nrow && !must_clear)
1979 { 2059 {
1980 int16_t nits; 2060 int16_t nits;
1981 int j; 2061 int j;
1982 rend_t *drp2; 2062 rend_t *drp2;
1983 text_t *dtp2; 2063 text_t *dtp2;
1984 int len, wlen; 2064 int len, wlen;
1985 2065
1986 j = TermWin.nrow; 2066 j = TermWin.nrow;
1987 wlen = len = -1; 2067 wlen = len = -1;
1988 row = i > 0 ? 0 : j - 1; 2068 row = i > 0 ? 0 : j - 1;
1989 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2069 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2053 int ypixel = (int)Row2Pixel (row); 2133 int ypixel = (int)Row2Pixel (row);
2054 2134
2055 for (col = 0; col < TermWin.ncol; col++) 2135 for (col = 0; col < TermWin.ncol; col++)
2056 { 2136 {
2057 /* 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
2058 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2150 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2059
2060 if (stp[col] == dtp[col] /* Must match characters to skip. */
2061 && (rend == drp[col] /* Either rendition the same or */
2062 || (stp[col] == ' ' /* space w/ no background change */
2063 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2064 continue;
2065
2066 text_t *text = stp + col; 2151 text_t *text = stp + col;
2067 int count = 1; 2152 int count = 1;
2068 2153
2069 /* redraw one or more characters */
2070
2071 dtp[col] = stp[col]; 2154 dtp[col] = stp[col];
2072 drp[col] = rend; 2155 drp[col] = rend;
2073
2074 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2075 continue;
2076 2156
2077 int xpixel = Col2Pixel (col); 2157 int xpixel = Col2Pixel (col);
2078 2158
2079 // this loop looks very messy, it can probably be optimized 2159 // this loop looks very messy, it can probably be optimized
2080 // and cleaned a bit by you? 2160 // and cleaned a bit by you?
… …
2121 int fore = GET_FGCOLOR (rend); // desired foreground 2201 int fore = GET_FGCOLOR (rend); // desired foreground
2122 int back = GET_BGCOLOR (rend); // desired background 2202 int back = GET_BGCOLOR (rend); // desired background
2123 2203
2124 rend = GET_ATTR (rend); 2204 rend = GET_ATTR (rend);
2125 2205
2126 rvid = !! (rend & RS_RVid); 2206 rvid = !!(rend & RS_RVid);
2207
2208#ifndef NO_BOLD_UNDERLINE_REVERSE
2209 if (rend & RS_Bold && fore == Color_fg)
2210 {
2211 if (ISSET_PIXCOLOR (Color_BD))
2212 fore = Color_BD;
2213 else
2214 rvid = !rvid;
2215 }
2216
2217 if (rend & RS_Uline)
2218 if (ISSET_PIXCOLOR (Color_UL))
2219 fore = Color_UL;
2220#endif
2221
2127 if (rvid) 2222 if (rvid)
2128 { 2223 {
2129 SWAP_IT (fore, back, int); 2224 SWAP_IT (fore, back, int);
2130 2225
2131#ifndef NO_BOLD_UNDERLINE_REVERSE 2226#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2134 && !ISSET_PIXCOLOR (Color_cursor) 2229 && !ISSET_PIXCOLOR (Color_cursor)
2135# endif 2230# endif
2136 ) 2231 )
2137 back = Color_RV; 2232 back = Color_RV;
2138#endif 2233#endif
2139
2140 } 2234 }
2235
2141#ifdef TEXT_BLINK 2236#ifdef TEXT_BLINK
2142 if (rend & RS_Blink) 2237 if (rend & RS_Blink && back == Color_bg)
2143 { 2238 {
2144 if (!text_blink_ev.active) 2239 if (!text_blink_ev.active)
2145 { 2240 {
2146 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2241 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2147 hidden_text = 0; 2242 hidden_text = 0;
2148 } 2243 }
2149 else if (hidden_text) 2244 else if (hidden_text)
2150 fore = back; 2245 fore = back;
2151 } 2246 }
2152#endif 2247#endif
2153#ifndef NO_BOLD_UNDERLINE_REVERSE
2154 else if (rend & RS_Bold)
2155 {
2156 if (ISSET_PIXCOLOR (Color_BD))
2157 fore = Color_BD;
2158 else if (fore == Color_fg)
2159 fore = Color_White;
2160 }
2161 else if (rend & RS_Uline)
2162 {
2163 if (ISSET_PIXCOLOR (Color_UL))
2164 fore = Color_UL;
2165 }
2166#endif
2167 2248
2168 /* 2249 /*
2169 * Actually do the drawing of the string here 2250 * Actually do the drawing of the string here
2170 */ 2251 */
2171 rxvt_font *font = (*TermWin.fontset)[fid]; 2252 rxvt_font *font = (*TermWin.fontset)[fid];
2172 2253
2173 if (back == fore) 2254 if (back == fore)
2174 font->clear_rect (xpixel, ypixel, 2255 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2175 TermWin.fwidth * count, TermWin.fheight, 2256 TermWin.fwidth * count, TermWin.fheight,
2176 back); 2257 back);
2177 else if (back == Color_bg) 2258 else if (back == Color_bg)
2178 { 2259 {
2179 if (must_clear) 2260 if (must_clear)
… …
2181 CLEAR_CHARS (xpixel, ypixel, count); 2262 CLEAR_CHARS (xpixel, ypixel, count);
2182 2263
2183 for (i = 0; i < count; i++) /* don't draw empty strings */ 2264 for (i = 0; i < count; i++) /* don't draw empty strings */
2184 if (text[i] != ' ') 2265 if (text[i] != ' ')
2185 { 2266 {
2186 font->draw (xpixel, ypixel, text, count, fore, -1); 2267 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2187 break; 2268 break;
2188 } 2269 }
2189 } 2270 }
2190 else 2271 else
2191 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2272 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2192 } 2273 }
2193 else 2274 else
2194 font->draw (xpixel, ypixel, text, count, fore, back); 2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2195 2276
2196 if ((rend & RS_Uline) && (font->descent > 1)) 2277 if ((rend & RS_Uline) && (font->descent > 1))
2197 XDrawLine (display->display, drawBuffer, TermWin.gc, 2278 XDrawLine (display->display, drawBuffer, TermWin.gc,
2198 xpixel, ypixel + font->ascent + 1, 2279 xpixel, ypixel + font->ascent + 1,
2199 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2280 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2200 } /* for (col....) */ 2281 } /* for (col....) */
2201 } /* for (row....) */ 2282 } /* for (row....) */
2202 2283
2203 /* 2284 /*
2204 * G: cleanup cursor and display outline cursor if necessary 2285 * G: cleanup cursor and display outline cursor if necessary
… …
2211 [screen.cur.col]); 2292 [screen.cur.col]);
2212 *srp ^= RS_RVid; 2293 *srp ^= RS_RVid;
2213#ifndef NO_CURSORCOLOR 2294#ifndef NO_CURSORCOLOR
2214 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2295 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2215#endif 2296#endif
2216
2217 } 2297 }
2218 else if (oldcursor.row >= 0) 2298 else if (oldcursor.row >= 0)
2219 { 2299 {
2220#ifndef NO_CURSORCOLOR 2300#ifndef NO_CURSORCOLOR
2221 if (ISSET_PIXCOLOR (Color_cursor)) 2301 if (ISSET_PIXCOLOR (Color_cursor))
2222 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2302 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2223#endif 2303#endif
2304 int cursorwidth = 1;
2305 while (oldcursor.col + cursorwidth < TermWin.ncol
2306 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2307 cursorwidth++;
2308
2224 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2309 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2225 Col2Pixel (oldcursor.col), 2310 Col2Pixel (oldcursor.col),
2226 Row2Pixel (oldcursor.row), 2311 Row2Pixel (oldcursor.row),
2227 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2312 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2228 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2313 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2229 } 2314 }
2230 } 2315 }
2231 2316
2232 /* 2317 /*
2233 * H: cleanup selection 2318 * H: cleanup selection
… …
2241 /* 2326 /*
2242 * clear the whole screen height, note that width == 0 is treated 2327 * clear the whole screen height, note that width == 0 is treated
2243 * specially by XClearArea 2328 * specially by XClearArea
2244 */ 2329 */
2245 XClearArea (display->display, TermWin.vt, 0, 0, 2330 XClearArea (display->display, TermWin.vt, 0, 0,
2246 (unsigned int)TermWin.int_bwidth, 2331 (unsigned int)TermWin.int_bwidth,
2247 (unsigned int)TermWin_TotalHeight (), False); 2332 (unsigned int)TermWin_TotalHeight (), False);
2333
2248 if (clearlast && TermWin.int_bwidth) 2334 if (clearlast && TermWin.int_bwidth)
2249 /* 2335 /*
2250 * clear the whole screen height, note that width == 0 is treated 2336 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea 2337 * specially by XClearArea
2252 */ 2338 */
2253 XClearArea (display->display, TermWin.vt, 2339 XClearArea (display->display, TermWin.vt,
2254 TermWin.width + TermWin.int_bwidth, 0, 2340 TermWin.width + TermWin.int_bwidth, 0,
2255 (unsigned int)TermWin.int_bwidth, 2341 (unsigned int)TermWin.int_bwidth,
2256 (unsigned int)TermWin_TotalHeight (), False); 2342 (unsigned int)TermWin_TotalHeight (), False);
2343
2257 if (refresh_type & SMOOTH_REFRESH) 2344 if (refresh_type & SMOOTH_REFRESH)
2258 XSync (display->display, False); 2345 XSync (display->display, False);
2259 2346
2260 num_scr = 0; 2347 num_scr = 0;
2261 num_scr_allow = 1; 2348 num_scr_allow = 1;
… …
2285 } 2372 }
2286} 2373}
2287 2374
2288/* ------------------------------------------------------------------------- */ 2375/* ------------------------------------------------------------------------- */
2289void 2376void
2290rxvt_term::scr_clear () 2377rxvt_term::scr_clear (bool really)
2291{ 2378{
2292 if (!TermWin.mapped) 2379 if (!TermWin.mapped)
2293 return; 2380 return;
2294 2381
2295 num_scr_allow = 0; 2382 num_scr_allow = 0;
2296 want_refresh = 1; 2383 want_refresh = 1;
2384
2297#ifdef TRANSPARENT 2385#ifdef TRANSPARENT
2298 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2386 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2299 { 2387 {
2300 int i; 2388 int i;
2301 2389
… …
2308 if (TermWin.parent[i] != None) 2396 if (TermWin.parent[i] != None)
2309 XClearWindow (display->display, TermWin.parent[i]); 2397 XClearWindow (display->display, TermWin.parent[i]);
2310 } 2398 }
2311#endif 2399#endif
2312 2400
2401 if (really)
2313 XClearWindow (display->display, TermWin.vt); 2402 XClearWindow (display->display, TermWin.vt);
2314} 2403}
2315 2404
2316/* ------------------------------------------------------------------------- */ 2405/* ------------------------------------------------------------------------- */
2317void 2406void
2318rxvt_term::scr_reverse_selection () 2407rxvt_term::scr_reverse_selection ()
2319{ 2408{
2320 int i, col, row, end_row;
2321 rend_t *srp;
2322
2323 if (selection.op && current_screen == selection.screen) 2409 if (selection.op && current_screen == selection.screen)
2324 { 2410 {
2325 end_row = TermWin.saveLines - TermWin.view_start; 2411 int end_row = TermWin.saveLines - TermWin.view_start;
2326 i = selection.beg.row + TermWin.saveLines; 2412 int i = selection.beg.row + TermWin.saveLines;
2327 row = selection.end.row + TermWin.saveLines; 2413 int col, row = selection.end.row + TermWin.saveLines;
2414 rend_t *srp;
2415
2328 if (i >= end_row) 2416 if (i >= end_row)
2329 col = selection.beg.col; 2417 col = selection.beg.col;
2330 else 2418 else
2331 { 2419 {
2332 col = 0; 2420 col = 0;
2333 i = end_row; 2421 i = end_row;
2334 } 2422 }
2423
2335 end_row += TermWin.nrow; 2424 end_row += TermWin.nrow;
2336 for (; i < row && i < end_row; i++, col = 0) 2425 for (; i < row && i < end_row; i++, col = 0)
2337 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2426 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2338 srp[col] ^= RS_RVid; 2427 srp[col] ^= RS_RVid;
2428
2339 if (i == row && i < end_row) 2429 if (i == row && i < end_row)
2340 for (srp = screen.rend[i]; col < selection.end.col; col++) 2430 for (srp = screen.rend[i]; col < selection.end.col; col++)
2341 srp[col] ^= RS_RVid; 2431 srp[col] ^= RS_RVid;
2342 } 2432 }
2343} 2433}
… …
2431 { 2521 {
2432 n = min (len - i, PROP_SIZE); 2522 n = min (len - i, PROP_SIZE);
2433 MEMCPY (ds, data + i, n); 2523 MEMCPY (ds, data + i, n);
2434 2524
2435 for (j = 0; j < n; j++) 2525 for (j = 0; j < n; j++)
2436 if (ds[j] == '\n') 2526 if (ds[j] == C0_LF)
2437 ds[j] = '\r'; 2527 ds[j] = C0_CR;
2438 2528
2439 tt_write (ds, (int)n); 2529 tt_write (ds, (int)n);
2440 } 2530 }
2441 2531
2442 free (ds); 2532 free (ds);
… …
2482 } 2572 }
2483 2573
2484 for (;;) 2574 for (;;)
2485 { 2575 {
2486 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2576 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2487 (long) (PROP_SIZE / 4), delete_prop, 2577 (long) (PROP_SIZE / 4), delete_prop,
2488 AnyPropertyType, &ct.encoding, &ct.format, 2578 AnyPropertyType, &ct.encoding, &ct.format,
2489 &ct.nitems, &bytes_after, 2579 &ct.nitems, &bytes_after,
2490 &ct.value) != Success) 2580 &ct.value) != Success)
2491 break; 2581 break;
2492 2582
2493 if (ct.encoding == 0) 2583 if (ct.encoding == 0)
2494 { 2584 {
2495 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2585 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2503 } 2593 }
2504 2594
2505 if (ct.nitems == 0) 2595 if (ct.nitems == 0)
2506 { 2596 {
2507 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2597 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2598
2508 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
2509 { 2601 {
2510 /* 2602 /*
2511 * pass through again trying CUT_BUFFER0 if we've come from 2603 * pass through again trying CUT_BUFFER0 if we've come from
2512 * XConvertSelection () but nothing was presented 2604 * XConvertSelection () but nothing was presented
2513 */ 2605 */
… …
2553void 2645void
2554rxvt_term::incr_cb (time_watcher &w) 2646rxvt_term::incr_cb (time_watcher &w)
2555{ 2647{
2556 selection_wait = Sel_none; 2648 selection_wait = Sel_none;
2557 2649
2558 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2650 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2559} 2651}
2560 2652
2561/* 2653/*
2562 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2654 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2563 */ 2655 */
… …
2566{ 2658{
2567 int reget_time = 0; 2659 int reget_time = 0;
2568 2660
2569 if (prop == None) 2661 if (prop == None)
2570 return; 2662 return;
2663
2571 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));
2572 if (selection_wait == Sel_normal) 2665 if (selection_wait == Sel_normal)
2573 { 2666 {
2574 int a, afmt; 2667 int a, afmt;
2575 Atom atype; 2668 Atom atype;
2576 unsigned long bytes_after, nitems; 2669 unsigned long bytes_after, nitems;
2577 unsigned char *s = NULL; 2670 unsigned char *s = NULL;
2578 2671
2579 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2672 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2580 xa[XA_INCR], &atype, &afmt, &nitems, 2673 xa[XA_INCR], &atype, &afmt, &nitems,
2581 &bytes_after, &s); 2674 &bytes_after, &s);
2582 if (s) 2675 if (s)
2583 XFree (s); 2676 XFree (s);
2584 if (a != Success) 2677 if (a != Success)
2585 return; 2678 return;
2679
2586#ifndef __CYGWIN32__ 2680#ifndef __CYGWIN32__
2587 if (atype == xa[XA_INCR]) 2681 if (atype == xa[XA_INCR])
2588 { /* start an INCR transfer */ 2682 { /* start an INCR transfer */
2589 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2683 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2590 XDeleteProperty (display->display, win, prop); 2684 XDeleteProperty (display->display, win, prop);
… …
2596 2690
2597 } 2691 }
2598 else if (selection_wait == Sel_incr) 2692 else if (selection_wait == Sel_incr)
2599 { 2693 {
2600 reget_time = 1; 2694 reget_time = 1;
2695
2601 if (selection_paste (win, prop, True) == -1) 2696 if (selection_paste (win, prop, True) == -1)
2602 { 2697 {
2603 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2698 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2604 selection_wait = Sel_none; 2699 selection_wait = Sel_none;
2605 incr_ev.stop (); 2700 incr_ev.stop ();
2606 } 2701 }
2607 } 2702 }
2608 if (reget_time) /* received more data so reget time */ 2703 if (reget_time) /* received more data so reget time */
2609 incr_ev.start (NOW + 10); 2704 incr_ev.start (NOW + 10);
2610} 2705}
2706
2611/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2612/* 2708/*
2613 * Request the current selection: 2709 * Request the current selection:
2614 * Order: > internal selection if available 2710 * Order: > internal selection if available
2615 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2711 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2620 */ 2716 */
2621void 2717void
2622rxvt_term::selection_request (Time tm, int x, int y) 2718rxvt_term::selection_request (Time tm, int x, int y)
2623{ 2719{
2624 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
2625 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2722 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2626 return; /* outside window */ 2723 return; /* outside window */
2627 2724
2628 if (selection.text != NULL) 2725 if (selection.text)
2629 { /* internal selection */ 2726 { /* internal selection */
2630 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2727 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2631 paste (selection.text, selection.len); 2728 char *str = rxvt_wcstombs (selection.text, selection.len);
2729 paste ((unsigned char *)str, strlen (str));
2730 free (str);
2632 return; 2731 return;
2633 } 2732 }
2634 else 2733 else
2635 { 2734 {
2636 int i; 2735 int i;
2637 2736
2638 selection_request_time = tm; 2737 selection_request_time = tm;
2639 selection_wait = Sel_normal; 2738 selection_wait = Sel_normal;
2739
2640 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2740 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2641 { 2741 {
2642#if X_HAVE_UTF8_STRING 2742#if X_HAVE_UTF8_STRING
2643 selection_type = Sel_UTF8String; 2743 selection_type = Sel_UTF8String;
2644 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2744 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2649 return; 2749 return;
2650#endif 2750#endif
2651 2751
2652 } 2752 }
2653 } 2753 }
2754
2654 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2755 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2655 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2756 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2656 selection_paste (display->root, XA_CUT_BUFFER0, False); 2757 selection_paste (display->root, XA_CUT_BUFFER0, False);
2657} 2758}
2658 2759
2659int 2760int
2660rxvt_term::selection_request_other (Atom target, int selnum) 2761rxvt_term::selection_request_other (Atom target, int selnum)
2661{ 2762{
2662 Atom sel; 2763 Atom sel;
2663#ifdef DEBUG_SELECT 2764#ifdef DEBUG_SELECT
2664 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2765 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2665#endif 2766#endif
2666 2767
2667 selection_type |= selnum; 2768 selection_type |= selnum;
2769
2668 if (selnum == Sel_Primary) 2770 if (selnum == Sel_Primary)
2669 sel = XA_PRIMARY; 2771 sel = XA_PRIMARY;
2670 else if (selnum == Sel_Secondary) 2772 else if (selnum == Sel_Secondary)
2671 sel = XA_SECONDARY; 2773 sel = XA_SECONDARY;
2672 else 2774 else
2673 sel = xa[XA_CLIPBOARD]; 2775 sel = xa[XA_CLIPBOARD];
2776
2674 if (XGetSelectionOwner (display->display, sel) != None) 2777 if (XGetSelectionOwner (display->display, sel) != None)
2675 { 2778 {
2676 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]));
2677 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2780 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2678 TermWin.vt, selection_request_time); 2781 TermWin.vt, selection_request_time);
2679 return 1; 2782 return 1;
2680 } 2783 }
2784
2681 return 0; 2785 return 0;
2682} 2786}
2683 2787
2684/* ------------------------------------------------------------------------- */ 2788/* ------------------------------------------------------------------------- */
2685/* 2789/*
… …
2694 want_refresh = 1; 2798 want_refresh = 1;
2695 free (selection.text); 2799 free (selection.text);
2696 selection.text = NULL; 2800 selection.text = NULL;
2697 selection.len = 0; 2801 selection.len = 0;
2698 CLEAR_SELECTION (); 2802 CLEAR_SELECTION ();
2803
2804 if (display->selection_owner == this)
2805 display->selection_owner = 0;
2699} 2806}
2700 2807
2701/* ------------------------------------------------------------------------- */ 2808/* ------------------------------------------------------------------------- */
2702/* 2809/*
2703 * Copy a selection into the cut buffer 2810 * Copy a selection into the cut buffer
2704 * EXT: button 1 or 3 release 2811 * EXT: button 1 or 3 release
2705 */ 2812 */
2706void 2813void
2707rxvt_term::selection_make (Time tm) 2814rxvt_term::selection_make (Time tm)
2708{ 2815{
2709 int i, col, end_col, row, end_row; 2816 int i, col, end_col, row, end_row;
2710 unsigned char *new_selection_text; 2817 wchar_t *new_selection_text;
2711 char *str;
2712 text_t *t; 2818 text_t *t;
2713#ifdef ACS_ASCII
2714 rend_t *re;
2715#endif
2716 2819
2717 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));
2718 switch (selection.op) 2821 switch (selection.op)
2719 { 2822 {
2720 case SELECTION_CONT: 2823 case SELECTION_CONT:
… …
2726 selection.op = SELECTION_DONE; 2829 selection.op = SELECTION_DONE;
2727 /* FALLTHROUGH */ 2830 /* FALLTHROUGH */
2728 default: 2831 default:
2729 return; 2832 return;
2730 } 2833 }
2834
2731 selection.op = SELECTION_DONE; 2835 selection.op = SELECTION_DONE;
2732 2836
2733 if (selection.clicks == 4) 2837 if (selection.clicks == 4)
2734 return; /* nothing selected, go away */ 2838 return; /* nothing selected, go away */
2735 2839
2736 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2840 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2737 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2841 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2738
2739 new_selection_text = (unsigned char *)str;
2740 2842
2741 col = selection.beg.col; 2843 col = selection.beg.col;
2742 MAX_IT (col, 0); 2844 MAX_IT (col, 0);
2743 row = selection.beg.row + TermWin.saveLines; 2845 row = selection.beg.row + TermWin.saveLines;
2744 end_row = selection.end.row + TermWin.saveLines; 2846 end_row = selection.end.row + TermWin.saveLines;
2847 int ofs = 0;
2848 int extra = 0;
2745 2849
2746 for (; row <= end_row; row++, col = 0) 2850 for (; row <= end_row; row++, col = 0)
2747 { 2851 {
2748 t = & (screen.text[row][col]); 2852 t = &(screen.text[row][col]);
2749 2853
2750 end_col = screen.tlen[row]; 2854 end_col = screen.tlen[row];
2751 2855
2752 if (end_col == -1) 2856 if (end_col == -1)
2753 end_col = TermWin.ncol; 2857 end_col = TermWin.ncol;
2754 2858
2755 if (row == end_row) 2859 if (row == end_row)
2756 MIN_IT (end_col, selection.end.col); 2860 MIN_IT (end_col, selection.end.col);
2757 2861
2758 for (; col < end_col; col++) 2862 for (; col < end_col; col++)
2863 {
2759 if (*t == NOCHAR) 2864 if (*t == NOCHAR)
2760 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
2761 else 2883 else
2762 { 2884 new_selection_text[ofs++] = *t++;
2763 int len = wctomb (str, *t++);
2764 if (len > 0)
2765 str += len;
2766 } 2885 }
2767 2886
2768 if (screen.tlen[row] != -1 && row != end_row) 2887 if (screen.tlen[row] != -1 && row != end_row)
2769 *str++ = '\n'; 2888 new_selection_text[ofs++] = C0_LF;
2770 } 2889 }
2771 2890
2772#ifndef NO_OLD_SELECTION
2773 if (selection_style == OLD_SELECT)
2774 if (end_col == TermWin.ncol)
2775 *str++ = '\n';
2776#endif
2777#ifndef NO_NEW_SELECTION
2778 if (selection_style != OLD_SELECT)
2779 if (end_col != selection.end.col) 2891 if (end_col != selection.end.col)
2780 *str++ = '\n'; 2892 new_selection_text[ofs++] = C0_LF;
2781#endif
2782 *str = '\0';
2783 2893
2784 i = str - (char *)new_selection_text; 2894 new_selection_text[ofs] = 0;
2895
2785 if (i == 0) 2896 if (ofs == 0)
2786 { 2897 {
2787 free (new_selection_text); 2898 free (new_selection_text);
2788 return; 2899 return;
2789 } 2900 }
2790 2901
2791 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2792 if (str - (char *)new_selection_text > 1024)
2793 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2794
2795 selection.len = i;
2796
2797 if (selection.text)
2798 free (selection.text); 2902 free (selection.text);
2799 2903
2800 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));
2801 2907
2802 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2908 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2803 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2909 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2804 display->set_selection_owner (this); 2910 display->set_selection_owner (this);
2805 else 2911 else
2806 rxvt_print_error ("can't get primary selection"); 2912 rxvt_warn ("can't get primary selection, ignoring.\n");
2807 2913
2808 { 2914#if 0
2809 XTextProperty ct; 2915 XTextProperty ct;
2810 char *cl = (char *)selection.text;
2811 2916
2812 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2917 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2813 { 2918 {
2814 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2815 PropModeReplace, ct.value, ct.nitems);
2816 XFree (ct.value);
2817 }
2818 else
2819 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2919 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2820 PropModeReplace, selection.text, (int)selection.len); 2920 PropModeReplace, ct.value, ct.nitems);
2921 XFree (ct.value);
2821 } 2922 }
2923#endif
2822 2924
2823 selection_time = tm; 2925 selection_time = tm;
2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2926 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2825} 2927}
2826 2928
… …
2855rxvt_term::selection_start_colrow (int col, int row) 2957rxvt_term::selection_start_colrow (int col, int row)
2856{ 2958{
2857 want_refresh = 1; 2959 want_refresh = 1;
2858 selection.mark.col = col; 2960 selection.mark.col = col;
2859 selection.mark.row = row - TermWin.view_start; 2961 selection.mark.row = row - TermWin.view_start;
2962
2860 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2963 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2861 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2964 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2862 MAX_IT (selection.mark.col, 0); 2965 MAX_IT (selection.mark.col, 0);
2863 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2966 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2864 2967
2968 while (selection.mark.col > 0
2969 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2970 --selection.mark.col;
2971
2865 if (selection.op) 2972 if (selection.op)
2866 { /* clear the old selection */ 2973 { /* clear the old selection */
2867 selection.beg.row = selection.end.row = selection.mark.row; 2974 selection.beg.row = selection.end.row = selection.mark.row;
2868 selection.beg.col = selection.end.col = selection.mark.col; 2975 selection.beg.col = selection.end.col = selection.mark.col;
2869 } 2976 }
2977
2870 selection.op = SELECTION_INIT; 2978 selection.op = SELECTION_INIT;
2871 selection.screen = current_screen; 2979 selection.screen = current_screen;
2872} 2980}
2873 2981
2874/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
… …
2876 * Word select: select text for 2 clicks 2984 * Word select: select text for 2 clicks
2877 * We now only find out the boundary in one direction 2985 * We now only find out the boundary in one direction
2878 */ 2986 */
2879 2987
2880/* 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 */
2881#define DELIMIT_TEXT(x) \ 2989#define DELIMIT_TEXT(x) \
2882 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2990 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2883#define DELIMIT_REND(x) 1 2991#define DELIMIT_REND(x) 1
2884 2992
2885void 2993void
2886rxvt_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)
2887{ 2995{
2888 int col, row, dirnadd, tcol, trow, w1, w2; 2996 int col, row, dirnadd, tcol, trow, w1, w2;
2889 row_col_t bound; 2997 row_col_t bound;
2890 text_t *stp; 2998 text_t *stp;
2891 rend_t *srp; 2999 rend_t *srp;
2892 3000
2893 if (dirn == UP) 3001 if (dirn == UP)
2894 { 3002 {
2895 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3003 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2896 bound.col = 0; 3004 bound.col = 0;
… …
2900 { 3008 {
2901 bound.row = TermWin.saveLines + TermWin.nrow; 3009 bound.row = TermWin.saveLines + TermWin.nrow;
2902 bound.col = TermWin.ncol - 1; 3010 bound.col = TermWin.ncol - 1;
2903 dirnadd = 1; 3011 dirnadd = 1;
2904 } 3012 }
3013
2905 row = mark->row + TermWin.saveLines; 3014 row = mark->row + TermWin.saveLines;
2906 col = mark->col; 3015 col = mark->col;
2907 MAX_IT (col, 0); 3016 MAX_IT (col, 0);
2908 /* find the edge of a word */ 3017 /* find the edge of a word */
2909 stp = & (screen.text[row][col]); 3018 stp = & (screen.text[row][col]);
2910 w1 = DELIMIT_TEXT (*stp); 3019 w1 = DELIMIT_TEXT (*stp);
2911 3020
2912 if (selection_style != NEW_SELECT)
2913 {
2914 if (w1 == 1)
2915 {
2916 stp += dirnadd;
2917 if (DELIMIT_TEXT (*stp) == 1)
2918 goto Old_Word_Selection_You_Die;
2919 col += dirnadd;
2920 }
2921 w1 = 0;
2922 }
2923 srp = (&screen.rend[row][col]); 3021 srp = (&screen.rend[row][col]);
2924 w2 = DELIMIT_REND (*srp); 3022 w2 = DELIMIT_REND (*srp);
2925 3023
2926 for (;;) 3024 for (;;)
2927 { 3025 {
2928 for (; col != bound.col; col += dirnadd) 3026 for (; col != bound.col; col += dirnadd)
2929 { 3027 {
2930 stp += dirnadd; 3028 stp += dirnadd;
3029 srp += dirnadd;
3030
3031 if (*stp == NOCHAR)
3032 continue;
3033
2931 if (DELIMIT_TEXT (*stp) != w1) 3034 if (DELIMIT_TEXT (*stp) != w1)
2932 break; 3035 break;
2933 srp += dirnadd;
2934 if (DELIMIT_REND (*srp) != w2) 3036 if (DELIMIT_REND (*srp) != w2)
2935 break; 3037 break;
2936 } 3038 }
3039
2937 if ((col == bound.col) && (row != bound.row)) 3040 if ((col == bound.col) && (row != bound.row))
2938 { 3041 {
2939 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3042 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2940 { 3043 {
2941 trow = row + dirnadd; 3044 trow = row + dirnadd;
2942 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3045 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3046
2943 if (screen.text[trow] == NULL) 3047 if (screen.text[trow] == NULL)
2944 break; 3048 break;
3049
2945 stp = & (screen.text[trow][tcol]); 3050 stp = & (screen.text[trow][tcol]);
2946 srp = & (screen.rend[trow][tcol]); 3051 srp = & (screen.rend[trow][tcol]);
3052
2947 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3053 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2948 break; 3054 break;
3055
2949 row = trow; 3056 row = trow;
2950 col = tcol; 3057 col = tcol;
2951 continue; 3058 continue;
2952 } 3059 }
2953 } 3060 }
2954 break; 3061 break;
2955 } 3062 }
3063
2956Old_Word_Selection_You_Die: 3064Old_Word_Selection_You_Die:
2957 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));
2958 3066
2959 if (dirn == DN) 3067 if (dirn == DN)
2960 col++; /* put us on one past the end */ 3068 col++; /* put us on one past the end */
… …
2982 MAX_IT (row, 0); 3090 MAX_IT (row, 0);
2983 MIN_IT (row, (int)TermWin.nrow - 1); 3091 MIN_IT (row, (int)TermWin.nrow - 1);
2984 MAX_IT (col, 0); 3092 MAX_IT (col, 0);
2985 MIN_IT (col, (int)TermWin.ncol); 3093 MIN_IT (col, (int)TermWin.ncol);
2986 3094
2987#ifndef NO_NEW_SELECTION
2988 /* 3095 /*
2989 * 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
2990 * 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
2991 * 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
2992 * be _past_ a character for it to be selected. 3099 * be _past_ a character for it to be selected.
2993 */ 3100 */
2994 if (selection_style != OLD_SELECT)
2995 {
2996 if (((selection.clicks % 3) == 1) && !flag 3101 if (((selection.clicks % 3) == 1) && !flag
2997 && (col == selection.mark.col 3102 && (col == selection.mark.col
2998 && (row == selection.mark.row + TermWin.view_start))) 3103 && (row == selection.mark.row + TermWin.view_start)))
2999 { 3104 {
3000 /* select nothing */ 3105 /* select nothing */
3001 selection.beg.row = selection.end.row = 0; 3106 selection.beg.row = selection.end.row = 0;
3002 selection.beg.col = selection.end.col = 0; 3107 selection.beg.col = selection.end.col = 0;
3003 selection.clicks = 4; 3108 selection.clicks = 4;
3004 want_refresh = 1; 3109 want_refresh = 1;
3005 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3110 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3006 return; 3111 return;
3007 }
3008 } 3112 }
3009#endif 3113
3010 if (selection.clicks == 4) 3114 if (selection.clicks == 4)
3011 selection.clicks = 1; 3115 selection.clicks = 1;
3012 3116
3013 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3117 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3014 flag == 1 ? 1 : 0, /* ? button press */ 3118 flag == 1 ? 1 : 0, /* ? button press */
… …
3020 * Extend the selection to the specified col/row 3124 * Extend the selection to the specified col/row
3021 */ 3125 */
3022void 3126void
3023rxvt_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)
3024{ 3128{
3025 int16_t ncol = TermWin.ncol; 3129 int16_t ncol = TermWin.ncol;
3026 int end_col; 3130 int end_col;
3027 row_col_t pos; 3131 row_col_t pos;
3028 enum { 3132 enum {
3029 LEFT, RIGHT 3133 LEFT, RIGHT
3030 } closeto = RIGHT; 3134 } closeto = RIGHT;
3031 3135
3032 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));
… …
3068 pos.col = col; 3172 pos.col = col;
3069 pos.row = row; 3173 pos.row = row;
3070 3174
3071 pos.row -= TermWin.view_start; /* adjust for scroll */ 3175 pos.row -= TermWin.view_start; /* adjust for scroll */
3072 3176
3073#ifndef NO_OLD_SELECTION
3074 /*
3075 * This mimics some of the selection behaviour of version 2.20 and before.
3076 * There are no ``selection modes'', button3 is always character extension.
3077 * Note: button3 drag is always available, c.f. v2.20
3078 * Selection always terminates (left or right as appropriate) at the mark.
3079 */
3080 if (selection_style == OLD_SELECT)
3081 {
3082 if (selection.clicks == 1 || button3)
3083 {
3084 if (hate_those_clicks)
3085 {
3086 hate_those_clicks = 0;
3087 if (selection.clicks == 1)
3088 {
3089 selection.beg.row = selection.mark.row;
3090 selection.beg.col = selection.mark.col;
3091 }
3092 else
3093 {
3094 selection.mark.row = selection.beg.row;
3095 selection.mark.col = selection.beg.col;
3096 }
3097 }
3098 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3099 {
3100 selection.end.row = selection.mark.row;
3101 selection.end.col = selection.mark.col + 1;
3102 selection.beg.row = pos.row;
3103 selection.beg.col = pos.col;
3104 }
3105 else
3106 {
3107 selection.beg.row = selection.mark.row;
3108 selection.beg.col = selection.mark.col;
3109 selection.end.row = pos.row;
3110 selection.end.col = pos.col + 1;
3111 }
3112 }
3113 else if (selection.clicks == 2)
3114 {
3115 selection_delimit_word (UP, & (selection.mark),
3116 & (selection.beg));
3117 selection_delimit_word (DN, & (selection.mark),
3118 & (selection.end));
3119 hate_those_clicks = 1;
3120 }
3121 else if (selection.clicks == 3)
3122 {
3123 selection.beg.row = selection.end.row = selection.mark.row;
3124 selection.beg.col = 0;
3125 selection.end.col = ncol;
3126 hate_those_clicks = 1;
3127 }
3128 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));
3129 return;
3130 }
3131#endif /* ! NO_OLD_SELECTION */
3132#ifndef NO_NEW_SELECTION
3133 /* selection_style must not be OLD_SELECT to get here */
3134 /* 3177 /*
3135 * 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
3136 * in the way button3 drag extension works. 3179 * in the way button3 drag extension works.
3137 * We're either doing: button1 drag; button3 press; or button3 drag 3180 * We're either doing: button1 drag; button3 press; or button3 drag
3138 * 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
… …
3143 * 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
3144 * 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
3145 * time of the most recent button3 press 3188 * time of the most recent button3 press
3146 */ 3189 */
3147 if (button3 && buttonpress) 3190 if (button3 && buttonpress)
3148 { /* button3 press */ 3191 { /* button3 press */
3149 /* 3192 /*
3150 * first determine which edge of the selection we are closest to 3193 * first determine which edge of the selection we are closest to
3151 */ 3194 */
3152 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3195 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3153 || (!ROWCOL_IS_AFTER (pos, selection.end) 3196 || (!ROWCOL_IS_AFTER (pos, selection.end)
3154 && (((pos.col - selection.beg.col) 3197 && (((pos.col - selection.beg.col)
3155 + ((pos.row - selection.beg.row) * ncol)) 3198 + ((pos.row - selection.beg.row) * ncol))
3156 < ((selection.end.col - pos.col) 3199 < ((selection.end.col - pos.col)
3157 + ((selection.end.row - pos.row) * ncol))))) 3200 + ((selection.end.row - pos.row) * ncol)))))
3158 closeto = LEFT; 3201 closeto = LEFT;
3202
3159 if (closeto == LEFT) 3203 if (closeto == LEFT)
3160 { 3204 {
3161 selection.beg.row = pos.row; 3205 selection.beg.row = pos.row;
3162 selection.beg.col = pos.col; 3206 selection.beg.col = pos.col;
3163 selection.mark.row = selection.end.row; 3207 selection.mark.row = selection.end.row;
3164 selection.mark.col = selection.end.col 3208 selection.mark.col = selection.end.col - (selection.clicks == 2);
3165 - (selection.clicks == 2);
3166 } 3209 }
3167 else 3210 else
3168 { 3211 {
3169 selection.end.row = pos.row; 3212 selection.end.row = pos.row;
3170 selection.end.col = pos.col; 3213 selection.end.col = pos.col;
3171 selection.mark.row = selection.beg.row; 3214 selection.mark.row = selection.beg.row;
3172 selection.mark.col = selection.beg.col; 3215 selection.mark.col = selection.beg.col;
3173 } 3216 }
3174 } 3217 }
3175 else 3218 else
3176 { /* button1 drag or button3 drag */ 3219 { /* button1 drag or button3 drag */
3177 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3220 if (ROWCOL_IS_AFTER (selection.mark, pos))
3178 { 3221 {
3179 if ((selection.mark.row == selection.end.row) 3222 if ((selection.mark.row == selection.end.row)
3180 && (selection.mark.col == selection.end.col) 3223 && (selection.mark.col == selection.end.col)
3181 && clickchange && selection.clicks == 2) 3224 && clickchange && selection.clicks == 2)
3182 selection.mark.col--; 3225 selection.mark.col--;
3226
3183 selection.beg.row = pos.row; 3227 selection.beg.row = pos.row;
3184 selection.beg.col = pos.col; 3228 selection.beg.col = pos.col;
3185 selection.end.row = selection.mark.row; 3229 selection.end.row = selection.mark.row;
3186 selection.end.col = selection.mark.col 3230 selection.end.col = selection.mark.col + (selection.clicks == 2);
3187 + (selection.clicks == 2);
3188 } 3231 }
3189 else 3232 else
3190 { 3233 {
3191 selection.beg.row = selection.mark.row; 3234 selection.beg.row = selection.mark.row;
3192 selection.beg.col = selection.mark.col; 3235 selection.beg.col = selection.mark.col;
… …
3196 } 3239 }
3197 3240
3198 if (selection.clicks == 1) 3241 if (selection.clicks == 1)
3199 { 3242 {
3200 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3243 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3244
3201 if (end_col != -1 && selection.beg.col > end_col) 3245 if (end_col != -1 && selection.beg.col > end_col)
3202 { 3246 {
3203#if 1 3247#if 1
3204 selection.beg.col = ncol; 3248 selection.beg.col = ncol;
3205#else 3249#else
3206 if (selection.beg.row != selection.end.row) 3250 if (selection.beg.row != selection.end.row)
3207 selection.beg.col = ncol; 3251 selection.beg.col = ncol;
3208 else 3252 else
3209 selection.beg.col = selection.mark.col; 3253 selection.beg.col = selection.mark.col;
3210#endif 3254#endif
3211
3212 } 3255 }
3256
3213 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3257 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3258
3214 if (end_col != -1 && selection.end.col > end_col) 3259 if (end_col != -1 && selection.end.col > end_col)
3215 selection.end.col = ncol; 3260 selection.end.col = ncol;
3216
3217 } 3261 }
3218 else if (selection.clicks == 2) 3262 else if (selection.clicks == 2)
3219 { 3263 {
3220 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3264 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3221 selection.end.col--; 3265 selection.end.col--;
3266
3222 selection_delimit_word (UP, & (selection.beg), 3267 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 & (selection.beg));
3224 selection_delimit_word (DN, & (selection.end), 3268 selection_delimit_word (DN, & (selection.end), & (selection.end));
3225 & (selection.end));
3226 } 3269 }
3227 else if (selection.clicks == 3) 3270 else if (selection.clicks == 3)
3228 { 3271 {
3229#ifndef NO_FRILLS 3272#ifndef NO_FRILLS
3230 if ((Options & Opt_tripleclickwords)) 3273 if ((Options & Opt_tripleclickwords))
3231 { 3274 {
3232 int end_row; 3275 int end_row;
3233 3276
3234 selection_delimit_word (UP, & (selection.beg), 3277 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3235 & (selection.beg));
3236 end_row = screen.tlen[selection.mark.row 3278 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3237 + TermWin.saveLines]; 3279
3238 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3280 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3239 end_row++)
3240 { 3281 {
3241 end_col = screen.tlen[end_row + TermWin.saveLines]; 3282 end_col = screen.tlen[end_row + TermWin.saveLines];
3283
3242 if (end_col != -1) 3284 if (end_col != -1)
3243 { 3285 {
3244 selection.end.row = end_row; 3286 selection.end.row = end_row;
3245 selection.end.col = end_col; 3287 selection.end.col = end_col;
3246 selection_remove_trailing_spaces (); 3288 selection_remove_trailing_spaces ();
… …
3248 } 3290 }
3249 } 3291 }
3250 } 3292 }
3251 else 3293 else
3252#endif 3294#endif
3253
3254 { 3295 {
3255 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3296 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3256 selection.mark.col++; 3297 selection.mark.col++;
3257 selection.beg.col = 0; 3298 selection.beg.col = 0;
3258 selection.end.col = ncol; 3299 selection.end.col = ncol;
3259 } 3300 }
3260 } 3301 }
3302
3261 if (button3 && buttonpress) 3303 if (button3 && buttonpress)
3262 { /* mark may need to be changed */ 3304 { /* mark may need to be changed */
3263 if (closeto == LEFT) 3305 if (closeto == LEFT)
3264 { 3306 {
3265 selection.mark.row = selection.end.row; 3307 selection.mark.row = selection.end.row;
3266 selection.mark.col = selection.end.col 3308 selection.mark.col = selection.end.col
3267 - (selection.clicks == 2); 3309 - (selection.clicks == 2);
… …
3271 selection.mark.row = selection.beg.row; 3313 selection.mark.row = selection.beg.row;
3272 selection.mark.col = selection.beg.col; 3314 selection.mark.col = selection.beg.col;
3273 } 3315 }
3274 } 3316 }
3275 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));
3276#endif /* ! NO_NEW_SELECTION */
3277} 3318}
3278 3319
3279#ifndef NO_FRILLS 3320#ifndef NO_FRILLS
3280void 3321void
3281rxvt_term::selection_remove_trailing_spaces () 3322rxvt_term::selection_remove_trailing_spaces ()
… …
3355 ev.target = rq.target; 3396 ev.target = rq.target;
3356 ev.time = rq.time; 3397 ev.time = rq.time;
3357 3398
3358 if (rq.target == xa[XA_TARGETS]) 3399 if (rq.target == xa[XA_TARGETS])
3359 { 3400 {
3360 Atom32 target_list[5]; 3401 Atom32 target_list[6];
3361 Atom32 *target = target_list; 3402 Atom32 *target = target_list;
3362 3403
3363 *target++ = (Atom32) xa[XA_TARGETS]; 3404 *target++ = (Atom32) xa[XA_TARGETS];
3405 *target++ = (Atom32) xa[XA_TIMESTAMP];
3364 *target++ = (Atom32) XA_STRING; 3406 *target++ = (Atom32) XA_STRING;
3365 *target++ = (Atom32) xa[XA_TEXT]; 3407 *target++ = (Atom32) xa[XA_TEXT];
3366 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3408 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3367#if X_HAVE_UTF8_STRING 3409#if X_HAVE_UTF8_STRING
3368 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3410 *target++ = (Atom32) xa[XA_UTF8_STRING];
3369#endif 3411#endif
3412
3370 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3413 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3371 (8 * sizeof (target_list[0])), PropModeReplace, 3414 (8 * sizeof (target_list[0])), PropModeReplace,
3372 (unsigned char *)target_list, 3415 (unsigned char *)target_list,
3373 target - target_list); 3416 target - target_list);
3374 ev.property = rq.property; 3417 ev.property = rq.property;
3375 } 3418 }
3376 else if (rq.target == xa[XA_MULTIPLE]) 3419 else if (rq.target == xa[XA_MULTIPLE])
3377 { 3420 {
3378 /* TODO: Handle MULTIPLE */ 3421 /* TODO: Handle MULTIPLE */
3379 } 3422 }
3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3423 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3381 { 3424 {
3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3425 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3383 (8 * sizeof (Time)), PropModeReplace, 3426 (8 * sizeof (Time)), PropModeReplace,
3384 (unsigned char *)&selection_time, 1); 3427 (unsigned char *)&selection_time, 1);
3385 ev.property = rq.property; 3428 ev.property = rq.property;
3386 } 3429 }
3387 else if (rq.target == XA_STRING 3430 else if (rq.target == XA_STRING
3388 || rq.target == xa[XA_TEXT] 3431 || rq.target == xa[XA_TEXT]
3389 || rq.target == xa[XA_COMPOUND_TEXT] 3432 || rq.target == xa[XA_COMPOUND_TEXT]
3390 || rq.target == xa[XA_UTF8_STRING] 3433 || rq.target == xa[XA_UTF8_STRING]
3391 ) 3434 )
3392 { 3435 {
3393 short freect = 0; 3436 short freect = 0;
3394 int selectlen; 3437 int selectlen;
3395 char *cl; 3438 wchar_t *cl;
3396 3439
3397 target = rq.target; 3440 target = rq.target;
3398 3441
3399 if (target == XA_STRING) 3442 if (target == XA_STRING)
3400 // 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
3401 // will ask for another format anyways. 3444 // will ask for another format anyways.
3402 style = XStringStyle; 3445 style = XStringStyle;
3403 else if (target == xa[XA_TEXT]) 3446 else if (target == xa[XA_TEXT])
3404 style = XTextStyle; 3447 style = XStdICCTextStyle;
3405 else if (target == xa[XA_COMPOUND_TEXT]) 3448 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle; 3449 style = XCompoundTextStyle;
3407#if X_HAVE_UTF8_STRING 3450#if X_HAVE_UTF8_STRING
3408 else if (target == xa[XA_UTF8_STRING]) 3451 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle; 3452 style = XUTF8StringStyle;
… …
3414 style = XCompoundTextStyle; 3457 style = XCompoundTextStyle;
3415 } 3458 }
3416 3459
3417 if (selection.text) 3460 if (selection.text)
3418 { 3461 {
3419 cl = (char *)selection.text; 3462 cl = selection.text;
3420 selectlen = selection.len; 3463 selectlen = selection.len;
3421 } 3464 }
3422 else 3465 else
3423 { 3466 {
3424 cl = ""; 3467 cl = L"";
3425 selectlen = 0; 3468 selectlen = 0;
3426 } 3469 }
3427 3470
3471 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3472 // manually for XUTF8StringStyle.
3428 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3473 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3429 freect = 1; 3474 freect = 1;
3430 else 3475 else
3431 { 3476 {
3432 /* if we failed to convert then send it raw */ 3477 /* if we failed to convert then send it raw */
3433 ct.value = (unsigned char *)cl; 3478 ct.value = (unsigned char *)cl;
… …
3440 ev.property = rq.property; 3485 ev.property = rq.property;
3441 3486
3442 if (freect) 3487 if (freect)
3443 XFree (ct.value); 3488 XFree (ct.value);
3444 } 3489 }
3490
3445 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3491 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3446} 3492}
3447 3493
3448/* ------------------------------------------------------------------------- * 3494/* ------------------------------------------------------------------------- *
3449 * MOUSE ROUTINES * 3495 * MOUSE ROUTINES *

Diff Legend

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