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.68 by pcg, Sun Apr 4 14:35:00 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;
… …
528 s->charset = s->s_charset; 522 s->charset = s->s_charset;
529 charsets[s->charset] = s->s_charset_char; 523 charsets[s->charset] = s->s_charset_char;
530 set_font_style (); 524 set_font_style ();
531 break; 525 break;
532 } 526 }
527
533 /* boundary check in case screen size changed between SAVE and RESTORE */ 528 /* boundary check in case screen size changed between SAVE and RESTORE */
534 MIN_IT (s->cur.row, TermWin.nrow - 1); 529 MIN_IT (s->cur.row, TermWin.nrow - 1);
535 MIN_IT (s->cur.col, TermWin.ncol - 1); 530 MIN_IT (s->cur.col, TermWin.ncol - 1);
536#ifdef DEBUG_STRICT 531#ifdef DEBUG_STRICT
537 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
… …
549 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 544 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
550 */ 545 */
551int 546int
552rxvt_term::scr_change_screen (int scrn) 547rxvt_term::scr_change_screen (int scrn)
553{ 548{
554 int i; 549 int i;
555#if NSCREENS 550#if NSCREENS
556 int offset; 551 int offset;
557#endif 552#endif
558 553
559 want_refresh = 1; 554 want_refresh = 1;
560 555
561 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
562 557
563 TermWin.view_start = 0; 558 TermWin.view_start = 0;
564 559
565 if (current_screen == scrn) 560 if (current_screen == scrn)
566 return current_screen; 561 return scrn;
567 562
568 selection_check (2); /* check for boundary cross */ 563 selection_check (2); /* check for boundary cross */
569 564
570 SWAP_IT (current_screen, scrn, int); 565 SWAP_IT (current_screen, scrn, int);
571#if NSCREENS 566#if NSCREENS
567 if (Options & Opt_secondaryScreen)
568 {
572 num_scr = 0; 569 num_scr = 0;
573 offset = TermWin.saveLines; 570 offset = TermWin.saveLines;
574 for (i = prev_nrow; i--;) 571 for (i = prev_nrow; i--;)
575 { 572 {
576 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 573 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
577 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 574 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
578 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 575 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
579 } 576 }
580 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 577 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
581 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 578 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
582# ifdef DEBUG_STRICT 579# ifdef DEBUG_STRICT
583 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 580 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
584 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 581 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
585# else /* drive with your eyes closed */ 582# else /* drive with your eyes closed */
586 MAX_IT (screen.cur.row, 0); 583 MAX_IT (screen.cur.row, 0);
587 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 584 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
588 MAX_IT (screen.cur.col, 0); 585 MAX_IT (screen.cur.col, 0);
589 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 586 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
590# endif 587# endif
591 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
592 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
593 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
594 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
595#else 592 }
596# ifdef SCROLL_ON_NO_SECONDARY 593 else
594#endif
595 if (Options & Opt_secondaryScroll)
597 if (current_screen == PRIMARY) 596 //if (current_screen == PRIMARY)
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 597 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
599# endif
600#endif
601 return scrn; 598 return scrn;
602} 599}
603 600
604/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
605/* 602/*
… …
647 return 0; 644 return 0;
648 645
649 want_refresh = 1; 646 want_refresh = 1;
650 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 647 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
651 648
652 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 649 if (row1 == 0 && count > 0
650 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
653 { 651 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 652 nscrolled = (long)TermWin.nscrolled + (long)count;
655 653
656 if (nscrolled > (long)TermWin.saveLines) 654 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 655 TermWin.nscrolled = TermWin.saveLines;
… …
760/* ------------------------------------------------------------------------- */ 758/* ------------------------------------------------------------------------- */
761/* 759/*
762 * Add text given in <str> of length <len> to screen struct 760 * Add text given in <str> of length <len> to screen struct
763 */ 761 */
764void 762void
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 763rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
766{ 764{
767 unsigned char checksel, clearsel; 765 unsigned char checksel, clearsel;
768 uint32_t c; 766 unicode_t c;
769 int i, row, last_col; 767 int i, row, last_col;
770 text_t *stp; 768 text_t *stp;
771 rend_t *srp; 769 rend_t *srp;
772 770
773 if (len <= 0) /* sanity */ 771 if (len <= 0) /* sanity */
774 return; 772 return;
775 773
776 want_refresh = 1; 774 want_refresh = 1;
… …
799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 797 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 798 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
801#endif 799#endif
802 row = screen.cur.row + TermWin.saveLines; 800 row = screen.cur.row + TermWin.saveLines;
803 801
804 checksel = (selection.op 802 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
805 && current_screen == selection.screen) ? 1 : 0;
806 clearsel = 0; 803 clearsel = 0;
807 804
808 stp = screen.text[row]; 805 stp = screen.text[row];
809 srp = screen.rend[row]; 806 srp = screen.rend[row];
810 807
811 for (i = 0; i < len;) 808 while (len--)
812 { 809 {
813 c = str[i++]; 810 c = *str++;
811
812 if (c < 0x20)
814 switch (c) 813 switch (c)
815 { 814 {
816 case '\t': 815 case '\t':
817 scr_tab (1); 816 scr_tab (1);
818 continue; 817 continue;
818
819 case '\n': 819 case '\n':
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 820 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 821 MAX_IT (screen.tlen[row], screen.cur.col);
822
822 screen.flags &= ~Screen_WrapNext; 823 screen.flags &= ~Screen_WrapNext;
824
823 if (screen.cur.row == screen.bscroll) 825 if (screen.cur.row == screen.bscroll)
824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
825 else if (screen.cur.row < (TermWin.nrow - 1)) 827 else if (screen.cur.row < (TermWin.nrow - 1))
826 row = (++screen.cur.row) + TermWin.saveLines; 828 row = (++screen.cur.row) + TermWin.saveLines;
829
827 stp = screen.text[row]; /* _must_ refresh */ 830 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */ 831 srp = screen.rend[row]; /* _must_ refresh */
829 continue; 832 continue;
833
830 case '\r': 834 case '\r':
831 if (screen.tlen[row] != -1) /* XXX: think about this */ 835 if (screen.tlen[row] != -1) /* XXX: think about this */
832 MAX_IT (screen.tlen[row], screen.cur.col); 836 MAX_IT (screen.tlen[row], screen.cur.col);
837
833 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
834 screen.cur.col = 0; 839 screen.cur.col = 0;
835 continue; 840 continue;
836 default:
837 if (c == 127)
838 continue; /* yummmm..... */
839 break;
840 } 841 }
841 842
842 if (checksel /* see if we're writing within selection */ 843 if (checksel /* see if we're writing within selection */
843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 844 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 845 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 846 {
846 checksel = 0; 847 checksel = 0;
847 clearsel = 1; 848 clearsel = 1;
848 } 849 }
850
849 if (screen.flags & Screen_WrapNext) 851 if (screen.flags & Screen_WrapNext)
850 { 852 {
851 screen.tlen[row] = -1; 853 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll) 854 if (screen.cur.row == screen.bscroll)
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
854 else if (screen.cur.row < (TermWin.nrow - 1)) 856 else if (screen.cur.row < (TermWin.nrow - 1))
855 row = (++screen.cur.row) + TermWin.saveLines; 857 row = (++screen.cur.row) + TermWin.saveLines;
858
856 stp = screen.text[row]; /* _must_ refresh */ 859 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 860 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 861 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext; 862 screen.flags &= ~Screen_WrapNext;
860 } 863 }
864
861 if (screen.flags & Screen_Insert) 865 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 866 scr_insdel_chars (1, INSERT);
863 867
868 // rely on wcwidth to tell us the character width, at least for non-latin1
869 // do wcwidth before further replacements, as wcwidth says that line-drawing
870 // characters have width -1 (DOH!) on GNU/Linux sometimes.
871 int width = c < 256 ? 1 : wcwidth (c);
872
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 873 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c)
866 { 874 {
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 875 // vt100 special graphics and line drawing
873 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 876 static uint16_t vt100_0[32] = { // 5f .. 7e
874 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 877 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
875 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 878 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
876 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 879 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
877 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 880 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 } 881 };
885 882
886 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 883 if (c >= 0x5f && c <= 0x7e)
887 // rely on wcwidth to tell us the character width, at least for non-ascii 884 {
888 int width = c <= 128 ? 1 : wcwidth (c); 885 c = vt100_0[c - 0x5f];
886 width = 1;
887 }
888 }
889 889
890 // width -1 characters (e.g. combining chars) are ignored currently.
891 if (width > 0) 890 if (width > 0)
891 {
892#if !UNICODE_3 && ENABLE_COMBINING
893 // trim characters we can't store directly :(
894 if (c >= 0x10000)
895 c = rxvt_composite.compose (c); // map to lower 16 bits
896#endif
897 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
898
892 do 899 do
893 { 900 {
894 stp[screen.cur.col] = c; 901 stp[screen.cur.col] = c;
895 srp[screen.cur.col] = rend; 902 srp[screen.cur.col] = rend;
896 903
897 if (screen.cur.col < last_col - 1) 904 if (screen.cur.col < last_col - 1)
898 screen.cur.col++; 905 screen.cur.col++;
899 else 906 else
900 { 907 {
901 screen.tlen[row] = last_col; 908 screen.tlen[row] = last_col;
902 if (screen.flags & Screen_Autowrap) 909 if (screen.flags & Screen_Autowrap)
903 screen.flags |= Screen_WrapNext; 910 screen.flags |= Screen_WrapNext;
904 break; 911 break;
905 } 912 }
906 913
907 c = NOCHAR; 914 c = NOCHAR;
908 } 915 }
909 while (--width > 0); 916 while (--width > 0);
917
918 // pad with spaces when overwriting wide character with smaller one
919 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
920 {
921 stp[c] = ' ';
922 srp[c] = rend;
923 }
924 }
925 else if (width == 0)
926 {
927#if ENABLE_COMBINING
928 // handle combining characters
929 // we just tag the accent on the previous on-screen character.
930 // this is arguably not correct, but also arguably not wrong.
931 // we don't handle double-width characters nicely yet.
932
933 text_t *tp;
934 rend_t *rp;
935
936 if (screen.cur.col > 0)
937 {
938 tp = stp + screen.cur.col - 1;
939 rp = srp + screen.cur.col - 1;
940 }
941 else if (screen.cur.row > 0
942 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
943 {
944 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
945 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
946 }
910 else 947 else
911 (void)0; /* handle combining character etc. here. */ 948 continue;
949
950 // handle double-width-chars by making them look extremely ugly
951 if (*tp == NOCHAR)
952 *tp = ' '; // hack //D //TODO //--tp, --rp;
953
954 // first try to find a precomposed character
955 unicode_t n = rxvt_compose (*tp, c);
956 if (n == NOCHAR)
957 n = rxvt_composite.compose (*tp, c);
958
959 *tp = n;
960 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
961#endif
962 }
912 } 963 }
913 964
914 if (screen.tlen[row] != -1) /* XXX: think about this */ 965 if (screen.tlen[row] != -1) /* XXX: think about this */
915 MAX_IT (screen.tlen[row], screen.cur.col); 966 MAX_IT (screen.tlen[row], screen.cur.col);
916 967
… …
962 * XTERM_SEQ: CTRL-I 1013 * XTERM_SEQ: CTRL-I
963 */ 1014 */
964void 1015void
965rxvt_term::scr_tab (int count) 1016rxvt_term::scr_tab (int count)
966{ 1017{
967 int i, x; 1018 int i, x;
968 1019
969 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1020 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
970 want_refresh = 1; 1021 want_refresh = 1;
971 i = x = screen.cur.col; 1022 i = x = screen.cur.col;
1023
972 if (count == 0) 1024 if (count == 0)
973 return; 1025 return;
974 else if (count > 0) 1026 else if (count > 0)
975 { 1027 {
976 for (; ++i < TermWin.ncol; ) 1028 for (; ++i < TermWin.ncol; )
… …
978 { 1030 {
979 x = i; 1031 x = i;
980 if (!--count) 1032 if (!--count)
981 break; 1033 break;
982 } 1034 }
1035
983 if (count) 1036 if (count)
984 x = TermWin.ncol - 1; 1037 x = TermWin.ncol - 1;
985 } 1038 }
986 else /* if (count < 0) */ 1039 else /* if (count < 0) */
987 { 1040 {
… …
990 { 1043 {
991 x = i; 1044 x = i;
992 if (!++count) 1045 if (!++count)
993 break; 1046 break;
994 } 1047 }
1048
995 if (count) 1049 if (count)
996 x = 0; 1050 x = 0;
997 } 1051 }
1052
998 if (x != screen.cur.col) 1053 if (x != screen.cur.col)
999 scr_gotorc (0, x, R_RELATIVE); 1054 scr_gotorc (0, x, R_RELATIVE);
1000} 1055}
1001 1056
1002/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1096 else 1151 else
1097 screen.cur.row = row; 1152 screen.cur.row = row;
1098 } 1153 }
1099 MAX_IT (screen.cur.row, 0); 1154 MAX_IT (screen.cur.row, 0);
1100 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1155 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1156
1157 while (screen.cur.col > 0
1158 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1159 screen.cur.col--;
1101} 1160}
1102 1161
1103/* ------------------------------------------------------------------------- */ 1162/* ------------------------------------------------------------------------- */
1104/* 1163/*
1105 * direction should be UP or DN 1164 * direction should be UP or DN
… …
1191 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1192 */ 1251 */
1193void 1252void
1194rxvt_term::scr_erase_screen (int mode) 1253rxvt_term::scr_erase_screen (int mode)
1195{ 1254{
1196 int num; 1255 int num;
1197 int32_t row, row_offset; 1256 int32_t row, row_offset;
1198 rend_t ren; 1257 rend_t ren;
1199 XGCValues gcvalue; 1258 XGCValues gcvalue;
1200 1259
1201 want_refresh = 1; 1260 want_refresh = 1;
1202 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1261 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1203 ZERO_SCROLLBACK (); 1262 ZERO_SCROLLBACK ();
1204 row_offset = (int32_t)TermWin.saveLines; 1263 row_offset = (int32_t)TermWin.saveLines;
… …
1223 num = TermWin.nrow; 1282 num = TermWin.nrow;
1224 break; 1283 break;
1225 default: 1284 default:
1226 return; 1285 return;
1227 } 1286 }
1287
1228 refresh_type |= REFRESH_BOUNDS; 1288 refresh_type |= REFRESH_BOUNDS;
1289
1229 if (selection.op && current_screen == selection.screen 1290 if (selection.op && current_screen == selection.screen
1230 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1291 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1231 || (selection.end.row >= row 1292 || (selection.end.row >= row
1232 && selection.end.row <= row + num))) 1293 && selection.end.row <= row + num)))
1233 CLEAR_SELECTION (); 1294 CLEAR_SELECTION ();
1295
1234 if (row >= TermWin.nrow) /* Out Of Bounds */ 1296 if (row >= TermWin.nrow) /* Out Of Bounds */
1235 return; 1297 return;
1298
1236 MIN_IT (num, (TermWin.nrow - row)); 1299 MIN_IT (num, (TermWin.nrow - row));
1300
1237 if (rstyle & (RS_RVid | RS_Uline)) 1301 if (rstyle & (RS_RVid | RS_Uline))
1238 ren = (rend_t) ~RS_None; 1302 ren = (rend_t) ~RS_None;
1239 else if (GET_BASEBG (rstyle) == Color_bg) 1303 else if (GET_BASEBG (rstyle) == Color_bg)
1240 { 1304 {
1241 ren = DEFAULT_RSTYLE; 1305 ren = DEFAULT_RSTYLE;
… …
1248 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1313 ERASE_ROWS (row, num);
1250 gcvalue.foreground = PixColors[Color_fg]; 1314 gcvalue.foreground = PixColors[Color_fg];
1251 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1315 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1252 } 1316 }
1317
1253 for (; num--; row++) 1318 for (; num--; row++)
1254 { 1319 {
1255 scr_blank_screen_mem (screen.text, screen.rend, 1320 scr_blank_screen_mem (screen.text, screen.rend,
1256 (unsigned int) (row + row_offset), rstyle); 1321 (unsigned int) (row + row_offset), rstyle);
1257 screen.tlen[row + row_offset] = 0; 1322 screen.tlen[row + row_offset] = 0;
… …
1291 * Insert/Delete <count> lines 1356 * Insert/Delete <count> lines
1292 */ 1357 */
1293void 1358void
1294rxvt_term::scr_insdel_lines (int count, int insdel) 1359rxvt_term::scr_insdel_lines (int count, int insdel)
1295{ 1360{
1296 int end; 1361 int end;
1297 1362
1298 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
1299 1364
1300 selection_check (1); 1365 selection_check (1);
1301 1366
… …
1320 * Insert/Delete <count> characters from the current position 1385 * Insert/Delete <count> characters from the current position
1321 */ 1386 */
1322void 1387void
1323rxvt_term::scr_insdel_chars (int count, int insdel) 1388rxvt_term::scr_insdel_chars (int count, int insdel)
1324{ 1389{
1325 int col, row; 1390 int col, row;
1326 rend_t tr; 1391 rend_t tr;
1327 text_t *stp; 1392 text_t *stp;
1328 rend_t *srp; 1393 rend_t *srp;
1329 int16_t *slp; 1394 int16_t *slp;
1330 1395
1331 want_refresh = 1; 1396 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1397 ZERO_SCROLLBACK ();
1333 1398
1334 if (count <= 0) 1399 if (count <= 0)
… …
1341 screen.flags &= ~Screen_WrapNext; 1406 screen.flags &= ~Screen_WrapNext;
1342 1407
1343 stp = screen.text[row]; 1408 stp = screen.text[row];
1344 srp = screen.rend[row]; 1409 srp = screen.rend[row];
1345 slp = & (screen.tlen[row]); 1410 slp = & (screen.tlen[row]);
1411
1346 switch (insdel) 1412 switch (insdel)
1347 { 1413 {
1348 case INSERT: 1414 case INSERT:
1349 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1415 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1350 col--) 1416 col--)
1351 { 1417 {
1352 stp[col] = stp[col - count]; 1418 stp[col] = stp[col - count];
1353 srp[col] = srp[col - count]; 1419 srp[col] = srp[col - count];
1354 } 1420 }
1421
1355 if (*slp != -1) 1422 if (*slp != -1)
1356 { 1423 {
1357 *slp += count; 1424 *slp += count;
1358 MIN_IT (*slp, TermWin.ncol); 1425 MIN_IT (*slp, TermWin.ncol);
1359 } 1426 }
1427
1360 if (selection.op && current_screen == selection.screen 1428 if (selection.op && current_screen == selection.screen
1361 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1362 { 1430 {
1363 if (selection.end.row != screen.cur.row 1431 if (selection.end.row != screen.cur.row
1364 || (selection.end.col + count >= TermWin.ncol)) 1432 || (selection.end.col + count >= TermWin.ncol))
… …
1368 selection.beg.col += count; 1436 selection.beg.col += count;
1369 selection.mark.col += count; /* XXX: yes? */ 1437 selection.mark.col += count; /* XXX: yes? */
1370 selection.end.col += count; 1438 selection.end.col += count;
1371 } 1439 }
1372 } 1440 }
1441
1373 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1442 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1374 (unsigned int)count, rstyle); 1443 (unsigned int)count, rstyle);
1375 break; 1444 break;
1445
1376 case ERASE: 1446 case ERASE:
1377 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1447 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1378 selection_check (1); 1448 selection_check (1);
1379 screen.cur.col -= count; 1449 screen.cur.col -= count;
1380 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1381 (unsigned int)count, rstyle); 1451 (unsigned int)count, rstyle);
1382 break; 1452 break;
1453
1383 case DELETE: 1454 case DELETE:
1384 tr = srp[TermWin.ncol - 1]
1385 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1455 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1456
1386 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1457 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1387 { 1458 {
1388 stp[col] = stp[col + count]; 1459 stp[col] = stp[col + count];
1389 srp[col] = srp[col + count]; 1460 srp[col] = srp[col + count];
1390 } 1461 }
1462
1391 scr_blank_line (& (stp[TermWin.ncol - count]), 1463 scr_blank_line (& (stp[TermWin.ncol - count]),
1392 & (srp[TermWin.ncol - count]), 1464 & (srp[TermWin.ncol - count]),
1393 (unsigned int)count, tr); 1465 (unsigned int)count, tr);
1466
1394 if (*slp == -1) /* break line continuation */ 1467 if (*slp == -1) /* break line continuation */
1395 *slp = TermWin.ncol; 1468 *slp = TermWin.ncol;
1469
1396 *slp -= count; 1470 *slp -= count;
1397 MAX_IT (*slp, 0); 1471 MAX_IT (*slp, 0);
1472
1398 if (selection.op && current_screen == selection.screen 1473 if (selection.op && current_screen == selection.screen
1399 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1474 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1400 { 1475 {
1401 if (selection.end.row != screen.cur.row 1476 if (selection.end.row != screen.cur.row
1402 || (screen.cur.col >= selection.beg.col - count) 1477 || (screen.cur.col >= selection.beg.col - count)
… …
1408 selection.beg.col -= count; 1483 selection.beg.col -= count;
1409 selection.mark.col -= count; /* XXX: yes? */ 1484 selection.mark.col -= count; /* XXX: yes? */
1410 selection.end.col -= count; 1485 selection.end.col -= count;
1411 } 1486 }
1412 } 1487 }
1488
1413 break; 1489 break;
1414 } 1490 }
1415} 1491}
1416 1492
1417/* ------------------------------------------------------------------------- */ 1493/* ------------------------------------------------------------------------- */
… …
1422void 1498void
1423rxvt_term::scr_scroll_region (int top, int bot) 1499rxvt_term::scr_scroll_region (int top, int bot)
1424{ 1500{
1425 MAX_IT (top, 0); 1501 MAX_IT (top, 0);
1426 MIN_IT (bot, (int)TermWin.nrow - 1); 1502 MIN_IT (bot, (int)TermWin.nrow - 1);
1503
1427 if (top > bot) 1504 if (top > bot)
1428 return; 1505 return;
1506
1429 screen.tscroll = top; 1507 screen.tscroll = top;
1430 screen.bscroll = bot; 1508 screen.bscroll = bot;
1431 scr_gotorc (0, 0, 0); 1509 scr_gotorc (0, 0, 0);
1432} 1510}
1433 1511
… …
1891 1969
1892 /* 1970 /*
1893 * C: set the cursor character (s) 1971 * C: set the cursor character (s)
1894 */ 1972 */
1895 { 1973 {
1896 unsigned char setoldcursor; 1974 unsigned char setoldcursor;
1897 rend_t ccol1, /* Cursor colour */ 1975 rend_t ccol1, /* Cursor colour */
1898 ccol2; /* Cursor colour2 */ 1976 ccol2; /* Cursor colour2 */
1899 1977
1900 showcursor = (screen.flags & Screen_VisibleCursor); 1978 showcursor = (screen.flags & Screen_VisibleCursor);
1901#ifdef CURSOR_BLINK 1979#ifdef CURSOR_BLINK
1902 if (hidden_cursor) 1980 if (hidden_cursor)
1903 showcursor = 0; 1981 showcursor = 0;
1904#endif 1982#endif
1905 1983
1906 if (showcursor) 1984 if (showcursor)
1907 { 1985 {
1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1909 [screen.cur.col]);
1910 1987
1911 if (showcursor && TermWin.focus) 1988 if (showcursor && TermWin.focus)
1912 { 1989 {
1913 *srp ^= RS_RVid; 1990 *srp ^= RS_RVid;
1914#ifndef NO_CURSORCOLOR 1991#ifndef NO_CURSORCOLOR
… …
1942 if (screen.cur.row + TermWin.view_start != ocrow 2019 if (screen.cur.row + TermWin.view_start != ocrow
1943 || screen.cur.col != oldcursor.col) 2020 || screen.cur.col != oldcursor.col)
1944 { 2021 {
1945 if (ocrow < TermWin.nrow 2022 if (ocrow < TermWin.nrow
1946 && oldcursor.col < TermWin.ncol) 2023 && oldcursor.col < TermWin.ncol)
1947 {
1948 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2024 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1949 } 2025
1950 if (TermWin.focus || !showcursor) 2026 if (TermWin.focus || !showcursor)
1951 oldcursor.row = -1; 2027 oldcursor.row = -1;
1952 else 2028 else
1953 setoldcursor = 1; 2029 setoldcursor = 1;
1954 } 2030 }
1955 } 2031 }
1956 else if (!TermWin.focus) 2032 else if (!TermWin.focus)
1957 setoldcursor = 1; 2033 setoldcursor = 1;
2034
1958 if (setoldcursor) 2035 if (setoldcursor)
1959 { 2036 {
1960 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2037 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1961 oldcursor.row = -1; 2038 oldcursor.row = -1;
1962 else 2039 else
… …
1974 */ 2051 */
1975 i = num_scr; 2052 i = num_scr;
1976 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2053 if (refresh_type == FAST_REFRESH && num_scr_allow && i
1977 && abs (i) < TermWin.nrow && !must_clear) 2054 && abs (i) < TermWin.nrow && !must_clear)
1978 { 2055 {
1979 int16_t nits; 2056 int16_t nits;
1980 int j; 2057 int j;
1981 rend_t *drp2; 2058 rend_t *drp2;
1982 text_t *dtp2; 2059 text_t *dtp2;
1983 int len, wlen; 2060 int len, wlen;
1984 2061
1985 j = TermWin.nrow; 2062 j = TermWin.nrow;
1986 wlen = len = -1; 2063 wlen = len = -1;
1987 row = i > 0 ? 0 : j - 1; 2064 row = i > 0 ? 0 : j - 1;
1988 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2052 int ypixel = (int)Row2Pixel (row); 2129 int ypixel = (int)Row2Pixel (row);
2053 2130
2054 for (col = 0; col < TermWin.ncol; col++) 2131 for (col = 0; col < TermWin.ncol; col++)
2055 { 2132 {
2056 /* compare new text with old - if exactly the same then continue */ 2133 /* compare new text with old - if exactly the same then continue */
2134 if (stp[col] == dtp[col] /* Must match characters to skip. */
2135 && (srp[col] == drp[col] /* Either rendition the same or */
2136 || (stp[col] == ' ' /* space w/ no background change */
2137 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2138 continue;
2139
2140 // redraw one or more characters
2141
2142 // seek to the beginning if wide characters
2143 while (stp[col] == NOCHAR && col > 0)
2144 --col;
2145
2057 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2146 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; 2147 text_t *text = stp + col;
2066 int count = 1; 2148 int count = 1;
2067 2149
2068 /* redraw one or more characters */
2069
2070 dtp[col] = stp[col]; 2150 dtp[col] = stp[col];
2071 drp[col] = rend; 2151 drp[col] = rend;
2072
2073 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2074 continue;
2075 2152
2076 int xpixel = Col2Pixel (col); 2153 int xpixel = Col2Pixel (col);
2077 2154
2078 // this loop looks very messy, it can probably be optimized 2155 // this loop looks very messy, it can probably be optimized
2079 // and cleaned a bit by you? 2156 // and cleaned a bit by you?
… …
2132 else 2209 else
2133 rvid = !rvid; 2210 rvid = !rvid;
2134 } 2211 }
2135 2212
2136 if (rend & RS_Uline) 2213 if (rend & RS_Uline)
2137 {
2138 if (ISSET_PIXCOLOR (Color_UL)) 2214 if (ISSET_PIXCOLOR (Color_UL))
2139 fore = Color_UL; 2215 fore = Color_UL;
2140 }
2141#endif 2216#endif
2142 2217
2143 if (rvid) 2218 if (rvid)
2144 { 2219 {
2145 SWAP_IT (fore, back, int); 2220 SWAP_IT (fore, back, int);
… …
2153 back = Color_RV; 2228 back = Color_RV;
2154#endif 2229#endif
2155 } 2230 }
2156 2231
2157#ifdef TEXT_BLINK 2232#ifdef TEXT_BLINK
2158 if (rend & RS_Blink) 2233 if (rend & RS_Blink && back == Color_bg)
2159 { 2234 {
2160 if (!text_blink_ev.active) 2235 if (!text_blink_ev.active)
2161 { 2236 {
2162 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2237 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2163 hidden_text = 0; 2238 hidden_text = 0;
… …
2195 else 2270 else
2196 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2271 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2197 2272
2198 if ((rend & RS_Uline) && (font->descent > 1)) 2273 if ((rend & RS_Uline) && (font->descent > 1))
2199 XDrawLine (display->display, drawBuffer, TermWin.gc, 2274 XDrawLine (display->display, drawBuffer, TermWin.gc,
2200 xpixel, ypixel + font->ascent + 1, 2275 xpixel, ypixel + font->ascent + 1,
2201 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2276 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2202 } /* for (col....) */ 2277 } /* for (col....) */
2203 } /* for (row....) */ 2278 } /* for (row....) */
2204 2279
2205 /* 2280 /*
2206 * G: cleanup cursor and display outline cursor if necessary 2281 * G: cleanup cursor and display outline cursor if necessary
… …
2226 while (oldcursor.col + cursorwidth < TermWin.ncol 2301 while (oldcursor.col + cursorwidth < TermWin.ncol
2227 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2302 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2228 cursorwidth++; 2303 cursorwidth++;
2229 2304
2230 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2305 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2231 Col2Pixel (oldcursor.col), 2306 Col2Pixel (oldcursor.col),
2232 Row2Pixel (oldcursor.row), 2307 Row2Pixel (oldcursor.row),
2233 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2308 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2234 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2309 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2235 } 2310 }
2236 } 2311 }
2237 2312
2238 /* 2313 /*
2239 * H: cleanup selection 2314 * H: cleanup selection
… …
2247 /* 2322 /*
2248 * clear the whole screen height, note that width == 0 is treated 2323 * clear the whole screen height, note that width == 0 is treated
2249 * specially by XClearArea 2324 * specially by XClearArea
2250 */ 2325 */
2251 XClearArea (display->display, TermWin.vt, 0, 0, 2326 XClearArea (display->display, TermWin.vt, 0, 0,
2252 (unsigned int)TermWin.int_bwidth, 2327 (unsigned int)TermWin.int_bwidth,
2253 (unsigned int)TermWin_TotalHeight (), False); 2328 (unsigned int)TermWin_TotalHeight (), False);
2329
2254 if (clearlast && TermWin.int_bwidth) 2330 if (clearlast && TermWin.int_bwidth)
2255 /* 2331 /*
2256 * clear the whole screen height, note that width == 0 is treated 2332 * clear the whole screen height, note that width == 0 is treated
2257 * specially by XClearArea 2333 * specially by XClearArea
2258 */ 2334 */
2259 XClearArea (display->display, TermWin.vt, 2335 XClearArea (display->display, TermWin.vt,
2260 TermWin.width + TermWin.int_bwidth, 0, 2336 TermWin.width + TermWin.int_bwidth, 0,
2261 (unsigned int)TermWin.int_bwidth, 2337 (unsigned int)TermWin.int_bwidth,
2262 (unsigned int)TermWin_TotalHeight (), False); 2338 (unsigned int)TermWin_TotalHeight (), False);
2339
2263 if (refresh_type & SMOOTH_REFRESH) 2340 if (refresh_type & SMOOTH_REFRESH)
2264 XSync (display->display, False); 2341 XSync (display->display, False);
2265 2342
2266 num_scr = 0; 2343 num_scr = 0;
2267 num_scr_allow = 1; 2344 num_scr_allow = 1;
… …
2291 } 2368 }
2292} 2369}
2293 2370
2294/* ------------------------------------------------------------------------- */ 2371/* ------------------------------------------------------------------------- */
2295void 2372void
2296rxvt_term::scr_clear () 2373rxvt_term::scr_clear (bool really)
2297{ 2374{
2298 if (!TermWin.mapped) 2375 if (!TermWin.mapped)
2299 return; 2376 return;
2300 2377
2301 num_scr_allow = 0; 2378 num_scr_allow = 0;
2302 want_refresh = 1; 2379 want_refresh = 1;
2380
2303#ifdef TRANSPARENT 2381#ifdef TRANSPARENT
2304 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2382 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2305 { 2383 {
2306 int i; 2384 int i;
2307 2385
… …
2314 if (TermWin.parent[i] != None) 2392 if (TermWin.parent[i] != None)
2315 XClearWindow (display->display, TermWin.parent[i]); 2393 XClearWindow (display->display, TermWin.parent[i]);
2316 } 2394 }
2317#endif 2395#endif
2318 2396
2397 if (really)
2319 XClearWindow (display->display, TermWin.vt); 2398 XClearWindow (display->display, TermWin.vt);
2320} 2399}
2321 2400
2322/* ------------------------------------------------------------------------- */ 2401/* ------------------------------------------------------------------------- */
2323void 2402void
2324rxvt_term::scr_reverse_selection () 2403rxvt_term::scr_reverse_selection ()
2325{ 2404{
2326 int i, col, row, end_row;
2327 rend_t *srp;
2328
2329 if (selection.op && current_screen == selection.screen) 2405 if (selection.op && current_screen == selection.screen)
2330 { 2406 {
2331 end_row = TermWin.saveLines - TermWin.view_start; 2407 int end_row = TermWin.saveLines - TermWin.view_start;
2332 i = selection.beg.row + TermWin.saveLines; 2408 int i = selection.beg.row + TermWin.saveLines;
2333 row = selection.end.row + TermWin.saveLines; 2409 int col, row = selection.end.row + TermWin.saveLines;
2410 rend_t *srp;
2411
2334 if (i >= end_row) 2412 if (i >= end_row)
2335 col = selection.beg.col; 2413 col = selection.beg.col;
2336 else 2414 else
2337 { 2415 {
2338 col = 0; 2416 col = 0;
2339 i = end_row; 2417 i = end_row;
2340 } 2418 }
2419
2341 end_row += TermWin.nrow; 2420 end_row += TermWin.nrow;
2342 for (; i < row && i < end_row; i++, col = 0) 2421 for (; i < row && i < end_row; i++, col = 0)
2343 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2422 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2344 srp[col] ^= RS_RVid; 2423 srp[col] ^= RS_RVid;
2424
2345 if (i == row && i < end_row) 2425 if (i == row && i < end_row)
2346 for (srp = screen.rend[i]; col < selection.end.col; col++) 2426 for (srp = screen.rend[i]; col < selection.end.col; col++)
2347 srp[col] ^= RS_RVid; 2427 srp[col] ^= RS_RVid;
2348 } 2428 }
2349} 2429}
… …
2488 } 2568 }
2489 2569
2490 for (;;) 2570 for (;;)
2491 { 2571 {
2492 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2572 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2493 (long) (PROP_SIZE / 4), delete_prop, 2573 (long) (PROP_SIZE / 4), delete_prop,
2494 AnyPropertyType, &ct.encoding, &ct.format, 2574 AnyPropertyType, &ct.encoding, &ct.format,
2495 &ct.nitems, &bytes_after, 2575 &ct.nitems, &bytes_after,
2496 &ct.value) != Success) 2576 &ct.value) != Success)
2497 break; 2577 break;
2498 2578
2499 if (ct.encoding == 0) 2579 if (ct.encoding == 0)
2500 { 2580 {
2501 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2581 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2509 } 2589 }
2510 2590
2511 if (ct.nitems == 0) 2591 if (ct.nitems == 0)
2512 { 2592 {
2513 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2593 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2594
2514 if (selection_wait == Sel_normal && nread == 0) 2595 if (selection_wait == Sel_normal && nread == 0
2596 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2515 { 2597 {
2516 /* 2598 /*
2517 * pass through again trying CUT_BUFFER0 if we've come from 2599 * pass through again trying CUT_BUFFER0 if we've come from
2518 * XConvertSelection () but nothing was presented 2600 * XConvertSelection () but nothing was presented
2519 */ 2601 */
… …
2559void 2641void
2560rxvt_term::incr_cb (time_watcher &w) 2642rxvt_term::incr_cb (time_watcher &w)
2561{ 2643{
2562 selection_wait = Sel_none; 2644 selection_wait = Sel_none;
2563 2645
2564 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2646 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2565} 2647}
2566 2648
2567/* 2649/*
2568 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2650 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2569 */ 2651 */
… …
2572{ 2654{
2573 int reget_time = 0; 2655 int reget_time = 0;
2574 2656
2575 if (prop == None) 2657 if (prop == None)
2576 return; 2658 return;
2659
2577 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2660 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2578 if (selection_wait == Sel_normal) 2661 if (selection_wait == Sel_normal)
2579 { 2662 {
2580 int a, afmt; 2663 int a, afmt;
2581 Atom atype; 2664 Atom atype;
2582 unsigned long bytes_after, nitems; 2665 unsigned long bytes_after, nitems;
2583 unsigned char *s = NULL; 2666 unsigned char *s = NULL;
2584 2667
2585 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2668 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2586 xa[XA_INCR], &atype, &afmt, &nitems, 2669 xa[XA_INCR], &atype, &afmt, &nitems,
2587 &bytes_after, &s); 2670 &bytes_after, &s);
2588 if (s) 2671 if (s)
2589 XFree (s); 2672 XFree (s);
2590 if (a != Success) 2673 if (a != Success)
2591 return; 2674 return;
2675
2592#ifndef __CYGWIN32__ 2676#ifndef __CYGWIN32__
2593 if (atype == xa[XA_INCR]) 2677 if (atype == xa[XA_INCR])
2594 { /* start an INCR transfer */ 2678 { /* start an INCR transfer */
2595 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2596 XDeleteProperty (display->display, win, prop); 2680 XDeleteProperty (display->display, win, prop);
… …
2602 2686
2603 } 2687 }
2604 else if (selection_wait == Sel_incr) 2688 else if (selection_wait == Sel_incr)
2605 { 2689 {
2606 reget_time = 1; 2690 reget_time = 1;
2691
2607 if (selection_paste (win, prop, True) == -1) 2692 if (selection_paste (win, prop, True) == -1)
2608 { 2693 {
2609 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2694 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2610 selection_wait = Sel_none; 2695 selection_wait = Sel_none;
2611 incr_ev.stop (); 2696 incr_ev.stop ();
2612 } 2697 }
2613 } 2698 }
2614 if (reget_time) /* received more data so reget time */ 2699 if (reget_time) /* received more data so reget time */
2615 incr_ev.start (NOW + 10); 2700 incr_ev.start (NOW + 10);
2616} 2701}
2702
2617/* ------------------------------------------------------------------------- */ 2703/* ------------------------------------------------------------------------- */
2618/* 2704/*
2619 * Request the current selection: 2705 * Request the current selection:
2620 * Order: > internal selection if available 2706 * Order: > internal selection if available
2621 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2707 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2626 */ 2712 */
2627void 2713void
2628rxvt_term::selection_request (Time tm, int x, int y) 2714rxvt_term::selection_request (Time tm, int x, int y)
2629{ 2715{
2630 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2716 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2717
2631 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2718 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2632 return; /* outside window */ 2719 return; /* outside window */
2633 2720
2634 if (selection.text != NULL) 2721 if (selection.text)
2635 { /* internal selection */ 2722 { /* internal selection */
2636 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2723 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2637 paste (selection.text, selection.len); 2724 char *str = rxvt_wcstombs (selection.text, selection.len);
2725 paste ((unsigned char *)str, strlen (str));
2726 free (str);
2638 return; 2727 return;
2639 } 2728 }
2640 else 2729 else
2641 { 2730 {
2642 int i; 2731 int i;
2643 2732
2644 selection_request_time = tm; 2733 selection_request_time = tm;
2645 selection_wait = Sel_normal; 2734 selection_wait = Sel_normal;
2735
2646 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2736 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2647 { 2737 {
2648#if X_HAVE_UTF8_STRING 2738#if X_HAVE_UTF8_STRING
2649 selection_type = Sel_UTF8String; 2739 selection_type = Sel_UTF8String;
2650 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2740 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2655 return; 2745 return;
2656#endif 2746#endif
2657 2747
2658 } 2748 }
2659 } 2749 }
2750
2660 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2751 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2661 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2752 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2662 selection_paste (display->root, XA_CUT_BUFFER0, False); 2753 selection_paste (display->root, XA_CUT_BUFFER0, False);
2663} 2754}
2664 2755
2665int 2756int
2666rxvt_term::selection_request_other (Atom target, int selnum) 2757rxvt_term::selection_request_other (Atom target, int selnum)
2667{ 2758{
2668 Atom sel; 2759 Atom sel;
2669#ifdef DEBUG_SELECT 2760#ifdef DEBUG_SELECT
2670 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2761 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2671#endif 2762#endif
2672 2763
2673 selection_type |= selnum; 2764 selection_type |= selnum;
2765
2674 if (selnum == Sel_Primary) 2766 if (selnum == Sel_Primary)
2675 sel = XA_PRIMARY; 2767 sel = XA_PRIMARY;
2676 else if (selnum == Sel_Secondary) 2768 else if (selnum == Sel_Secondary)
2677 sel = XA_SECONDARY; 2769 sel = XA_SECONDARY;
2678 else 2770 else
2679 sel = xa[XA_CLIPBOARD]; 2771 sel = xa[XA_CLIPBOARD];
2772
2680 if (XGetSelectionOwner (display->display, sel) != None) 2773 if (XGetSelectionOwner (display->display, sel) != None)
2681 { 2774 {
2682 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2775 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2683 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2776 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2684 TermWin.vt, selection_request_time); 2777 TermWin.vt, selection_request_time);
2685 return 1; 2778 return 1;
2686 } 2779 }
2780
2687 return 0; 2781 return 0;
2688} 2782}
2689 2783
2690/* ------------------------------------------------------------------------- */ 2784/* ------------------------------------------------------------------------- */
2691/* 2785/*
… …
2700 want_refresh = 1; 2794 want_refresh = 1;
2701 free (selection.text); 2795 free (selection.text);
2702 selection.text = NULL; 2796 selection.text = NULL;
2703 selection.len = 0; 2797 selection.len = 0;
2704 CLEAR_SELECTION (); 2798 CLEAR_SELECTION ();
2799
2800 if (display->selection_owner == this)
2801 display->selection_owner = 0;
2705} 2802}
2706 2803
2707/* ------------------------------------------------------------------------- */ 2804/* ------------------------------------------------------------------------- */
2708/* 2805/*
2709 * Copy a selection into the cut buffer 2806 * Copy a selection into the cut buffer
2710 * EXT: button 1 or 3 release 2807 * EXT: button 1 or 3 release
2711 */ 2808 */
2712void 2809void
2713rxvt_term::selection_make (Time tm) 2810rxvt_term::selection_make (Time tm)
2714{ 2811{
2715 int i, col, end_col, row, end_row; 2812 int i, col, end_col, row, end_row;
2716 unsigned char *new_selection_text; 2813 wchar_t *new_selection_text;
2717 char *str;
2718 text_t *t; 2814 text_t *t;
2719#ifdef ACS_ASCII
2720 rend_t *re;
2721#endif
2722 2815
2723 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2816 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2724 switch (selection.op) 2817 switch (selection.op)
2725 { 2818 {
2726 case SELECTION_CONT: 2819 case SELECTION_CONT:
… …
2732 selection.op = SELECTION_DONE; 2825 selection.op = SELECTION_DONE;
2733 /* FALLTHROUGH */ 2826 /* FALLTHROUGH */
2734 default: 2827 default:
2735 return; 2828 return;
2736 } 2829 }
2830
2737 selection.op = SELECTION_DONE; 2831 selection.op = SELECTION_DONE;
2738 2832
2739 if (selection.clicks == 4) 2833 if (selection.clicks == 4)
2740 return; /* nothing selected, go away */ 2834 return; /* nothing selected, go away */
2741 2835
2742 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2836 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2743 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2837 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2744
2745 new_selection_text = (unsigned char *)str;
2746 2838
2747 col = selection.beg.col; 2839 col = selection.beg.col;
2748 MAX_IT (col, 0); 2840 MAX_IT (col, 0);
2749 row = selection.beg.row + TermWin.saveLines; 2841 row = selection.beg.row + TermWin.saveLines;
2750 end_row = selection.end.row + TermWin.saveLines; 2842 end_row = selection.end.row + TermWin.saveLines;
2843 int ofs = 0;
2844 int extra = 0;
2751 2845
2752 for (; row <= end_row; row++, col = 0) 2846 for (; row <= end_row; row++, col = 0)
2753 { 2847 {
2754 t = & (screen.text[row][col]); 2848 t = &(screen.text[row][col]);
2755 2849
2756 end_col = screen.tlen[row]; 2850 end_col = screen.tlen[row];
2757 2851
2758 if (end_col == -1) 2852 if (end_col == -1)
2759 end_col = TermWin.ncol; 2853 end_col = TermWin.ncol;
2760 2854
2761 if (row == end_row) 2855 if (row == end_row)
2762 MIN_IT (end_col, selection.end.col); 2856 MIN_IT (end_col, selection.end.col);
2763 2857
2764 for (; col < end_col; col++) 2858 for (; col < end_col; col++)
2859 {
2765 if (*t == NOCHAR) 2860 if (*t == NOCHAR)
2766 t++; 2861 t++;
2862#if ENABLE_COMBINING
2863 else if (IS_COMPOSE (*t))
2864 {
2865 int len = rxvt_composite.expand (*t, 0);
2866
2867 extra -= (len - 1);
2868
2869 if (extra < 0)
2870 {
2871 extra += i;
2872 i += i;
2873 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2874 }
2875
2876 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2877 }
2878#endif
2767 else 2879 else
2768 { 2880 new_selection_text[ofs++] = *t++;
2769 int len = wctomb (str, *t++);
2770 if (len > 0)
2771 str += len;
2772 } 2881 }
2773 2882
2774 if (screen.tlen[row] != -1 && row != end_row) 2883 if (screen.tlen[row] != -1 && row != end_row)
2775 *str++ = '\n'; 2884 new_selection_text[ofs++] = L'\n';
2776 } 2885 }
2777 2886
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) 2887 if (end_col != selection.end.col)
2786 *str++ = '\n'; 2888 new_selection_text[ofs++] = L'\n';
2787#endif
2788 *str = '\0';
2789 2889
2790 i = str - (char *)new_selection_text; 2890 new_selection_text[ofs] = 0;
2891
2791 if (i == 0) 2892 if (ofs == 0)
2792 { 2893 {
2793 free (new_selection_text); 2894 free (new_selection_text);
2794 return; 2895 return;
2795 } 2896 }
2796 2897
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); 2898 free (selection.text);
2805 2899
2806 selection.text = new_selection_text; 2900 // we usually allocate much more than necessary, so realloc it smaller again
2901 selection.len = ofs;
2902 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2807 2903
2808 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2904 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2809 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2905 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2810 display->set_selection_owner (this); 2906 display->set_selection_owner (this);
2811 else 2907 else
2812 rxvt_print_error ("can't get primary selection"); 2908 rxvt_warn ("can't get primary selection, ignoring.\n");
2813 2909
2814 { 2910#if 0
2815 XTextProperty ct; 2911 XTextProperty ct;
2816 char *cl = (char *)selection.text;
2817 2912
2818 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2913 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2819 { 2914 {
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, 2915 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2826 PropModeReplace, selection.text, (int)selection.len); 2916 PropModeReplace, ct.value, ct.nitems);
2917 XFree (ct.value);
2827 } 2918 }
2919#endif
2828 2920
2829 selection_time = tm; 2921 selection_time = tm;
2830 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2922 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2831} 2923}
2832 2924
… …
2861rxvt_term::selection_start_colrow (int col, int row) 2953rxvt_term::selection_start_colrow (int col, int row)
2862{ 2954{
2863 want_refresh = 1; 2955 want_refresh = 1;
2864 selection.mark.col = col; 2956 selection.mark.col = col;
2865 selection.mark.row = row - TermWin.view_start; 2957 selection.mark.row = row - TermWin.view_start;
2958
2866 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2959 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2867 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2960 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2868 MAX_IT (selection.mark.col, 0); 2961 MAX_IT (selection.mark.col, 0);
2869 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2962 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2870 2963
2964 while (selection.mark.col > 0
2965 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2966 --selection.mark.col;
2967
2871 if (selection.op) 2968 if (selection.op)
2872 { /* clear the old selection */ 2969 { /* clear the old selection */
2873 selection.beg.row = selection.end.row = selection.mark.row; 2970 selection.beg.row = selection.end.row = selection.mark.row;
2874 selection.beg.col = selection.end.col = selection.mark.col; 2971 selection.beg.col = selection.end.col = selection.mark.col;
2875 } 2972 }
2973
2876 selection.op = SELECTION_INIT; 2974 selection.op = SELECTION_INIT;
2877 selection.screen = current_screen; 2975 selection.screen = current_screen;
2878} 2976}
2879 2977
2880/* ------------------------------------------------------------------------- */ 2978/* ------------------------------------------------------------------------- */
… …
2882 * Word select: select text for 2 clicks 2980 * Word select: select text for 2 clicks
2883 * We now only find out the boundary in one direction 2981 * We now only find out the boundary in one direction
2884 */ 2982 */
2885 2983
2886/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2984/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2887#define DELIMIT_TEXT(x) \ 2985#define DELIMIT_TEXT(x) \
2888 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2986 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2889#define DELIMIT_REND(x) 1 2987#define DELIMIT_REND(x) 1
2890 2988
2891void 2989void
2892rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2990rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2893{ 2991{
2894 int col, row, dirnadd, tcol, trow, w1, w2; 2992 int col, row, dirnadd, tcol, trow, w1, w2;
2895 row_col_t bound; 2993 row_col_t bound;
2896 text_t *stp; 2994 text_t *stp;
2897 rend_t *srp; 2995 rend_t *srp;
2898 2996
2899 if (dirn == UP) 2997 if (dirn == UP)
2900 { 2998 {
2901 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2999 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2902 bound.col = 0; 3000 bound.col = 0;
… …
2906 { 3004 {
2907 bound.row = TermWin.saveLines + TermWin.nrow; 3005 bound.row = TermWin.saveLines + TermWin.nrow;
2908 bound.col = TermWin.ncol - 1; 3006 bound.col = TermWin.ncol - 1;
2909 dirnadd = 1; 3007 dirnadd = 1;
2910 } 3008 }
3009
2911 row = mark->row + TermWin.saveLines; 3010 row = mark->row + TermWin.saveLines;
2912 col = mark->col; 3011 col = mark->col;
2913 MAX_IT (col, 0); 3012 MAX_IT (col, 0);
2914 /* find the edge of a word */ 3013 /* find the edge of a word */
2915 stp = & (screen.text[row][col]); 3014 stp = & (screen.text[row][col]);
2916 w1 = DELIMIT_TEXT (*stp); 3015 w1 = DELIMIT_TEXT (*stp);
2917 3016
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]); 3017 srp = (&screen.rend[row][col]);
2930 w2 = DELIMIT_REND (*srp); 3018 w2 = DELIMIT_REND (*srp);
2931 3019
2932 for (;;) 3020 for (;;)
2933 { 3021 {
2934 for (; col != bound.col; col += dirnadd) 3022 for (; col != bound.col; col += dirnadd)
2935 { 3023 {
2936 stp += dirnadd; 3024 stp += dirnadd;
3025 srp += dirnadd;
3026
3027 if (*stp == NOCHAR)
3028 continue;
3029
2937 if (DELIMIT_TEXT (*stp) != w1) 3030 if (DELIMIT_TEXT (*stp) != w1)
2938 break; 3031 break;
2939 srp += dirnadd;
2940 if (DELIMIT_REND (*srp) != w2) 3032 if (DELIMIT_REND (*srp) != w2)
2941 break; 3033 break;
2942 } 3034 }
3035
2943 if ((col == bound.col) && (row != bound.row)) 3036 if ((col == bound.col) && (row != bound.row))
2944 { 3037 {
2945 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3038 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2946 { 3039 {
2947 trow = row + dirnadd; 3040 trow = row + dirnadd;
2948 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3041 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3042
2949 if (screen.text[trow] == NULL) 3043 if (screen.text[trow] == NULL)
2950 break; 3044 break;
3045
2951 stp = & (screen.text[trow][tcol]); 3046 stp = & (screen.text[trow][tcol]);
2952 srp = & (screen.rend[trow][tcol]); 3047 srp = & (screen.rend[trow][tcol]);
3048
2953 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3049 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2954 break; 3050 break;
3051
2955 row = trow; 3052 row = trow;
2956 col = tcol; 3053 col = tcol;
2957 continue; 3054 continue;
2958 } 3055 }
2959 } 3056 }
2960 break; 3057 break;
2961 } 3058 }
3059
2962Old_Word_Selection_You_Die: 3060Old_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)); 3061 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2964 3062
2965 if (dirn == DN) 3063 if (dirn == DN)
2966 col++; /* put us on one past the end */ 3064 col++; /* put us on one past the end */
… …
2988 MAX_IT (row, 0); 3086 MAX_IT (row, 0);
2989 MIN_IT (row, (int)TermWin.nrow - 1); 3087 MIN_IT (row, (int)TermWin.nrow - 1);
2990 MAX_IT (col, 0); 3088 MAX_IT (col, 0);
2991 MIN_IT (col, (int)TermWin.ncol); 3089 MIN_IT (col, (int)TermWin.ncol);
2992 3090
2993#ifndef NO_NEW_SELECTION
2994 /* 3091 /*
2995 * If we're selecting characters (single click) then we must check first 3092 * If we're selecting characters (single click) then we must check first
2996 * if we are at the same place as the original mark. If we are then 3093 * if we are at the same place as the original mark. If we are then
2997 * select nothing. Otherwise, if we're to the right of the mark, you have to 3094 * select nothing. Otherwise, if we're to the right of the mark, you have to
2998 * be _past_ a character for it to be selected. 3095 * be _past_ a character for it to be selected.
2999 */ 3096 */
3000 if (selection_style != OLD_SELECT)
3001 {
3002 if (((selection.clicks % 3) == 1) && !flag 3097 if (((selection.clicks % 3) == 1) && !flag
3003 && (col == selection.mark.col 3098 && (col == selection.mark.col
3004 && (row == selection.mark.row + TermWin.view_start))) 3099 && (row == selection.mark.row + TermWin.view_start)))
3005 { 3100 {
3006 /* select nothing */ 3101 /* select nothing */
3007 selection.beg.row = selection.end.row = 0; 3102 selection.beg.row = selection.end.row = 0;
3008 selection.beg.col = selection.end.col = 0; 3103 selection.beg.col = selection.end.col = 0;
3009 selection.clicks = 4; 3104 selection.clicks = 4;
3010 want_refresh = 1; 3105 want_refresh = 1;
3011 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3106 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3012 return; 3107 return;
3013 }
3014 } 3108 }
3015#endif 3109
3016 if (selection.clicks == 4) 3110 if (selection.clicks == 4)
3017 selection.clicks = 1; 3111 selection.clicks = 1;
3018 3112
3019 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3113 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3020 flag == 1 ? 1 : 0, /* ? button press */ 3114 flag == 1 ? 1 : 0, /* ? button press */
… …
3074 pos.col = col; 3168 pos.col = col;
3075 pos.row = row; 3169 pos.row = row;
3076 3170
3077 pos.row -= TermWin.view_start; /* adjust for scroll */ 3171 pos.row -= TermWin.view_start; /* adjust for scroll */
3078 3172
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 /* 3173 /*
3141 * This is mainly xterm style selection with a couple of differences, mainly 3174 * This is mainly xterm style selection with a couple of differences, mainly
3142 * in the way button3 drag extension works. 3175 * in the way button3 drag extension works.
3143 * We're either doing: button1 drag; button3 press; or button3 drag 3176 * 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 3177 * 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 3182 * 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 3183 * and it was decided by whichever point/word/line was `fixed' at the
3151 * time of the most recent button3 press 3184 * time of the most recent button3 press
3152 */ 3185 */
3153 if (button3 && buttonpress) 3186 if (button3 && buttonpress)
3154 { /* button3 press */ 3187 { /* button3 press */
3155 /* 3188 /*
3156 * first determine which edge of the selection we are closest to 3189 * first determine which edge of the selection we are closest to
3157 */ 3190 */
3158 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3191 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3159 || (!ROWCOL_IS_AFTER (pos, selection.end) 3192 || (!ROWCOL_IS_AFTER (pos, selection.end)
3160 && (((pos.col - selection.beg.col) 3193 && (((pos.col - selection.beg.col)
3161 + ((pos.row - selection.beg.row) * ncol)) 3194 + ((pos.row - selection.beg.row) * ncol))
3162 < ((selection.end.col - pos.col) 3195 < ((selection.end.col - pos.col)
3163 + ((selection.end.row - pos.row) * ncol))))) 3196 + ((selection.end.row - pos.row) * ncol)))))
3164 closeto = LEFT; 3197 closeto = LEFT;
3198
3165 if (closeto == LEFT) 3199 if (closeto == LEFT)
3166 { 3200 {
3167 selection.beg.row = pos.row; 3201 selection.beg.row = pos.row;
3168 selection.beg.col = pos.col; 3202 selection.beg.col = pos.col;
3169 selection.mark.row = selection.end.row; 3203 selection.mark.row = selection.end.row;
3170 selection.mark.col = selection.end.col 3204 selection.mark.col = selection.end.col - (selection.clicks == 2);
3171 - (selection.clicks == 2);
3172 } 3205 }
3173 else 3206 else
3174 { 3207 {
3175 selection.end.row = pos.row; 3208 selection.end.row = pos.row;
3176 selection.end.col = pos.col; 3209 selection.end.col = pos.col;
3177 selection.mark.row = selection.beg.row; 3210 selection.mark.row = selection.beg.row;
3178 selection.mark.col = selection.beg.col; 3211 selection.mark.col = selection.beg.col;
3179 } 3212 }
3180 } 3213 }
3181 else 3214 else
3182 { /* button1 drag or button3 drag */ 3215 { /* button1 drag or button3 drag */
3183 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3216 if (ROWCOL_IS_AFTER (selection.mark, pos))
3184 { 3217 {
3185 if ((selection.mark.row == selection.end.row) 3218 if ((selection.mark.row == selection.end.row)
3186 && (selection.mark.col == selection.end.col) 3219 && (selection.mark.col == selection.end.col)
3187 && clickchange && selection.clicks == 2) 3220 && clickchange && selection.clicks == 2)
3188 selection.mark.col--; 3221 selection.mark.col--;
3222
3189 selection.beg.row = pos.row; 3223 selection.beg.row = pos.row;
3190 selection.beg.col = pos.col; 3224 selection.beg.col = pos.col;
3191 selection.end.row = selection.mark.row; 3225 selection.end.row = selection.mark.row;
3192 selection.end.col = selection.mark.col 3226 selection.end.col = selection.mark.col + (selection.clicks == 2);
3193 + (selection.clicks == 2);
3194 } 3227 }
3195 else 3228 else
3196 { 3229 {
3197 selection.beg.row = selection.mark.row; 3230 selection.beg.row = selection.mark.row;
3198 selection.beg.col = selection.mark.col; 3231 selection.beg.col = selection.mark.col;
… …
3202 } 3235 }
3203 3236
3204 if (selection.clicks == 1) 3237 if (selection.clicks == 1)
3205 { 3238 {
3206 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3239 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3240
3207 if (end_col != -1 && selection.beg.col > end_col) 3241 if (end_col != -1 && selection.beg.col > end_col)
3208 { 3242 {
3209#if 1 3243#if 1
3210 selection.beg.col = ncol; 3244 selection.beg.col = ncol;
3211#else 3245#else
3212 if (selection.beg.row != selection.end.row) 3246 if (selection.beg.row != selection.end.row)
3213 selection.beg.col = ncol; 3247 selection.beg.col = ncol;
3214 else 3248 else
3215 selection.beg.col = selection.mark.col; 3249 selection.beg.col = selection.mark.col;
3216#endif 3250#endif
3217
3218 } 3251 }
3252
3219 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3253 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3254
3220 if (end_col != -1 && selection.end.col > end_col) 3255 if (end_col != -1 && selection.end.col > end_col)
3221 selection.end.col = ncol; 3256 selection.end.col = ncol;
3222
3223 } 3257 }
3224 else if (selection.clicks == 2) 3258 else if (selection.clicks == 2)
3225 { 3259 {
3226 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3260 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3227 selection.end.col--; 3261 selection.end.col--;
3262
3228 selection_delimit_word (UP, & (selection.beg), 3263 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3229 & (selection.beg));
3230 selection_delimit_word (DN, & (selection.end), 3264 selection_delimit_word (DN, & (selection.end), & (selection.end));
3231 & (selection.end));
3232 } 3265 }
3233 else if (selection.clicks == 3) 3266 else if (selection.clicks == 3)
3234 { 3267 {
3235#ifndef NO_FRILLS 3268#ifndef NO_FRILLS
3236 if ((Options & Opt_tripleclickwords)) 3269 if ((Options & Opt_tripleclickwords))
3237 { 3270 {
3238 int end_row; 3271 int end_row;
3239 3272
3240 selection_delimit_word (UP, & (selection.beg), 3273 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3241 & (selection.beg));
3242 end_row = screen.tlen[selection.mark.row 3274 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3243 + TermWin.saveLines]; 3275
3244 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3276 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3245 end_row++)
3246 { 3277 {
3247 end_col = screen.tlen[end_row + TermWin.saveLines]; 3278 end_col = screen.tlen[end_row + TermWin.saveLines];
3279
3248 if (end_col != -1) 3280 if (end_col != -1)
3249 { 3281 {
3250 selection.end.row = end_row; 3282 selection.end.row = end_row;
3251 selection.end.col = end_col; 3283 selection.end.col = end_col;
3252 selection_remove_trailing_spaces (); 3284 selection_remove_trailing_spaces ();
… …
3254 } 3286 }
3255 } 3287 }
3256 } 3288 }
3257 else 3289 else
3258#endif 3290#endif
3259
3260 { 3291 {
3261 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3292 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3262 selection.mark.col++; 3293 selection.mark.col++;
3263 selection.beg.col = 0; 3294 selection.beg.col = 0;
3264 selection.end.col = ncol; 3295 selection.end.col = ncol;
3265 } 3296 }
3266 } 3297 }
3298
3267 if (button3 && buttonpress) 3299 if (button3 && buttonpress)
3268 { /* mark may need to be changed */ 3300 { /* mark may need to be changed */
3269 if (closeto == LEFT) 3301 if (closeto == LEFT)
3270 { 3302 {
3271 selection.mark.row = selection.end.row; 3303 selection.mark.row = selection.end.row;
3272 selection.mark.col = selection.end.col 3304 selection.mark.col = selection.end.col
3273 - (selection.clicks == 2); 3305 - (selection.clicks == 2);
… …
3277 selection.mark.row = selection.beg.row; 3309 selection.mark.row = selection.beg.row;
3278 selection.mark.col = selection.beg.col; 3310 selection.mark.col = selection.beg.col;
3279 } 3311 }
3280 } 3312 }
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)); 3313 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3282#endif /* ! NO_NEW_SELECTION */
3283} 3314}
3284 3315
3285#ifndef NO_FRILLS 3316#ifndef NO_FRILLS
3286void 3317void
3287rxvt_term::selection_remove_trailing_spaces () 3318rxvt_term::selection_remove_trailing_spaces ()
… …
3361 ev.target = rq.target; 3392 ev.target = rq.target;
3362 ev.time = rq.time; 3393 ev.time = rq.time;
3363 3394
3364 if (rq.target == xa[XA_TARGETS]) 3395 if (rq.target == xa[XA_TARGETS])
3365 { 3396 {
3366 Atom32 target_list[5]; 3397 Atom32 target_list[6];
3367 Atom32 *target = target_list; 3398 Atom32 *target = target_list;
3368 3399
3369 *target++ = (Atom32) xa[XA_TARGETS]; 3400 *target++ = (Atom32) xa[XA_TARGETS];
3401 *target++ = (Atom32) xa[XA_TIMESTAMP];
3370 *target++ = (Atom32) XA_STRING; 3402 *target++ = (Atom32) XA_STRING;
3371 *target++ = (Atom32) xa[XA_TEXT]; 3403 *target++ = (Atom32) xa[XA_TEXT];
3372 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3404 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3373#if X_HAVE_UTF8_STRING 3405#if X_HAVE_UTF8_STRING
3374 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3406 *target++ = (Atom32) xa[XA_UTF8_STRING];
3375#endif 3407#endif
3408
3376 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3409 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3377 (8 * sizeof (target_list[0])), PropModeReplace, 3410 (8 * sizeof (target_list[0])), PropModeReplace,
3378 (unsigned char *)target_list, 3411 (unsigned char *)target_list,
3379 target - target_list); 3412 target - target_list);
3380 ev.property = rq.property; 3413 ev.property = rq.property;
3381 } 3414 }
3382 else if (rq.target == xa[XA_MULTIPLE]) 3415 else if (rq.target == xa[XA_MULTIPLE])
3383 { 3416 {
3384 /* TODO: Handle MULTIPLE */ 3417 /* TODO: Handle MULTIPLE */
3385 } 3418 }
3386 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3419 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3387 { 3420 {
3388 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3421 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3389 (8 * sizeof (Time)), PropModeReplace, 3422 (8 * sizeof (Time)), PropModeReplace,
3390 (unsigned char *)&selection_time, 1); 3423 (unsigned char *)&selection_time, 1);
3391 ev.property = rq.property; 3424 ev.property = rq.property;
3392 } 3425 }
3393 else if (rq.target == XA_STRING 3426 else if (rq.target == XA_STRING
3394 || rq.target == xa[XA_TEXT] 3427 || rq.target == xa[XA_TEXT]
3395 || rq.target == xa[XA_COMPOUND_TEXT] 3428 || rq.target == xa[XA_COMPOUND_TEXT]
3396 || rq.target == xa[XA_UTF8_STRING] 3429 || rq.target == xa[XA_UTF8_STRING]
3397 ) 3430 )
3398 { 3431 {
3399 short freect = 0; 3432 short freect = 0;
3400 int selectlen; 3433 int selectlen;
3401 char *cl; 3434 wchar_t *cl;
3402 3435
3403 target = rq.target; 3436 target = rq.target;
3404 3437
3405 if (target == XA_STRING) 3438 if (target == XA_STRING)
3406 // we actually don't do XA_STRING, but who cares, as i18n clients 3439 // we actually don't do XA_STRING, but who cares, as i18n clients
3407 // will ask for another format anyways. 3440 // will ask for another format anyways.
3408 style = XStringStyle; 3441 style = XStringStyle;
3409 else if (target == xa[XA_TEXT]) 3442 else if (target == xa[XA_TEXT])
3410 style = XTextStyle; 3443 style = XStdICCTextStyle;
3411 else if (target == xa[XA_COMPOUND_TEXT]) 3444 else if (target == xa[XA_COMPOUND_TEXT])
3412 style = XCompoundTextStyle; 3445 style = XCompoundTextStyle;
3413#if X_HAVE_UTF8_STRING 3446#if X_HAVE_UTF8_STRING
3414 else if (target == xa[XA_UTF8_STRING]) 3447 else if (target == xa[XA_UTF8_STRING])
3415 style = XUTF8StringStyle; 3448 style = XUTF8StringStyle;
… …
3420 style = XCompoundTextStyle; 3453 style = XCompoundTextStyle;
3421 } 3454 }
3422 3455
3423 if (selection.text) 3456 if (selection.text)
3424 { 3457 {
3425 cl = (char *)selection.text; 3458 cl = selection.text;
3426 selectlen = selection.len; 3459 selectlen = selection.len;
3427 } 3460 }
3428 else 3461 else
3429 { 3462 {
3430 cl = ""; 3463 cl = L"";
3431 selectlen = 0; 3464 selectlen = 0;
3432 } 3465 }
3433 3466
3467 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3468 // manually for XUTF8StringStyle.
3434 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3469 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3435 freect = 1; 3470 freect = 1;
3436 else 3471 else
3437 { 3472 {
3438 /* if we failed to convert then send it raw */ 3473 /* if we failed to convert then send it raw */
3439 ct.value = (unsigned char *)cl; 3474 ct.value = (unsigned char *)cl;
… …
3446 ev.property = rq.property; 3481 ev.property = rq.property;
3447 3482
3448 if (freect) 3483 if (freect)
3449 XFree (ct.value); 3484 XFree (ct.value);
3450 } 3485 }
3486
3451 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3487 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3452} 3488}
3453 3489
3454/* ------------------------------------------------------------------------- * 3490/* ------------------------------------------------------------------------- *
3455 * MOUSE ROUTINES * 3491 * MOUSE ROUTINES *

Diff Legend

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